remove redundant format check

cx1111 · cx1111 · commit 03ea53e12957 · 2018-04-20T11:55:32.000-04:00
diff --git a/wfdb/io/_header.py b/wfdb/io/_header.py
@@ -492,7 +492,7 @@ def get_sig_name(self):
         if self.segments is None:
             raise Exception("The MultiRecord's segments must be read in before this method is called. ie. Call rdheader() with rd_segments=True")
 
-        if self.layout == 'Fixed':
+        if self.layout == 'fixed':
             for i in range(self.n_seg):
                 if self.seg_name[i] != '~':
                     sig_name = self.segments[i].sig_name
diff --git a/wfdb/io/record.py b/wfdb/io/record.py
@@ -18,7 +18,7 @@
 from . import _signal
 from . import download
 
-
+import pdb
 class BaseRecord(object):
     # The base WFDB class extended by the Record and MultiRecord classes.
     def __init__(self, record_name=None, n_sig=None,
@@ -569,7 +569,7 @@ def checksegmentcohesion(self):
     def required_segments(self, sampfrom, sampto, channels):
 
         # The starting segment with actual samples
-        if self.layout == 'Fixed':
+        if self.layout == 'fixed':
             startseg = 0
         else:
             startseg = 1
@@ -612,7 +612,7 @@ def required_segments(self, sampfrom, sampto, channels):
     def required_signal(self, readsegs, channels, dirname, pb_dir):
 
         # Fixed layout. All channels are the same.
-        if self.layout == 'Fixed':
+        if self.layout == 'fixed':
             # Should we bother here with skipping empty segments?
             # They won't be read anyway.
             readsigs = [channels]*len(readsegs)
@@ -649,7 +649,7 @@ def arrange_fields(self, readsegs, segranges, channels):
 
         # Get rid of the segments and segment line parameters
         # outside the desired segment range
-        if self.layout == 'Fixed':
+        if self.layout == 'fixed':
             self.segments = self.segments[readsegs[0]:readsegs[-1]+1]
             self.seg_name = self.seg_name[readsegs[0]:readsegs[-1]+1]
             self.seg_len = self.seg_len[readsegs[0]:readsegs[-1]+1]
@@ -703,7 +703,7 @@ def multi_to_single(self, return_res=64):
         startsamps = [0] + list(np.cumsum(self.seg_len)[0:-1])
         endsamps = list(np.cumsum(self.seg_len))
 
-        if self.layout == 'Fixed':
+        if self.layout == 'fixed':
             # Get the signal names and units from the first segment
             fields['sig_name'] = self.segments[0].sig_name
             fields['units'] = self.segments[0].units
@@ -834,9 +834,9 @@ def rdheader(record_name, pb_dir=None, rd_segments=False):
             setattr(record, field, d_rec[field])
         # Determine whether the record is fixed or variable
         if record.seg_len[0] == 0:
-            record.layout = 'Variable'
+            record.layout = 'variable'
         else:
-            record.layout = 'Fixed'
+            record.layout = 'fixed'
 
         # If specified, read the segment headers
         if rd_segments:
@@ -1000,14 +1000,9 @@ def rdrecord(record_name, sampfrom=0, sampto='end', channels='all',
 
         record.segments = [None]*record.n_seg
 
-        # Variable layout
-        if record.seg_len[0] == 0:
-            record.layout = 'Variable'
-            # Read the layout specification header
+        # Variable layout, read the layout specification header
+        if record.layout == 'variable':
             record.segments[0] = rdheader(os.path.join(dirname, record.seg_name[0]), pb_dir=pb_dir)
-        # Fixed layout
-        else:
-            record.layout = 'Fixed'
 
         # The segment numbers and samples within each segment to read.
         readsegs, segranges  = record.required_segments(sampfrom, sampto, channels)
