HfEventSelection: Get ZorroSummary output object via optional pointer

vkucera · vkucera · commit 8770cf337958 · 2025-12-12T14:34:57.000+01:00
diff --git a/PWGHF/D2H/TableProducer/dataCreatorCharmHadPiReduced.cxx b/PWGHF/D2H/TableProducer/dataCreatorCharmHadPiReduced.cxx
@@ -396,7 +396,7 @@ struct HfDataCreatorCharmHadPiReduced {
     setLabelHistoCands(hCandidatesD0FromDstar);
 
     // init HF event selection helper
-    hfEvSel.init(registry, zorroSummary);
+    hfEvSel.init(registry, &zorroSummary);
     if (doprocessDplusPiMc || doprocessDplusPiMcWithMl ||
         doprocessDsPiMc || doprocessDsPiMcWithMl ||
         doprocessD0PiMc || doprocessD0PiMcWithMl ||
diff --git a/PWGHF/D2H/TableProducer/dataCreatorCharmResoToD0Reduced.cxx b/PWGHF/D2H/TableProducer/dataCreatorCharmResoToD0Reduced.cxx
@@ -173,7 +173,7 @@ struct HfDataCreatorCharmResoToD0Reduced {
     fitter.setWeightedFinalPCA(false);
 
     // init HF event selection helper
-    hfEvSel.init(registry, zorroSummary);
+    hfEvSel.init(registry, &zorroSummary);
 
     const auto& workflows = initContext.services().get<RunningWorkflowInfo const>();
     for (const DeviceSpec& device : workflows.devices) {
diff --git a/PWGHF/D2H/TableProducer/dataCreatorCharmResoToDplusReduced.cxx b/PWGHF/D2H/TableProducer/dataCreatorCharmResoToDplusReduced.cxx
@@ -172,7 +172,7 @@ struct HfDataCreatorCharmResoToDplusReduced {
     fitter.setWeightedFinalPCA(false);
 
     // init HF event selection helper
-    hfEvSel.init(registry, zorroSummary);
+    hfEvSel.init(registry, &zorroSummary);
 
     const auto& workflows = initContext.services().get<RunningWorkflowInfo const>();
     for (const DeviceSpec& device : workflows.devices) {
diff --git a/PWGHF/D2H/TableProducer/dataCreatorCharmResoToDstarReduced.cxx b/PWGHF/D2H/TableProducer/dataCreatorCharmResoToDstarReduced.cxx
@@ -171,7 +171,7 @@ struct HfDataCreatorCharmResoToDstarReduced {
     fitter.setWeightedFinalPCA(false);
 
     // init HF event selection helper
-    hfEvSel.init(registry, zorroSummary);
+    hfEvSel.init(registry, &zorroSummary);
 
     const auto& workflows = initContext.services().get<RunningWorkflowInfo const>();
     for (const DeviceSpec& device : workflows.devices) {
diff --git a/PWGHF/D2H/TableProducer/dataCreatorJpsiHadReduced.cxx b/PWGHF/D2H/TableProducer/dataCreatorJpsiHadReduced.cxx
@@ -337,7 +337,7 @@ struct HfDataCreatorJpsiHadReduced {
     }
 
     // init HF event selection helper
-    hfEvSel.init(registry, zorroSummary);
+    hfEvSel.init(registry, &zorroSummary);
     if (doprocessJpsiKMc || doprocessJpsiPhiMc) {
       const auto& workflows = initContext.services().get<RunningWorkflowInfo const>();
       for (const DeviceSpec& device : workflows.devices) {
diff --git a/PWGHF/D2H/Tasks/taskCharmPolarisation.cxx b/PWGHF/D2H/Tasks/taskCharmPolarisation.cxx
@@ -719,8 +719,7 @@ struct HfTaskCharmPolarisation {
     }
 
     if (doprocessResolEventPlane) {
-      int dummyVariable;
-      hfEvSel.init(registry, dummyVariable);
+      hfEvSel.init(registry);
       ccdb->setURL("http://alice-ccdb.cern.ch");
       ccdb->setCaching(true);
       ccdb->setLocalObjectValidityChecking();
diff --git a/PWGHF/D2H/Tasks/taskFlowCharmHadrons.cxx b/PWGHF/D2H/Tasks/taskFlowCharmHadrons.cxx
@@ -302,8 +302,7 @@ struct HfTaskFlowCharmHadrons {
         registry.add("spReso/hSparseReso", "THn for resolution with occupancy", HistType::kTHnSparseF, axesReso);
       }
 
-      int dummyVariable;
-      hfEvSel.init(registry, dummyVariable);
+      hfEvSel.init(registry);
       ccdb->setURL(ccdbUrl);
       ccdb->setCaching(true);
       ccdb->setLocalObjectValidityChecking();
diff --git a/PWGHF/TableProducer/candidateCreator2Prong.cxx b/PWGHF/TableProducer/candidateCreator2Prong.cxx
@@ -187,7 +187,7 @@ struct HfCandidateCreator2Prong {
     hCandidates = registry.add<TH1>("hCandidates", "candidates counter", {HistType::kTH1D, {axisCands}});
 
     // init HF event selection helper
-    hfEvSel.init(registry, zorroSummary);
+    hfEvSel.init(registry, &zorroSummary);
 
     if (std::accumulate(doprocessDF.begin(), doprocessDF.end(), 0) == 1) {
       registry.fill(HIST("hVertexerType"), aod::hf_cand::VertexerType::DCAFitter);
diff --git a/PWGHF/TableProducer/candidateCreator3Prong.cxx b/PWGHF/TableProducer/candidateCreator3Prong.cxx
@@ -221,7 +221,7 @@ struct HfCandidateCreator3Prong {
     hCandidates = registry.add<TH1>("hCandidates", "candidates counter", {HistType::kTH1D, {axisCands}});
 
     // init HF event selection helper
-    hfEvSel.init(registry, zorroSummary);
+    hfEvSel.init(registry, &zorroSummary);
 
     // Configure DCAFitterN
     // df.setBz(bz);
diff --git a/PWGHF/TableProducer/candidateCreatorCascade.cxx b/PWGHF/TableProducer/candidateCreatorCascade.cxx
@@ -141,7 +141,7 @@ struct HfCandidateCreatorCascade {
     hCandidates = registry.add<TH1>("hCandidates", "candidates counter", {HistType::kTH1D, {axisCands}});
 
     // init HF event selection helper
-    hfEvSel.init(registry, zorroSummary);
+    hfEvSel.init(registry, &zorroSummary);
 
     massP = MassProton;
     massK0s = MassK0Short;
diff --git a/PWGHF/TableProducer/candidateCreatorDstar.cxx b/PWGHF/TableProducer/candidateCreatorDstar.cxx
@@ -174,7 +174,7 @@ struct HfCandidateCreatorDstar {
     hCandidates = registry.add<TH1>("hCandidates", "candidates counter", {HistType::kTH1D, {axisCands}});
 
     // init HF event selection helper
-    hfEvSel.init(registry, zorroSummary);
+    hfEvSel.init(registry, &zorroSummary);
 
     // LOG(info) << "Init Function Invoked";
     massPi = MassPiPlus;
diff --git a/PWGHF/TableProducer/candidateCreatorXic0Omegac0.cxx b/PWGHF/TableProducer/candidateCreatorXic0Omegac0.cxx
@@ -366,7 +366,7 @@ struct HfCandidateCreatorXic0Omegac0 {
     }
 
     // init HF event selection helper
-    hfEvSel.init(registry, zorroSummary);
+    hfEvSel.init(registry, &zorroSummary);
 
     df.setPropagateToPCA(propagateToPCA);
     df.setMaxR(maxR);
diff --git a/PWGHF/TableProducer/candidateCreatorXicToXiPiPi.cxx b/PWGHF/TableProducer/candidateCreatorXicToXiPiPi.cxx
@@ -186,7 +186,7 @@ struct HfCandidateCreatorXicToXiPiPi {
     runNumber = 0;
 
     // initialize HF event selection helper
-    hfEvSel.init(registry, zorroSummary);
+    hfEvSel.init(registry, &zorroSummary);
 
     // initialize 3-prong vertex fitter
     df.setPropagateToPCA(propagateToPCA);
diff --git a/PWGHF/Utils/utilsEvSelHf.h b/PWGHF/Utils/utilsEvSelHf.h
@@ -254,8 +254,7 @@ struct HfEventSelection : o2::framework::ConfigurableGroup {
 
   /// \brief Inits the HF event selection object
   /// \param registry reference to the histogram registry
-  template <typename T>
-  void init(o2::framework::HistogramRegistry& registry, T& zorroSummary)
+  void init(o2::framework::HistogramRegistry& registry, o2::framework::OutputObj<ZorroSummary>* zorroSummary = nullptr)
   {
     // we initialise the RCT checker
     if (requireGoodRct) {
@@ -264,11 +263,11 @@ struct HfEventSelection : o2::framework::ConfigurableGroup {
 
     // we initialise the summary object
     if (!softwareTrigger.value.empty()) {
-      if constexpr (std::is_same_v<T, o2::framework::OutputObj<ZorroSummary>>) {
-        zorroSummary.setObject(zorro.getZorroSummary());
-      } else {
-        LOGP(fatal, "No o2::framework::OutputObj<ZorroSummary> provided to HF event selection object in your task, add it if you want to get the normalisation from Zorro.");
+      if (zorroSummary == nullptr) {
+        LOGP(fatal, "No OutputObj<ZorroSummary> provided to HF event selection object in your task, add it if you want to get the normalisation from Zorro.");
+        return;
       }
+      zorroSummary->setObject(zorro.getZorroSummary());
     }
 
     // we initialise histograms

Original file line number	Diff line number	Diff line change
`@@ -337,7 +337,7 @@ struct HfDataCreatorJpsiHadReduced {`
`337`	`337`	`}`
`338`	`338`
`339`	`339`	`// init HF event selection helper`
`340`		`- hfEvSel.init(registry, zorroSummary);`
	`340`	`+ hfEvSel.init(registry, &zorroSummary);`
`341`	`341`	`if (doprocessJpsiKMc \|\| doprocessJpsiPhiMc) {`
`342`	`342`	`const auto& workflows = initContext.services().get<RunningWorkflowInfo const>();`
`343`	`343`	`for (const DeviceSpec& device : workflows.devices) {`
Original file line number	Diff line number	Diff line change
`@@ -719,8 +719,7 @@ struct HfTaskCharmPolarisation {`
`719`	`719`	`}`
`720`	`720`
`721`	`721`	`if (doprocessResolEventPlane) {`
`722`		`- int dummyVariable;`
`723`		`- hfEvSel.init(registry, dummyVariable);`
	`722`	`+ hfEvSel.init(registry);`
`724`	`723`	`ccdb->setURL("http://alice-ccdb.cern.ch");`
`725`	`724`	`ccdb->setCaching(true);`
`726`	`725`	`ccdb->setLocalObjectValidityChecking();`
Original file line number	Diff line number	Diff line change
`@@ -302,8 +302,7 @@ struct HfTaskFlowCharmHadrons {`
`302`	`302`	`registry.add("spReso/hSparseReso", "THn for resolution with occupancy", HistType::kTHnSparseF, axesReso);`
`303`	`303`	`}`
`304`	`304`
`305`		`- int dummyVariable;`
`306`		`- hfEvSel.init(registry, dummyVariable);`
	`305`	`+ hfEvSel.init(registry);`
`307`	`306`	`ccdb->setURL(ccdbUrl);`
`308`	`307`	`ccdb->setCaching(true);`
`309`	`308`	`ccdb->setLocalObjectValidityChecking();`