fix test and add default option to adc expandframe

cx1111 · cx1111 · commit d7cf3242a270 · 2017-06-02T17:01:33.000-04:00
diff --git a/tests/test_records.py b/tests/test_records.py
@@ -127,13 +127,15 @@ def test_2b(self):
     # Target file created with: rdsamp -r sampledata/100_3chan -P | cut -f 2- >
     # target2c
     def test_2c(self):
-        sig, fields = wfdb.srdsamp('sampledata/100_3chan')
-        siground = np.round(sig, decimals=8)
+        record = wfdb.rdsamp('sampledata/100_3chan')
+        siground = np.round(record.p_signals, decimals=8)
         targetsig = np.genfromtxt('tests/targetoutputdata/target2c')
 
         # Test file writing
+        record.d_signals = record.adc()
         record.wrsamp()
-        recordwrite = wfdb.rdsamp('100_3chan', physical=False)
+        recordwrite = wfdb.rdsamp('100_3chan')
+        record.d_signals = None
 
         assert np.array_equal(siground, targetsig)
         assert record.__eq__(recordwrite)
@@ -276,8 +278,8 @@ def test_4c(self):
         assert np.array_equal(siground, targetsig)
         assert np.array_equal(sig, pbsig) and fields == pbfields
         assert np.array_equal(sig, writesig) and fields == writefields
-        
-        
+
+
     # Format 16 multi-samples per frame and skew, read expanded signals
     # Target file created with: rdsamp -r sampledata/test01_00s_skewframe -P -H | cut 
     # -f 2- > target4d
diff --git a/wfdb/_signals.py b/wfdb/_signals.py
@@ -261,7 +261,7 @@ def set_d_features(self, do_adc = False, singlefmt = 1, expanded=False):
 
     # Returns the analogue to digital conversion for the physical signal stored in p_signals. 
     # The p_signals, fmt, gain, and baseline fields must all be valid.
-    def adc(self, expanded):
+    def adc(self, expanded=False):
         
         # The digital nan values for each channel
         dnans = digi_nan(self.fmt)
