Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion PWGHF/D2H/TableProducer/dataCreatorCharmHadPiReduced.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -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 ||
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion PWGHF/D2H/TableProducer/dataCreatorJpsiHadReduced.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
3 changes: 1 addition & 2 deletions PWGHF/D2H/Tasks/taskCharmPolarisation.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
3 changes: 1 addition & 2 deletions PWGHF/D2H/Tasks/taskFlowCharmHadrons.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
2 changes: 1 addition & 1 deletion PWGHF/TableProducer/candidateCreator2Prong.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion PWGHF/TableProducer/candidateCreator3Prong.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion PWGHF/TableProducer/candidateCreatorCascade.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion PWGHF/TableProducer/candidateCreatorDstar.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion PWGHF/TableProducer/candidateCreatorXic0Omegac0.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion PWGHF/TableProducer/candidateCreatorXicToXiPiPi.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
11 changes: 5 additions & 6 deletions PWGHF/Utils/utilsEvSelHf.h
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand All @@ -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
Expand Down
Loading