diff --git a/setup.cfg b/setup.cfg index 038c30c..4500282 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,6 +1,6 @@ [metadata] name = hextof-processor -version = 1.0.9 +version = 1.1.0 author = Yves Acremann, Steinn Ymir Agustsson, Davide Curcio, Maciej Dendzik, Michael Heber, Muhammad Zain Sohail, Rui Patrick Xian author_email = zainsohail04@gmail.com description = Hextof Offline Analyzer diff --git a/src/processor/DldFlashDataframeCreatorExpress.py b/src/processor/DldFlashDataframeCreatorExpress.py index 1043125..601dd4c 100644 --- a/src/processor/DldFlashDataframeCreatorExpress.py +++ b/src/processor/DldFlashDataframeCreatorExpress.py @@ -447,7 +447,7 @@ def readData(self, runs=None, ignore_missing_runs=False, settings=None, channels self.fillNA() df = dd.concat(self.dfs) df_electron = df.dropna(subset=self.channelsPerElectron) - pulse_columns = ['trainId','pulseId','electronId'] + self.channelsPerPulse + pulse_columns = ['trainId','pulseId','electronId'] + self.channelsPerPulse + self.channelsPerTrain df_pulse = df[pulse_columns] df_pulse = df_pulse[(df_pulse['electronId']==0)|(np.isnan(df_pulse['electronId']))]