Skip to content

Commit eac1624

Browse files
authored
Merge branch 'master' into plexon_for_apple_silicon
2 parents 83a0408 + a8f0e35 commit eac1624

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

neo/rawio/neuralynxrawio/nlxheader.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ def _to_bool(txt):
120120
datetime2_regex=r"-TimeClosed (?P<date>\S+) (?P<time>\S+)",
121121
filename_regex=r'-OriginalFileName "?(?P<filename>\S+)"?',
122122
datetimeformat=r"%Y/%m/%d %H:%M:%S",
123-
datetime2format=r"%Y/%m/%d %H:%M:%S.f",
123+
datetime2format=r"%Y/%m/%d %H:%M:%S.%f",
124124
),
125125
# Cheetah after v 5.6.4 and default for others such as Pegasus
126126
"def": dict(

neo/rawio/plexon2rawio/plexon2rawio.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,7 @@ def __init__(self, filename, pl2_dll_file_path=None):
128128

129129
self.pl2reader = PyPL2FileReader(pl2_dll_file_path=pl2_dll_file_path)
130130

131+
131132
reading_attempts = 10
132133
for attempt in range(reading_attempts):
133134
self.pl2reader.pl2_open_file(self.filename)
@@ -141,7 +142,6 @@ def __init__(self, filename, pl2_dll_file_path=None):
141142
self.pl2reader._print_error()
142143
raise IOError(f"Opening {self.filename} failed after {reading_attempts} attempts.")
143144

144-
145145
def _source_name(self):
146146
return self.filename
147147

0 commit comments

Comments
 (0)