aboutsummaryrefslogtreecommitdiff
path: root/qolab/data/trace.py
diff options
context:
space:
mode:
Diffstat (limited to 'qolab/data/trace.py')
-rw-r--r--qolab/data/trace.py4
1 files changed, 1 insertions, 3 deletions
diff --git a/qolab/data/trace.py b/qolab/data/trace.py
index 87e0b4e..bd2bdb8 100644
--- a/qolab/data/trace.py
+++ b/qolab/data/trace.py
@@ -57,10 +57,8 @@ def loadTraceRawHeaderAndData(fname, tryCompressedIfMissing=True):
break
header=yaml.load(str.join('\n', headerstr), Loader=yaml.BaseLoader)
# now we load the data itself
- # data=np.genfromtxt(fname, comments='%', delimiter='\t')
- # Note: pandas reads csv faster by factor of 8 then numpy.genfromtxt
- # data=pandas.read_csv('/home/evmik/hopping_trace_20220706_02141.dat', comment='%', delimiter='\t', header=None)
tracefile.seek(0) # rewind file to the beginning
+ # Note: pandas reads csv faster by factor of 8 then numpy.genfromtxt
df = pandas.read_csv(tracefile, comment='%', delimiter='\t', header=None)
data = df.to_numpy()
return(header, data)