Skip to content

BUGFIXES: handling filenames, reading float values, and event annotation #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dominikwelke wants to merge 1 commit into
base: main
Choose a base branch
from
Open

BUGFIXES: handling filenames, reading float values, and event annotation #11

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions curryreader.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ def read(inputfilename='', plotdata = 1, verbosity = 2):
filename = os.path.basename(filepath)

try:
basename, extension = filepath.split(".", maxsplit=1)
basename, extension = ".".join(filepath.split(".")[:-1]), filepath.split(".")[-1] # BUG (cannot handle dots in paths) FIXED
except:
raise Exception("Unsupported file, choose a cdt or dat file")

Expand Down Expand Up @@ -156,7 +156,7 @@ def read(inputfilename='', plotdata = 1, verbosity = 2):
text = contents[ixstart:ixstop].strip()
if text == 'ASCII' or text == 'CHAN' : # test for alphanumeric values
a[i] = 1
elif text.isnumeric() :
elif text.replace('.','',1).isnumeric() : # BUG (float not recognized) FIXED
a[i] = float(text) # assign if it was a number

# derived variables. numbers (1) (2) etc are the token numbers
Expand All @@ -168,13 +168,13 @@ def read(inputfilename='', plotdata = 1, verbosity = 2):
nASCII = int(a[5] + a[int(5 + nt / 2)])
nMultiplex = int(a[6] + a[int(6 + nt / 2)])
fSampleTime = a[7] + a[int(7 + nt / 2)]

datainfo = { "samples" : nSamples, "channels" : nChannels, "trials" : nTrials, "samplingfreq" : fFrequency }
log.info('Number of samples = %s, number of channels = %s, number of trials/epochs = %s, sampling frequency = %s Hz', str(nSamples), str( nChannels), str(nTrials), str(fFrequency))

if fFrequency == 0 or fSampleTime != 0:
if fFrequency == 0. or fSampleTime != 0.: # BUG (order) FIXED
fFrequency = 1000000 / fSampleTime

datainfo = { "samples" : nSamples, "channels" : nChannels, "trials" : nTrials, "samplingfreq" : fFrequency }
log.info('Number of samples = %s, number of channels = %s, number of trials/epochs = %s, sampling frequency = %s Hz', str(nSamples), str( nChannels), str(nTrials), str(fFrequency))

# try to guess number of samples based on datafile size
if nSamples < 0:
if nASCII == 1:
Expand Down Expand Up @@ -415,7 +415,7 @@ def read(inputfilename='', plotdata = 1, verbosity = 2):
tixstop = contents.find('REMARK_LIST END_LIST')

if tixstart != -1 and tixstop != 1 :
annotations = contents[tixstart:tixstop - 1].splitlines()
annotations = contents[tixstart+1:tixstop].splitlines() # BUG (does not read correct lines) FIXED

log.info('Found events')

Expand Down