@@ -97,6 +97,12 @@ def _to_bool(txt):
9797 r' At Time: (?P<time>\S+)' ,
9898 filename_regex = r'## File Name: (?P<filename>\S+)' ,
9999 datetimeformat = '%m/%d/%Y %H:%M:%S.%f' ),
100+ # Cheetah version 5.6.0, some range of versions in between
101+ 'v5.6.0' : dict (
102+ datetime1_regex = r'## Time Opened: \(m/d/y\): (?P<date>\S+)'
103+ r' At Time: (?P<time>\S+)' ,
104+ filename_regex = r'## File Name: (?P<filename>\S+)' ,
105+ datetimeformat = '%m/%d/%Y %H:%M:%S.%f' ),
100106 # Cheetah version 5 before and including v 5.6.4 as well as version 1
101107 'bv5.6.4' : dict (
102108 datetime1_regex = r'## Time Opened \(m/d/y\): (?P<date>\S+)'
@@ -223,6 +229,8 @@ def __init__(self, filename):
223229 hpd = NlxHeader .header_pattern_dicts ['bv5' ]
224230 elif av <= Version ('5.4.0' ):
225231 hpd = NlxHeader .header_pattern_dicts ['v5.4.0' ]
232+ elif av == Version ('5.6.0' ):
233+ hpd = NlxHeader .header_pattern_dicts ['v5.6.0' ]
226234 elif av <= Version ('5.6.4' ):
227235 hpd = NlxHeader .header_pattern_dicts ['bv5.6.4' ]
228236 else :
@@ -303,11 +311,11 @@ def type_of_recording(self):
303311
304312 elif 'FileType' in self :
305313
306- if self ['FileVersion' ] in ['3.3' , '3.4' ]:
314+ if 'FileVersion' in self and self ['FileVersion' ] in ['3.3' , '3.4' ]:
307315 return self ['AcquisitionSystem' ].split ()[1 ].upper ()
308316
309317 else :
310- return 'UNKNOWN'
318+ return 'CHEETAH560' # only known case of FileType without FileVersion
311319
312320 else :
313321 return 'UNKNOWN'
0 commit comments