fix error and add option in dac function

cx1111 · cx1111 · commit 961d5e58337e · 2017-09-26T17:01:52.000-04:00
diff --git a/setup.py b/setup.py
@@ -20,7 +20,7 @@
     # Versions should comply with PEP440. For a discussion on single-sourcing
     # the version across setup.py and the project code, see
     # https://packaging.python.org/en/latest/single_source_version.html
-    version='1.3.0',
+    version='1.3.2',
 
     description='The WFDB Python Toolbox',
     long_description=long_description,
diff --git a/wfdb/readwrite/_signals.py b/wfdb/readwrite/_signals.py
@@ -2,7 +2,6 @@
 import os
 import math
 from . import downloads
-import pdb
 
 # All defined WFDB dat formats
 datformats = ["80","212","16","24","32"]
@@ -287,12 +286,18 @@ def adc(self, expanded=False):
         return d_signals
 
     
-    def dac(self, expanded=False, returnres=64):
+    def dac(self, expanded=False, returnres=64, inplace=False):
         """
-        Returns the digital to analogue conversion for a Record object's signal stored
+        Performs the digital to analogue conversion of the signal stored
         in d_signals if expanded is False, or e_d_signals if expanded is True.
+
         The d_signals/e_d_signals, fmt, gain, and baseline fields must all be valid.
+
+        If inplace is True, the dac will be performed inplace on the variable, the
+        p_signals attribute will be set, and d_signals will be set to None.
+
         """
+
         # The digital nan values for each channel
         dnans = digi_nan(self.fmt)
 
@@ -305,21 +310,48 @@ def dac(self, expanded=False, returnres=64):
         else:
             floatdtype = 'float16'
 
-        if expanded:
-            p_signal = []
-            for ch in range(0, self.nsig):
-                # nan locations for the channel
-                chnanlocs = self.e_d_signals[ch] == dnans[ch]
-                p_signal.append((self.e_d_signals[ch] - np.array(self.baseline[ch], dtype=self.e_d_signals[ch].dtype))/
-                    np.array(self.adcgain[ch], dtype=floatdtype).astype(floatdtype, copy=False))
-                p_signal[ch][chnanlocs] = np.nan
+        # Do inplace conversion and set relevant variables.
+        if inplace:
+            # No clever memory saving here...
+            if expanded:
+                p_signal = []
+                for ch in range(0, self.nsig):
+                    # nan locations for the channel
+                    chnanlocs = self.e_d_signals[ch] == dnans[ch]
+                    
+                    p_signal.append(((self.e_d_signals[ch] - self.baseline[ch])/self.adcgain[ch]).astype(floatdtype, copy=False))
+                    p_signal[ch][chnanlocs] = np.nan
+
+                self.e_p_signals = p_signal
+                self.e_d_signals = None
+            else:
+                # nan locations
+                nanlocs = self.d_signals == dnans
+                # Do float conversion immediately to avoid potential under/overflow
+                # of efficient int dtype
+                self.d_signals = self.d_signals.astype(floatdtype, copy=False)
+                np.subtract(self.d_signals, self.baseline, self.d_signals)
+                np.divide(self.d_signals, self.adcgain, self.d_signals)
+                self.d_signals[nanlocs] = np.nan
+                self.p_signals = self.d_signals
+                self.d_signals = None
+
+        # Return the variable
         else:
-            # nan locations
-            nanlocs = self.d_signals == dnans
-            p_signal = (self.d_signals - np.array(self.baseline, dtype=self.d_signals.dtype)) / np.array(self.adcgain, dtype=floatdtype).astype(floatdtype, copy=False)
-            p_signal[nanlocs] = np.nan
-                
-        return p_signal
+            if expanded:
+                p_signal = []
+                for ch in range(0, self.nsig):
+                    # nan locations for the channel
+                    chnanlocs = self.e_d_signals[ch] == dnans[ch]
+                    p_signal.append(((self.e_d_signals[ch] - self.baseline[ch])/self.adcgain[ch]).astype(floatdtype, copy=False))
+                    p_signal[ch][chnanlocs] = np.nan
+            else:
+                # nan locations
+                nanlocs = self.d_signals == dnans
+                p_signal = ((self.d_signals - self.baseline) / self.adcgain).astype(floatdtype, copy=False)
+                p_signal[nanlocs] = np.nan
+                    
+            return p_signal
 
 
     # Compute appropriate gain and baseline parameters given the physical signal and the fmts 
@@ -863,8 +895,6 @@ def getdatbytes(filename, dirname, pbdir, fmt, startbyte, nsamp):
     else:
         sigbytes = downloads.streamdat(filename, pbdir, fmt, bytecount, startbyte, dataloadtypes)
 
-    #pdb.set_trace()
-
     return sigbytes
 
 
diff --git a/wfdb/readwrite/records.py b/wfdb/readwrite/records.py
@@ -821,13 +821,11 @@ def rdsamp(recordname, sampfrom=0, sampto=None, channels = None, physical = True
             
             # Arrange/edit the object fields to reflect user channel and/or signal range input
             record.arrangefields(channels, expanded=False)
-            # Obtain physical values
-            if physical is True:
-                # Perform dac to get physical signal
-                record.d_signals = record.dac(expanded=False, returnres=returnres)
-                record.p_signals = record.d_signals
-                record.d_signals = None
 
+            if physical is True:
+                # Perform inplace dac to get physical signal
+                record.dac(expanded=False, returnres=returnres, inplace=True)
+                
         # Return each sample of the signals with multiple samples per frame
         else:
             record.e_d_signals = _signals.rdsegment(record.filename, dirname, pbdir, record.nsig, record.fmt, record.siglen,
@@ -836,12 +834,11 @@ def rdsamp(recordname, sampfrom=0, sampto=None, channels = None, physical = True
 
             # Arrange/edit the object fields to reflect user channel and/or signal range input
             record.arrangefields(channels, expanded=True)
-            # Obtain physical values
+
             if physical is True:
                 # Perform dac to get physical signal
-                record.e_d_signals = record.dac(expanded=True, returnres=returnres)
-                record.e_p_signals = record.e_d_signals
-                record.e_d_signals = None
+                record.dac(expanded=True, returnres=returnres, inplace=True)
+                
 
     # A multi segment record
 
