Skip to content

Commit b8282e3

Browse files
fcatalan92fcatalan92
authored
[PWGHF] Fix: save ZorroSummary in task output (#14012)
1 parent 5e71e1b commit b8282e3

10 files changed

+29
-11
lines changed

‎PWGHF/D2H/TableProducer/dataCreatorCharmHadPiReduced.cxx‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
#include "PWGHF/Utils/utilsTrkCandHf.h"
3333

3434
#include "Common/Core/RecoDecay.h"
35+
#include "Common/Core/ZorroSummary.h"
3536
#include "Common/Core/trackUtilities.h"
3637
#include "Common/DataModel/Centrality.h"
3738
#include "Common/DataModel/CollisionAssociationTables.h"
@@ -272,6 +273,7 @@ struct HfDataCreatorCharmHadPiReduced {
272273

273274
std::shared_ptr<TH1> hCandidatesD0, hCandidatesDPlus, hCandidatesDs, hCandidatesLc, hCandidatesD0FromDstar;
274275
HistogramRegistry registry{"registry"};
276+
OutputObj<ZorroSummary> zorroSummary{"zorroSummary"};
275277

276278
std::array<int, 2> arrPDGResonantDsPhiPi = {kPhi, kPiPlus}; // Ds± → Phi π±
277279
std::array<int, 2> arrPDGResonantDKstarK = {kK0Star892, kKPlus}; // Ds± → K*(892)0bar K± and D± → K*(892)0bar K±
@@ -394,7 +396,7 @@ struct HfDataCreatorCharmHadPiReduced {
394396
setLabelHistoCands(hCandidatesD0FromDstar);
395397

396398
// init HF event selection helper
397-
hfEvSel.init(registry);
399+
hfEvSel.init(registry, zorroSummary);
398400
if (doprocessDplusPiMc || doprocessDplusPiMcWithMl ||
399401
doprocessDsPiMc || doprocessDsPiMcWithMl ||
400402
doprocessD0PiMc || doprocessD0PiMcWithMl ||

‎PWGHF/D2H/TableProducer/dataCreatorCharmResoReduced.cxx‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
#include "PWGHF/Utils/utilsMcMatching.h"
2828

2929
#include "Common/Core/RecoDecay.h"
30+
#include "Common/Core/ZorroSummary.h"
3031
#include "Common/Core/trackUtilities.h"
3132
#include "Common/DataModel/CollisionAssociationTables.h"
3233
#include "Common/DataModel/EventSelection.h"
@@ -283,6 +284,7 @@ struct HfDataCreatorCharmResoReduced {
283284
PresliceUnsorted<McCollisionsNoCents> colPerMcCollision = aod::mccollisionlabel::mcCollisionId;
284285

285286
HistogramRegistry registry{"registry"};
287+
OutputObj<ZorroSummary> zorroSummary{"zorroSummary"};
286288

287289
void init(InitContext& initContext)
288290
{
@@ -381,7 +383,7 @@ struct HfDataCreatorCharmResoReduced {
381383
fitter.setWeightedFinalPCA(false);
382384

383385
// init HF event selection helper
384-
hfEvSel.init(registry);
386+
hfEvSel.init(registry, zorroSummary);
385387

386388
const auto& workflows = initContext.services().get<RunningWorkflowInfo const>();
387389
for (const DeviceSpec& device : workflows.devices) {

‎PWGHF/D2H/TableProducer/dataCreatorJpsiHadReduced.cxx‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030

3131
#include "Common/Core/RecoDecay.h"
3232
#include "Common/Core/TrackSelectorPID.h"
33+
#include "Common/Core/ZorroSummary.h"
3334
#include "Common/Core/trackUtilities.h"
3435
#include "Common/DataModel/CollisionAssociationTables.h"
3536
#include "Common/DataModel/EventSelection.h"
@@ -220,6 +221,7 @@ struct HfDataCreatorJpsiHadReduced {
220221
o2::vertexing::DCAFitterN<4> df4;
221222

222223
HistogramRegistry registry{"registry"};
224+
OutputObj<ZorroSummary> zorroSummary{"zorroSummary"};
223225

224226
void init(InitContext& initContext)
225227
{
@@ -335,7 +337,7 @@ struct HfDataCreatorJpsiHadReduced {
335337
}
336338

337339
// init HF event selection helper
338-
hfEvSel.init(registry);
340+
hfEvSel.init(registry, zorroSummary);
339341
if (doprocessJpsiKMc || doprocessJpsiPhiMc) {
340342
const auto& workflows = initContext.services().get<RunningWorkflowInfo const>();
341343
for (const DeviceSpec& device : workflows.devices) {

‎PWGHF/TableProducer/candidateCreator2Prong.cxx‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535

3636
#include "Common/CCDB/ctpRateFetcher.h"
3737
#include "Common/Core/RecoDecay.h"
38+
#include "Common/Core/ZorroSummary.h"
3839
#include "Common/Core/trackUtilities.h"
3940
#include "Common/DataModel/Centrality.h"
4041
#include "Common/DataModel/EventSelection.h"
@@ -131,6 +132,7 @@ struct HfCandidateCreator2Prong {
131132
ConfigurableAxis axisMass{"axisMass", {500, 1.6, 2.1}, "axis for mass (GeV/c^2)"};
132133

133134
HistogramRegistry registry{"registry"};
135+
OutputObj<ZorroSummary> zorroSummary{"zorroSummary"};
134136

135137
void init(InitContext const&)
136138
{
@@ -187,7 +189,7 @@ struct HfCandidateCreator2Prong {
187189
hCandidates = registry.add<TH1>("hCandidates", "candidates counter", {HistType::kTH1D, {axisCands}});
188190

189191
// init HF event selection helper
190-
hfEvSel.init(registry);
192+
hfEvSel.init(registry, zorroSummary);
191193

192194
if (std::accumulate(doprocessDF.begin(), doprocessDF.end(), 0) == 1) {
193195
registry.fill(HIST("hVertexerType"), aod::hf_cand::VertexerType::DCAFitter);

‎PWGHF/TableProducer/candidateCreator3Prong.cxx‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434

3535
#include "Common/CCDB/ctpRateFetcher.h"
3636
#include "Common/Core/RecoDecay.h"
37+
#include "Common/Core/ZorroSummary.h"
3738
#include "Common/Core/trackUtilities.h"
3839
#include "Common/DataModel/Centrality.h"
3940
#include "Common/DataModel/EventSelection.h"
@@ -151,6 +152,7 @@ struct HfCandidateCreator3Prong {
151152

152153
std::shared_ptr<TH1> hCandidates;
153154
HistogramRegistry registry{"registry"};
155+
OutputObj<ZorroSummary> zorroSummary{"zorroSummary"};
154156

155157
void init(InitContext const&)
156158
{
@@ -221,7 +223,7 @@ struct HfCandidateCreator3Prong {
221223
hCandidates = registry.add<TH1>("hCandidates", "candidates counter", {HistType::kTH1D, {axisCands}});
222224

223225
// init HF event selection helper
224-
hfEvSel.init(registry);
226+
hfEvSel.init(registry, zorroSummary);
225227

226228
// Configure DCAFitterN
227229
// df.setBz(bz);

‎PWGHF/TableProducer/candidateCreatorCascade.cxx‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727

2828
#include "Common/CCDB/ctpRateFetcher.h"
2929
#include "Common/Core/RecoDecay.h"
30+
#include "Common/Core/ZorroSummary.h"
3031
#include "Common/Core/trackUtilities.h"
3132
#include "Common/DataModel/Centrality.h"
3233
#include "Common/DataModel/EventSelection.h"
@@ -109,6 +110,7 @@ struct HfCandidateCreatorCascade {
109110

110111
std::shared_ptr<TH1> hCandidates;
111112
HistogramRegistry registry{"registry"};
113+
OutputObj<ZorroSummary> zorroSummary{"zorroSummary"};
112114

113115
void init(InitContext const&)
114116
{
@@ -141,7 +143,7 @@ struct HfCandidateCreatorCascade {
141143
hCandidates = registry.add<TH1>("hCandidates", "candidates counter", {HistType::kTH1D, {axisCands}});
142144

143145
// init HF event selection helper
144-
hfEvSel.init(registry);
146+
hfEvSel.init(registry, zorroSummary);
145147

146148
massP = MassProton;
147149
massK0s = MassK0Short;

‎PWGHF/TableProducer/candidateCreatorDstar.cxx‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828

2929
#include "Common/CCDB/ctpRateFetcher.h"
3030
#include "Common/Core/RecoDecay.h"
31+
#include "Common/Core/ZorroSummary.h"
3132
#include "Common/Core/trackUtilities.h"
3233
#include "Common/DataModel/Centrality.h"
3334
#include "Common/DataModel/EventSelection.h"
@@ -143,6 +144,7 @@ struct HfCandidateCreatorDstar {
143144
{"QA/hPtD0Prong1", "D^{0} candidates' prong1", {HistType::kTH1F, {ptAxis}}},
144145
{"QA/hPtD0", "D^{0} candidates", {HistType::kTH1F, {ptAxis}}},
145146
{"QA/hPtDstar", "D* candidates", {HistType::kTH1F, {ptAxis}}}}};
147+
OutputObj<ZorroSummary> zorroSummary{"zorroSummary"};
146148

147149
/// @brief This function initializes the ccdb setting, vertex fitter and runs function MatLayerCylSet::rectifyPtrFromFile(..args..)
148150
void init(InitContext const&)
@@ -174,7 +176,7 @@ struct HfCandidateCreatorDstar {
174176
hCandidates = registry.add<TH1>("hCandidates", "candidates counter", {HistType::kTH1D, {axisCands}});
175177

176178
// init HF event selection helper
177-
hfEvSel.init(registry);
179+
hfEvSel.init(registry, zorroSummary);
178180

179181
// LOG(info) << "Init Function Invoked";
180182
massPi = MassPiPlus;

‎PWGHF/TableProducer/candidateCreatorXic0Omegac0.cxx‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333

3434
#include "Common/CCDB/ctpRateFetcher.h"
3535
#include "Common/Core/RecoDecay.h"
36+
#include "Common/Core/ZorroSummary.h"
3637
#include "Common/Core/trackUtilities.h"
3738
#include "Common/DataModel/Centrality.h"
3839
#include "Common/DataModel/EventSelection.h"
@@ -165,6 +166,8 @@ struct HfCandidateCreatorXic0Omegac0 {
165166
std::shared_ptr<TH1> hInvMassCharmBaryonToXiPi, hInvMassCharmBaryonToOmegaPi, hInvMassCharmBaryonToOmegaK, hFitterStatusToXiPi, hFitterStatusToOmegaPi, hFitterStatusToOmegaK, hCandidateCounterToXiPi, hCandidateCounterToOmegaPi, hCandidateCounterToOmegaK, hCascadesCounterToXiPi, hCascadesCounterToOmegaPi, hCascadesCounterToOmegaK;
166167

167168
HistogramRegistry registry{"registry"};
169+
OutputObj<ZorroSummary> zorroSummary{"zorroSummary"};
170+
168171
// Helper struct to pass information
169172
struct {
170173
float chi2GeoV0;
@@ -365,7 +368,7 @@ struct HfCandidateCreatorXic0Omegac0 {
365368
}
366369

367370
// init HF event selection helper
368-
hfEvSel.init(registry);
371+
hfEvSel.init(registry, zorroSummary);
369372

370373
df.setPropagateToPCA(propagateToPCA);
371374
df.setMaxR(maxR);

‎PWGHF/TableProducer/candidateCreatorXicToXiPiPi.cxx‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333

3434
#include "Common/CCDB/ctpRateFetcher.h"
3535
#include "Common/Core/RecoDecay.h"
36+
#include "Common/Core/ZorroSummary.h"
3637
#include "Common/Core/trackUtilities.h"
3738
#include "Common/DataModel/Centrality.h"
3839
#include "Common/DataModel/EventSelection.h"
@@ -139,6 +140,7 @@ struct HfCandidateCreatorXicToXiPiPi {
139140
using TracksWCovExtraPidPrPi = soa::Join<aod::TracksWCovExtra, aod::TracksPidPr, aod::TracksPidPi>;
140141

141142
HistogramRegistry registry{"registry"};
143+
OutputObj<ZorroSummary> zorroSummary{"zorroSummary"};
142144

143145
void init(InitContext const&)
144146
{
@@ -186,7 +188,7 @@ struct HfCandidateCreatorXicToXiPiPi {
186188
runNumber = 0;
187189

188190
// initialize HF event selection helper
189-
hfEvSel.init(registry);
191+
hfEvSel.init(registry, zorroSummary);
190192

191193
// initialize 3-prong vertex fitter
192194
df.setPropagateToPCA(propagateToPCA);

‎PWGHF/Utils/utilsEvSelHf.h‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,6 @@ struct HfEventSelection : o2::framework::ConfigurableGroup {
207207

208208
// util to retrieve trigger mask in case of software triggers
209209
Zorro zorro;
210-
o2::framework::OutputObj<ZorroSummary> zorroSummary{"zorroSummary"};
211210
int currentRun{-1};
212211

213212
/// Set standard preselection gap trigger (values taken from UD group)
@@ -248,7 +247,7 @@ struct HfEventSelection : o2::framework::ConfigurableGroup {
248247

249248
/// \brief Inits the HF event selection object
250249
/// \param registry reference to the histogram registry
251-
void init(o2::framework::HistogramRegistry& registry)
250+
void init(o2::framework::HistogramRegistry& registry, o2::framework::OutputObj<ZorroSummary>& zorroSummary)
252251
{
253252
// we initialise the RCT checker
254253
if (requireGoodRct) {

0 commit comments

Comments
 (0)