diff --git a/parser/CellData.py b/parser/CellData.py index e02585b..5ce6c02 100644 --- a/parser/CellData.py +++ b/parser/CellData.py @@ -82,6 +82,7 @@ class CellData: self.sam_eod_freqs = None self.sam_durations = None self.sam_trans_amplitudes = None + self.sam_traces = None self.sampling_interval = None self.recording_times = None @@ -179,6 +180,12 @@ class CellData: return contrast + def get_sam_traces(self): + if self.sam_traces is None: + warn("SAM traces might not be sorted in the same way as the spiketimes?!!!") + self.sam_traces = self.parser.get_sam_traces() + return self.sam_traces + def get_sam_spiketimes(self): self.__read_sam_info__() return self.sam_spiketimes diff --git a/parser/DataParserFactory.py b/parser/DataParserFactory.py index 952540c..f4a4c1a 100644 --- a/parser/DataParserFactory.py +++ b/parser/DataParserFactory.py @@ -40,6 +40,9 @@ class AbstractParser: def get_fi_frequency_traces(self): raise NotImplementedError("NOT YET OVERRIDDEN FROM ABSTRACT CLASS") + def get_sam_traces(self): + raise NotImplementedError("NOT YET OVERRIDDEN FROM ABSTRACT CLASS") + def get_sam_info(self): raise NotImplementedError("NOT YET OVERRIDDEN FROM ABSTRACT CLASS") @@ -279,6 +282,9 @@ class DatParser(AbstractParser): return trans_amplitudes, intensities, spiketimes + def get_sam_traces(self): + return self.__get_traces__("SAM") + def get_sam_info(self): contrasts = [] delta_fs = []