Skip to content

Commit 3642462

Browse files
fcatalan92fcatalan92
committed
[PWGHF] Fix: save ZorroSummary in task output
1 parent 662eb32 commit 3642462

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"
@@ -132,6 +133,7 @@ struct HfCandidateCreator2Prong {
132133
ConfigurableAxis axisMass{"axisMass", {500, 1.6, 2.1}, "axis for mass (GeV/c^2)"};
133134

134135
HistogramRegistry registry{"registry"};
136+
OutputObj<ZorroSummary> zorroSummary{"zorroSummary"};
135137

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

190192
// init HF event selection helper
191-
hfEvSel.init(registry);
193+
hfEvSel.init(registry, zorroSummary);
192194

193195
if (std::accumulate(doprocessDF.begin(), doprocessDF.end(), 0) == 1) {
194196
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"
@@ -152,6 +153,7 @@ struct HfCandidateCreator3Prong {
152153

153154
std::shared_ptr<TH1> hCandidates;
154155
HistogramRegistry registry{"registry"};
156+
OutputObj<ZorroSummary> zorroSummary{"zorroSummary"};
155157

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

224226
// init HF event selection helper
225-
hfEvSel.init(registry);
227+
hfEvSel.init(registry, zorroSummary);
226228

227229
// Configure DCAFitterN
228230
// 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"
@@ -110,6 +111,7 @@ struct HfCandidateCreatorCascade {
110111

111112
std::shared_ptr<TH1> hCandidates;
112113
HistogramRegistry registry{"registry"};
114+
OutputObj<ZorroSummary> zorroSummary{"zorroSummary"};
113115

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

144146
// init HF event selection helper
145-
hfEvSel.init(registry);
147+
hfEvSel.init(registry, zorroSummary);
146148

147149
massP = MassProton;
148150
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"
@@ -144,6 +145,7 @@ struct HfCandidateCreatorDstar {
144145
{"QA/hPtD0Prong1", "D^{0} candidates' prong1", {HistType::kTH1F, {ptAxis}}},
145146
{"QA/hPtD0", "D^{0} candidates", {HistType::kTH1F, {ptAxis}}},
146147
{"QA/hPtDstar", "D* candidates", {HistType::kTH1F, {ptAxis}}}}};
148+
OutputObj<ZorroSummary> zorroSummary{"zorroSummary"};
147149

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

177179
// init HF event selection helper
178-
hfEvSel.init(registry);
180+
hfEvSel.init(registry, zorroSummary);
179181

180182
// LOG(info) << "Init Function Invoked";
181183
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"
@@ -166,6 +167,8 @@ struct HfCandidateCreatorXic0Omegac0 {
166167
std::shared_ptr<TH1> hInvMassCharmBaryonToXiPi, hInvMassCharmBaryonToOmegaPi, hInvMassCharmBaryonToOmegaK, hFitterStatusToXiPi, hFitterStatusToOmegaPi, hFitterStatusToOmegaK, hCandidateCounterToXiPi, hCandidateCounterToOmegaPi, hCandidateCounterToOmegaK, hCascadesCounterToXiPi, hCascadesCounterToOmegaPi, hCascadesCounterToOmegaK;
167168

168169
HistogramRegistry registry{"registry"};
170+
OutputObj<ZorroSummary> zorroSummary{"zorroSummary"};
171+
169172
// Helper struct to pass information
170173
struct {
171174
float chi2GeoV0;
@@ -366,7 +369,7 @@ struct HfCandidateCreatorXic0Omegac0 {
366369
}
367370

368371
// init HF event selection helper
369-
hfEvSel.init(registry);
372+
hfEvSel.init(registry, zorroSummary);
370373

371374
df.setPropagateToPCA(propagateToPCA);
372375
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"
@@ -140,6 +141,7 @@ struct HfCandidateCreatorXicToXiPiPi {
140141
using TracksWCovExtraPidPrPi = soa::Join<aod::TracksWCovExtra, aod::TracksPidPr, aod::TracksPidPi>;
141142

142143
HistogramRegistry registry{"registry"};
144+
OutputObj<ZorroSummary> zorroSummary{"zorroSummary"};
143145

144146
void init(InitContext const&)
145147
{
@@ -187,7 +189,7 @@ struct HfCandidateCreatorXicToXiPiPi {
187189
runNumber = 0;
188190

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

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

‎PWGHF/Utils/utilsEvSelHf.h‎

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

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

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

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

0 commit comments

Comments
 (0)