[EMCAL-548] Propagate trigger type fromn digits to cell trigger record

mfasDa · davidrohr · commit 2aa92e57cc10 · 2022-02-08T22:39:38.000+01:00
diff --git a/DataFormats/Detectors/EMCAL/include/DataFormatsEMCAL/TriggerRecord.h b/DataFormats/Detectors/EMCAL/include/DataFormatsEMCAL/TriggerRecord.h
@@ -64,9 +64,9 @@ class TriggerRecord
     PHYSTRIGGER, ///< Physics trigger
     CALIBTRIGGER ///< Calib trigger
   };
-  BCData mBCData;        /// Bunch crossing data of the trigger
-  DataRange mDataRange;  /// Index of the triggering event (event index and first entry in the container)
-  uint32_t mTriggerBits; /// Trigger bits as from the Raw Data Header
+  BCData mBCData;            /// Bunch crossing data of the trigger
+  DataRange mDataRange;      /// Index of the triggering event (event index and first entry in the container)
+  uint32_t mTriggerBits = 0; /// Trigger bits as from the Raw Data Header
 
   ClassDefNV(TriggerRecord, 2);
 };
diff --git a/Detectors/EMCAL/workflow/src/CellConverterSpec.cxx b/Detectors/EMCAL/workflow/src/CellConverterSpec.cxx
@@ -59,7 +59,7 @@ void CellConverterSpec::run(framework::ProcessingContext& ctx)
   int currentstart = mOutputCells.size(), ncellsTrigger = 0;
   for (const auto& trg : triggers) {
     if (!trg.getNumberOfObjects()) {
-      mOutputTriggers.emplace_back(trg.getBCData(), currentstart, ncellsTrigger);
+      mOutputTriggers.emplace_back(trg.getBCData(), trg.getTriggerBits(), currentstart, ncellsTrigger);
       continue;
     }
     gsl::span<const o2::emcal::Digit> digits(digitsAll.data() + trg.getFirstEntry(), trg.getNumberOfObjects());
@@ -91,7 +91,7 @@ void CellConverterSpec::run(framework::ProcessingContext& ctx)
         ncellsTrigger++;
       }
     }
-    mOutputTriggers.emplace_back(trg.getBCData(), currentstart, ncellsTrigger);
+    mOutputTriggers.emplace_back(trg.getBCData(), trg.getTriggerBits(), currentstart, ncellsTrigger);
     currentstart = mOutputCells.size();
     ncellsTrigger = 0;
   }

Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ void CellConverterSpec::run(framework::ProcessingContext& ctx)`
`59`	`59`	`int currentstart = mOutputCells.size(), ncellsTrigger = 0;`
`60`	`60`	`for (const auto& trg : triggers) {`
`61`	`61`	`if (!trg.getNumberOfObjects()) {`
`62`		`- mOutputTriggers.emplace_back(trg.getBCData(), currentstart, ncellsTrigger);`
	`62`	`+ mOutputTriggers.emplace_back(trg.getBCData(), trg.getTriggerBits(), currentstart, ncellsTrigger);`
`63`	`63`	`continue;`
`64`	`64`	`}`
`65`	`65`	`gsl::span<const o2::emcal::Digit> digits(digitsAll.data() + trg.getFirstEntry(), trg.getNumberOfObjects());`
`@@ -91,7 +91,7 @@ void CellConverterSpec::run(framework::ProcessingContext& ctx)`
`91`	`91`	`ncellsTrigger++;`
`92`	`92`	`}`
`93`	`93`	`}`
`94`		`- mOutputTriggers.emplace_back(trg.getBCData(), currentstart, ncellsTrigger);`
	`94`	`+ mOutputTriggers.emplace_back(trg.getBCData(), trg.getTriggerBits(), currentstart, ncellsTrigger);`
`95`	`95`	`currentstart = mOutputCells.size();`
`96`	`96`	`ncellsTrigger = 0;`
`97`	`97`	`}`