adcgain defaults to float 200. dac divides by float gain for safety

cx1111 · cx1111 · commit 99761e34ca1b · 2017-04-19T10:11:59.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.0.3',
+    version='1.0.4',
 
     description='The WFDB Python Toolbox',
     long_description=long_description,
diff --git a/wfdb/_headers.py b/wfdb/_headers.py
@@ -441,7 +441,6 @@ def read_rec_line(recline):
 
 # Extract fields from signal line strings into a dictionary
 def read_sig_lines(siglines):
-
     # Dictionary for signal fields
     d_sig = {}
 
@@ -471,6 +470,7 @@ def read_sig_lines(siglines):
             # that different channels can be present or missing. 
             if d_sig[field][i] == '':
                 d_sig[field][i] = sigfieldspecs[field].read_def
+
                 # Special case: missing baseline defaults to ADCzero if present
                 if field == 'baseline' and d_sig['adczero'][i] != '':
                     d_sig['baseline'][i] = int(d_sig['adczero'][i])
@@ -482,7 +482,7 @@ def read_sig_lines(siglines):
                     d_sig[field][i] = float(d_sig[field][i])
                     # Special case: gain of 0 means 200
                     if field == 'adcgain' and d_sig['adcgain'][i] == 0:
-                        d_sig['adcgain'][i] = 200
+                        d_sig['adcgain'][i] = 200.
 
     return d_sig
 
@@ -566,7 +566,7 @@ def __init__(self, allowedtypes, delimiter, dependency, write_req, read_def, wri
                          ('sampsperframe', WFDBheaderspecs(inttypes, 'x', 'fmt', False, None, None)),
                          ('skew', WFDBheaderspecs(inttypes, ':', 'fmt', False, None, None)),
                          ('byteoffset', WFDBheaderspecs(inttypes, '+', 'fmt', False, None, None)),
-                         ('adcgain', WFDBheaderspecs(floattypes, ' ', 'fmt', True, 200, None)),
+                         ('adcgain', WFDBheaderspecs(floattypes, ' ', 'fmt', True, 200., None)),
                          ('baseline', WFDBheaderspecs(inttypes, '(', 'adcgain', True, 0, None)),
                          ('units', WFDBheaderspecs([str], '/', 'adcgain', True, 'mV', None)),
                          ('adcres', WFDBheaderspecs(inttypes, ' ', 'adcgain', False, None, 0)),
diff --git a/wfdb/_signals.py b/wfdb/_signals.py
@@ -168,13 +168,14 @@ def adc(self):
     def dac(self):
         
         # The digital nan values for each channel
-        dnans = digi_nan(self.fmt) 
+        dnans = digi_nan(self.fmt)
         
         # Get nan indices, indicated by minimum value. 
         nanlocs = self.d_signals == dnans
         
-        p_signal = (self.d_signals - self.baseline)/self.adcgain
-            
+        # adcgain values must be float for python 2 to ensure dtype = float64
+        p_signal = (self.d_signals - self.baseline)/[float(g) for g in self.adcgain]
+
         p_signal[nanlocs] = np.nan
                 
         return p_signal
diff --git a/wfdb/records.py b/wfdb/records.py
@@ -527,15 +527,13 @@ def requiredsegments(self, sampfrom, sampto, channels):
 
         # Obtain the sampfrom and sampto to read for each segment
         if readsegs[1] == readsegs[0]:
-            #print('a')
             # Only one segment to read
             readsegs = [readsegs[0]]
             # The segment's first sample number relative to the entire record
             segstartsamp = sum(self.seglen[0:readsegs[0]])
             readsamps = [[sampfrom-segstartsamp, sampto-segstartsamp]]
 
         else:
-            #print('b')
             # More than one segment to read
             readsegs = list(range(readsegs[0], readsegs[1]+1))
             readsamps = [[0, self.seglen[s]] for s in readsegs]
