Hotfix: ddMicrobunches didn't include Train channels

momentoscope · Jan 27, 2022 · 9d3926b · 9d3926b
1 parent 5422a80
commit 9d3926b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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']))]