ITSMFT: ensure backward comptability for MC2ROF

f3sch · f3sch · commit 423a43bcf41f · 2026-04-23T14:28:40.000+02:00
Signed-off-by: Felix Schlepper &lt;felix.schlepper@cern.ch&gt;
diff --git a/Detectors/ITSMFT/common/workflow/src/ClusterReaderSpec.cxx b/Detectors/ITSMFT/common/workflow/src/ClusterReaderSpec.cxx
@@ -69,6 +69,9 @@ void ClusterReader<N>::run(ProcessingContext& pc)
     }
     if (mUseMC) {
       pc.outputs().snapshot(Output{Origin, "CLUSTERSMCTR", iLayer}, *mClusterMCTruth[iLayer]);
+      // read dummy MC2ROF vector to keep writer/readers backward compatible
+      static std::vector<o2::itsmft::MC2ROFRecord> dummyMC2ROF;
+      pc.outputs().snapshot(Output{Origin, "CLUSTERSMC2ROF", iLayer}, dummyMC2ROF);
     }
   }
   if (mTriggerOut) {
@@ -141,6 +144,7 @@ std::vector<OutputSpec> makeOutChannels(o2::header::DataOrigin detOrig, bool mct
     }
     if (mctruth) {
       outputs.emplace_back(detOrig, "CLUSTERSMCTR", iLayer, Lifetime::Timeframe);
+      outputs.emplace_back(detOrig, "CLUSTERSMC2ROF", iLayer, Lifetime::Timeframe);
     }
   }
   if (triggerOut) {
diff --git a/Detectors/ITSMFT/common/workflow/src/ClusterWriterSpec.cxx b/Detectors/ITSMFT/common/workflow/src/ClusterWriterSpec.cxx
@@ -37,6 +37,7 @@ using CompClusType = std::vector<o2::itsmft::CompClusterExt>;
 using PatternsType = std::vector<unsigned char>;
 using ROFrameRType = std::vector<o2::itsmft::ROFRecord>;
 using LabelsType = o2::dataformats::MCTruthContainer<o2::MCCompLabel>;
+using ROFRecLblT = std::vector<o2::itsmft::MC2ROFRecord>;
 using namespace o2::header;
 
 template <int N>
@@ -105,6 +106,11 @@ DataProcessorSpec getClusterWriterSpec(bool useMC, bool doStag)
                                                              (detName + "ClusterMCTruth").c_str(), "cluster-label-branch",
                                                              (useMC ? nLayers : 0),
                                                              getIndex,
+                                                             getName},
+                                BranchDefinition<ROFRecLblT>{InputSpec{"MC2ROframes", ConcreteDataTypeMatcher{Origin, "CLUSTERSMC2ROF"}},
+                                                             (detName + "ClustersMC2ROF").c_str(), "cluster-mc2rof-branch",
+                                                             (useMC ? nLayers : 0),
+                                                             getIndex,
                                                              getName})();
 }
 
diff --git a/Detectors/ITSMFT/common/workflow/src/ClustererSpec.cxx b/Detectors/ITSMFT/common/workflow/src/ClustererSpec.cxx
@@ -190,6 +190,9 @@ void ClustererDPL<N>::run(ProcessingContext& pc)
 
     if (mUseMC) {
       pc.outputs().snapshot(Output{Origin, "CLUSTERSMCTR", iLayer}, *clusterLabels); // at the moment requires snapshot
+      // write dummy MC2ROF vector to keep writer/readers backward compatible
+      static std::vector<o2::itsmft::MC2ROFRecord> dummyMC2ROF;
+      pc.outputs().snapshot(Output{Origin, "CLUSTERSMC2ROF", iLayer}, dummyMC2ROF);
     }
     reader.reset();
 
@@ -306,6 +309,7 @@ DataProcessorSpec getClustererSpec(bool useMC, bool doStag)
     outputs.emplace_back(Origin, "CLUSTERSROF", iLayer, Lifetime::Timeframe);
     if (useMC) {
       outputs.emplace_back(Origin, "CLUSTERSMCTR", iLayer, Lifetime::Timeframe);
+      outputs.emplace_back(Origin, "CLUSTERSMC2ROF", iLayer, Lifetime::Timeframe);
     }
   }
   return DataProcessorSpec{
diff --git a/Detectors/ITSMFT/common/workflow/src/DigitReaderSpec.cxx b/Detectors/ITSMFT/common/workflow/src/DigitReaderSpec.cxx
@@ -112,6 +112,9 @@ void DigitReader<N>::run(ProcessingContext& pc)
         mPLabels[iLayer]->copyandflatten(sharedlabels);
         delete mPLabels[iLayer];
         mPLabels[iLayer] = nullptr;
+        // read dummy MC2ROF vector to keep writer/readers backward compatible
+        static std::vector<o2::itsmft::MC2ROFRecord> dummyMC2ROF;
+        pc.outputs().snapshot(Output{Origin, "DIGITSMC2ROF", iLayer}, dummyMC2ROF);
       }
     }
     if (mUseCalib) {
@@ -267,6 +270,7 @@ std::vector<OutputSpec> makeOutChannels(bool mctruth, bool doStag, bool useCalib
     outputs.emplace_back(Origin, "DIGITS", iLayer, Lifetime::Timeframe);
     outputs.emplace_back(Origin, "DIGITSROF", iLayer, Lifetime::Timeframe);
     if (mctruth) {
+      outputs.emplace_back(Origin, "DIGITSMC2ROF", iLayer, Lifetime::Timeframe);
       outputs.emplace_back(Origin, "DIGITSMCTR", iLayer, Lifetime::Timeframe);
     }
   }
diff --git a/Detectors/ITSMFT/common/workflow/src/DigitWriterSpec.cxx b/Detectors/ITSMFT/common/workflow/src/DigitWriterSpec.cxx
@@ -141,6 +141,11 @@ DataProcessorSpec getDigitWriterSpec(bool mctruth, bool doStag, bool dec, bool c
                                                                     fillLabels,
                                                                     getIndex,
                                                                     getName},
+                                BranchDefinition<std::vector<itsmft::MC2ROFRecord>>{InputSpec{detStr + "_digitsMC2ROF", ConcreteDataTypeMatcher{Origin, "DIGITSMC2ROF"}},
+                                                                                    detStr + "DigitMC2ROF", "digit-mc2rof-branch",
+                                                                                    (mctruth ? mLayers : 0),
+                                                                                    getIndex,
+                                                                                    getName},
                                 BranchDefinition<std::vector<itsmft::GBTCalibData>>{InputSpec{detStr + "calib", ConcreteDataTypeMatcher{Origin, "GBTCALIB"}},
                                                                                     detStr + "Calib", "digit-calib-branch",
                                                                                     (calib ? 1 : 0)})();
diff --git a/Detectors/ITSMFT/common/workflow/src/digit-reader-workflow.cxx b/Detectors/ITSMFT/common/workflow/src/digit-reader-workflow.cxx
@@ -57,7 +57,7 @@ WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
     bool doStag = o2::itsmft::DPLAlpideParamInitializer::isMFTStaggeringEnabled(cfgc);
     wf.emplace_back(o2::itsmft::getMFTDigitReaderSpec(useMC, doStag, calib, withTriggers));
   } else {
-    bool doStag = o2::itsmft::DPLAlpideParamInitializer::isMFTStaggeringEnabled(cfgc);
+    bool doStag = o2::itsmft::DPLAlpideParamInitializer::isITSStaggeringEnabled(cfgc);
     wf.emplace_back(o2::itsmft::getITSDigitReaderSpec(useMC, doStag, calib, withTriggers));
   }
   o2::raw::HBFUtilsInitializer hbfIni(cfgc, wf);
diff --git a/Steer/DigitizerWorkflow/src/ITSMFTDigitizerSpec.cxx b/Steer/DigitizerWorkflow/src/ITSMFTDigitizerSpec.cxx
@@ -228,6 +228,9 @@ class ITSMFTDPLDigitizerTask : BaseDPLDigitizer
         // free space of existing label containers
         mLabels[iLayer].clear_andfreememory();
         mLabelsAccum[iLayer].clear_andfreememory();
+        // write dummy MC2ROF vector to keep writer/readers backward compatible
+        static std::vector<o2::itsmft::MC2ROFRecord> dummyMC2ROF;
+        pc.outputs().snapshot(Output{Origin, "DIGITSMC2ROF", iLayer}, dummyMC2ROF);
       }
     }
 
@@ -404,6 +407,7 @@ std::vector<OutputSpec> makeOutChannels(o2::header::DataOrigin detOrig, bool mct
     outputs.emplace_back(detOrig, "DIGITS", iLayer, Lifetime::Timeframe);
     outputs.emplace_back(detOrig, "DIGITSROF", iLayer, Lifetime::Timeframe);
     if (mctruth) {
+      outputs.emplace_back(detOrig, "DIGITSMC2ROF", iLayer, Lifetime::Timeframe);
       outputs.emplace_back(detOrig, "DIGITSMCTR", iLayer, Lifetime::Timeframe);
     }
   }

Original file line number	Diff line number	Diff line change
`@@ -69,6 +69,9 @@ void ClusterReader<N>::run(ProcessingContext& pc)`
`69`	`69`	`}`
`70`	`70`	`if (mUseMC) {`
`71`	`71`	`pc.outputs().snapshot(Output{Origin, "CLUSTERSMCTR", iLayer}, *mClusterMCTruth[iLayer]);`
	`72`	`+ // read dummy MC2ROF vector to keep writer/readers backward compatible`
	`73`	`+ static std::vector<o2::itsmft::MC2ROFRecord> dummyMC2ROF;`
	`74`	`+ pc.outputs().snapshot(Output{Origin, "CLUSTERSMC2ROF", iLayer}, dummyMC2ROF);`
`72`	`75`	`}`
`73`	`76`	`}`
`74`	`77`	`if (mTriggerOut) {`
`@@ -141,6 +144,7 @@ std::vector<OutputSpec> makeOutChannels(o2::header::DataOrigin detOrig, bool mct`
`141`	`144`	`}`
`142`	`145`	`if (mctruth) {`
`143`	`146`	`outputs.emplace_back(detOrig, "CLUSTERSMCTR", iLayer, Lifetime::Timeframe);`
	`147`	`+ outputs.emplace_back(detOrig, "CLUSTERSMC2ROF", iLayer, Lifetime::Timeframe);`
`144`	`148`	`}`
`145`	`149`	`}`
`146`	`150`	`if (triggerOut) {`
Original file line number	Diff line number	Diff line change
`@@ -190,6 +190,9 @@ void ClustererDPL<N>::run(ProcessingContext& pc)`
`190`	`190`
`191`	`191`	`if (mUseMC) {`
`192`	`192`	`pc.outputs().snapshot(Output{Origin, "CLUSTERSMCTR", iLayer}, *clusterLabels); // at the moment requires snapshot`
	`193`	`+ // write dummy MC2ROF vector to keep writer/readers backward compatible`
	`194`	`+ static std::vector<o2::itsmft::MC2ROFRecord> dummyMC2ROF;`
	`195`	`+ pc.outputs().snapshot(Output{Origin, "CLUSTERSMC2ROF", iLayer}, dummyMC2ROF);`
`193`	`196`	`}`
`194`	`197`	`reader.reset();`
`195`	`198`
`@@ -306,6 +309,7 @@ DataProcessorSpec getClustererSpec(bool useMC, bool doStag)`
`306`	`309`	`outputs.emplace_back(Origin, "CLUSTERSROF", iLayer, Lifetime::Timeframe);`
`307`	`310`	`if (useMC) {`
`308`	`311`	`outputs.emplace_back(Origin, "CLUSTERSMCTR", iLayer, Lifetime::Timeframe);`
	`312`	`+ outputs.emplace_back(Origin, "CLUSTERSMC2ROF", iLayer, Lifetime::Timeframe);`
`309`	`313`	`}`
`310`	`314`	`}`
`311`	`315`	`return DataProcessorSpec{`
Original file line number	Diff line number	Diff line change
`@@ -112,6 +112,9 @@ void DigitReader<N>::run(ProcessingContext& pc)`
`112`	`112`	`mPLabels[iLayer]->copyandflatten(sharedlabels);`
`113`	`113`	`delete mPLabels[iLayer];`
`114`	`114`	`mPLabels[iLayer] = nullptr;`
	`115`	`+ // read dummy MC2ROF vector to keep writer/readers backward compatible`
	`116`	`+ static std::vector<o2::itsmft::MC2ROFRecord> dummyMC2ROF;`
	`117`	`+ pc.outputs().snapshot(Output{Origin, "DIGITSMC2ROF", iLayer}, dummyMC2ROF);`
`115`	`118`	`}`
`116`	`119`	`}`
`117`	`120`	`if (mUseCalib) {`
`@@ -267,6 +270,7 @@ std::vector<OutputSpec> makeOutChannels(bool mctruth, bool doStag, bool useCalib`
`267`	`270`	`outputs.emplace_back(Origin, "DIGITS", iLayer, Lifetime::Timeframe);`
`268`	`271`	`outputs.emplace_back(Origin, "DIGITSROF", iLayer, Lifetime::Timeframe);`
`269`	`272`	`if (mctruth) {`
	`273`	`+ outputs.emplace_back(Origin, "DIGITSMC2ROF", iLayer, Lifetime::Timeframe);`
`270`	`274`	`outputs.emplace_back(Origin, "DIGITSMCTR", iLayer, Lifetime::Timeframe);`
`271`	`275`	`}`
`272`	`276`	`}`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)`
`57`	`57`	`bool doStag = o2::itsmft::DPLAlpideParamInitializer::isMFTStaggeringEnabled(cfgc);`
`58`	`58`	`wf.emplace_back(o2::itsmft::getMFTDigitReaderSpec(useMC, doStag, calib, withTriggers));`
`59`	`59`	`} else {`
`60`		`- bool doStag = o2::itsmft::DPLAlpideParamInitializer::isMFTStaggeringEnabled(cfgc);`
	`60`	`+ bool doStag = o2::itsmft::DPLAlpideParamInitializer::isITSStaggeringEnabled(cfgc);`
`61`	`61`	`wf.emplace_back(o2::itsmft::getITSDigitReaderSpec(useMC, doStag, calib, withTriggers));`
`62`	`62`	`}`
`63`	`63`	`o2::raw::HBFUtilsInitializer hbfIni(cfgc, wf);`
Original file line number	Diff line number	Diff line change
`@@ -228,6 +228,9 @@ class ITSMFTDPLDigitizerTask : BaseDPLDigitizer`
`228`	`228`	`// free space of existing label containers`
`229`	`229`	`mLabels[iLayer].clear_andfreememory();`
`230`	`230`	`mLabelsAccum[iLayer].clear_andfreememory();`
	`231`	`+ // write dummy MC2ROF vector to keep writer/readers backward compatible`
	`232`	`+ static std::vector<o2::itsmft::MC2ROFRecord> dummyMC2ROF;`
	`233`	`+ pc.outputs().snapshot(Output{Origin, "DIGITSMC2ROF", iLayer}, dummyMC2ROF);`
`231`	`234`	`}`
`232`	`235`	`}`
`233`	`236`
`@@ -404,6 +407,7 @@ std::vector<OutputSpec> makeOutChannels(o2::header::DataOrigin detOrig, bool mct`
`404`	`407`	`outputs.emplace_back(detOrig, "DIGITS", iLayer, Lifetime::Timeframe);`
`405`	`408`	`outputs.emplace_back(detOrig, "DIGITSROF", iLayer, Lifetime::Timeframe);`
`406`	`409`	`if (mctruth) {`
	`410`	`+ outputs.emplace_back(detOrig, "DIGITSMC2ROF", iLayer, Lifetime::Timeframe);`
`407`	`411`	`outputs.emplace_back(detOrig, "DIGITSMCTR", iLayer, Lifetime::Timeframe);`
`408`	`412`	`}`
`409`	`413`	`}`