From 7c7aa6fb0d971e51a29cbee5ece024322f94c8fd Mon Sep 17 00:00:00 2001 From: scattaru Date: Sat, 14 Dec 2024 15:33:31 +0100 Subject: [PATCH 01/12] ME offline on self-contained derived data --- PWGHF/HFC/TableProducer/CMakeLists.txt | 5 + .../HFC/TableProducer/correlatorDsHadrons.cxx | 60 ++++++++- .../correlatorDsHadronsReduced.cxx | 123 ++++++++++++++++++ 3 files changed, 182 insertions(+), 6 deletions(-) create mode 100644 PWGHF/HFC/TableProducer/correlatorDsHadronsReduced.cxx diff --git a/PWGHF/HFC/TableProducer/CMakeLists.txt b/PWGHF/HFC/TableProducer/CMakeLists.txt index e3fc1bd5938..4aac8769d9b 100644 --- a/PWGHF/HFC/TableProducer/CMakeLists.txt +++ b/PWGHF/HFC/TableProducer/CMakeLists.txt @@ -43,6 +43,11 @@ o2physics_add_dpl_workflow(correlator-ds-hadrons SOURCES correlatorDsHadrons.cxx PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore COMPONENT_NAME Analysis) + +o2physics_add_dpl_workflow(correlator-ds-hadrons-reduced + SOURCES correlatorDsHadronsReduced.cxx + PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore + COMPONENT_NAME Analysis) o2physics_add_dpl_workflow(correlator-dstar-hadrons SOURCES correlatorDstarHadrons.cxx diff --git a/PWGHF/HFC/TableProducer/correlatorDsHadrons.cxx b/PWGHF/HFC/TableProducer/correlatorDsHadrons.cxx index 6d85a17cb80..7e7a81efddb 100644 --- a/PWGHF/HFC/TableProducer/correlatorDsHadrons.cxx +++ b/PWGHF/HFC/TableProducer/correlatorDsHadrons.cxx @@ -194,6 +194,9 @@ struct HfCorrelatorDsHadrons { Filter collisionFilter = aod::hf_selection_dmeson_collision::dmesonSel == true; Filter flagDsFilter = ((o2::aod::hf_track_index::hfflag & static_cast(1 << aod::hf_cand_3prong::DecayType::DsToKKPi)) != static_cast(0)) && (aod::hf_sel_candidate_ds::isSelDsToKKPi >= selectionFlagDs || aod::hf_sel_candidate_ds::isSelDsToPiKK >= selectionFlagDs); Filter trackFilter = (nabs(aod::track::eta) < etaTrackMax) && (aod::track::pt > ptTrackMin) && (aod::track::pt < ptTrackMax) && (nabs(aod::track::dcaXY) < dcaXYTrackMax) && (nabs(aod::track::dcaZ) < dcaZTrackMax); + + Preslice candsDsPerCollision = aod::hf_cand::collisionId; + Preslice trackIndicesPerCollision = aod::track::collisionId; HistogramRegistry registry{"registry", {}, OutputObjHandlingPolicy::AnalysisObject}; @@ -688,20 +691,62 @@ struct HfCorrelatorDsHadrons { } // end loop generated collision } PROCESS_SWITCH(HfCorrelatorDsHadrons, processMcGen, "Process MC Gen mode", false); - - void processDerivedDataDs(SelCollisionsWithDs::iterator const& collision, + + int hfcReducedCollisionIndex = 0; + + void processDerivedDataDs(SelCollisionsWithDs const& collisions, CandDsData const& candidates, MyTracksData const& tracks) { + + for (const auto& collision : collisions){ + auto thisCollId = collision.globalIndex(); + auto candsDsThisColl = candidates.sliceBy(candsDsPerCollision, thisCollId); + auto tracksThisColl = tracks.sliceBy(trackIndicesPerCollision, thisCollId); + + // Ds fill histograms and Ds candidates information stored + for (const auto& candidate : candidates) { + // candidate selected + if (candidate.isSelDsToKKPi() >= selectionFlagDs) { + candReduced(hfcReducedCollisionIndex, candidate.phi(), candidate.eta(), candidate.pt(), hfHelper.invMassDsToKKPi(candidate)); + } else if (candidate.isSelDsToPiKK() >= selectionFlagDs) { + candReduced(hfcReducedCollisionIndex, candidate.phi(), candidate.eta(), candidate.pt(), hfHelper.invMassDsToPiKK(candidate)); + } + } + + // tracks information + for (const auto& track : tracks) { + if (!track.isGlobalTrackWoDCA()) { + continue; + } + assocTrackReduced(hfcReducedCollisionIndex, track.phi(), track.eta(), track.pt()); + } + collReduced(collision.multFT0M(), collision.posZ()); + hfcReducedCollisionIndex += 1; + } + } + PROCESS_SWITCH(HfCorrelatorDsHadrons, processDerivedDataDs, "Process derived data Ds", false); + void processDerivedDataDsLastIndex(SelCollisionsWithDs const& collisions, + CandDsData const& candidates, + MyTracksData const& tracks) + { + + for (const auto& collision : collisions){ + auto thisCollId = collision.globalIndex(); + auto candsDsThisColl = candidates.sliceBy(candsDsPerCollision, thisCollId); + auto tracksThisColl = tracks.sliceBy(trackIndicesPerCollision, thisCollId); + + int indexHfcReducedCollision = collReduced.lastIndex() + 1; + // Ds fill histograms and Ds candidates information stored for (const auto& candidate : candidates) { // candidate selected if (candidate.isSelDsToKKPi() >= selectionFlagDs) { - candReduced(collReduced.lastIndex(), candidate.phi(), candidate.eta(), candidate.pt(), hfHelper.invMassDsToKKPi(candidate)); + candReduced(indexHfcReducedCollision, candidate.phi(), candidate.eta(), candidate.pt(), hfHelper.invMassDsToKKPi(candidate)); } else if (candidate.isSelDsToPiKK() >= selectionFlagDs) { - candReduced(collReduced.lastIndex(), candidate.phi(), candidate.eta(), candidate.pt(), hfHelper.invMassDsToPiKK(candidate)); + candReduced(indexHfcReducedCollision, candidate.phi(), candidate.eta(), candidate.pt(), hfHelper.invMassDsToPiKK(candidate)); } } @@ -710,10 +755,13 @@ struct HfCorrelatorDsHadrons { if (!track.isGlobalTrackWoDCA()) { continue; } - assocTrackReduced(collReduced.lastIndex(), track.phi(), track.eta(), track.pt()); + assocTrackReduced(indexHfcReducedCollision, track.phi(), track.eta(), track.pt()); } + + collReduced(collision.multFT0M(), collision.posZ()); } - PROCESS_SWITCH(HfCorrelatorDsHadrons, processDerivedDataDs, "Process derived data Ds", false); + } + PROCESS_SWITCH(HfCorrelatorDsHadrons, processDerivedDataDsLastIndex, "Process derived data Ds w lastIndex", false); // Event Mixing void processDataME(SelCollisionsWithDs const& collisions, diff --git a/PWGHF/HFC/TableProducer/correlatorDsHadronsReduced.cxx b/PWGHF/HFC/TableProducer/correlatorDsHadronsReduced.cxx new file mode 100644 index 00000000000..4f330b6bc43 --- /dev/null +++ b/PWGHF/HFC/TableProducer/correlatorDsHadronsReduced.cxx @@ -0,0 +1,123 @@ +// Copyright 2019-2020 CERN and copyright holders of ALICE O2. +// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders. +// All rights not expressly granted are reserved. +// +// This software is distributed under the terms of the GNU General Public +// License v3 (GPL Version 3), copied verbatim in the file "COPYING". +// +// In applying this license CERN does not waive the privileges and immunities +// granted to it by virtue of its status as an Intergovernmental Organization +// or submit itself to any jurisdiction. + +/// \file correlatorDsHadronsReduced.cxx +/// \brief Ds-Hadrons correlator task for ME offline +/// \author Samuele Cattaruzzi + +#include + +#include "CommonConstants/PhysicsConstants.h" +#include "Framework/AnalysisTask.h" +#include "Framework/HistogramRegistry.h" +#include "Framework/runDataProcessing.h" + +#include "PWGHF/HFC/DataModel/CorrelationTables.h" +#include "PWGHF/HFC/DataModel/DerivedDataCorrelationTables.h" + +using namespace o2; +using namespace o2::analysis; +using namespace o2::constants::physics; +using namespace o2::constants::math; +using namespace o2::framework; +using namespace o2::framework::expressions; + +/// Returns deltaPhi value in range [-pi/2., 3.*pi/2], typically used for correlation studies +double getDeltaPhi(double phiHadron, double phiD) +{ + return RecoDecay::constrainAngle(phiHadron - phiD, -PIHalf); +} + +// binning type +using BinningTypeDerived = ColumnBinningPolicy; + +/// Ds-Hadron correlation pair builder - for real data and data-like analysis (i.e. reco-level w/o matching request via MC truth) +struct HfCorrelatorDsHadronsReduced { + Produces entryDsHadronPair; + Produces entryDsHadronRecoInfo; + Produces entryDsHadronGenInfo; + + Configurable fillHistoData{"fillHistoData", true, "Flag for filling histograms in data processes"}; + Configurable numberEventsMixed{"numberEventsMixed", 5, "Number of events mixed in ME process"}; + ConfigurableAxis zPoolBins{"zPoolBins", {VARIABLE_WIDTH, -10.0, -2.5, 2.5, 10.0}, "z vertex position pools"}; + ConfigurableAxis multPoolBins{"multPoolBins", {VARIABLE_WIDTH, 0., 900., 1800., 6000.}, "event multiplicity pools (FT0M)"}; + ConfigurableAxis binsMultFT0M{"binsMultFT0M", {600, 0., 6000.}, "Multiplicity as FT0M signal amplitude"}; + ConfigurableAxis binsPosZ{"binsPosZ", {100, -10., 10.}, "primary vertex z coordinate"}; + ConfigurableAxis binsPoolBin{"binsPoolBin", {9, 0., 9.}, "PoolBin"}; + + SliceCache cache; + + HistogramRegistry registry{"registry", {}, OutputObjHandlingPolicy::AnalysisObject}; + + void init(InitContext&) + { + AxisSpec axisMultFT0M = {binsMultFT0M, "MultiplicityFT0M"}; + AxisSpec axisPosZ = {binsPosZ, "PosZ"}; + AxisSpec axisPoolBin = {binsPoolBin, "PoolBin"}; + + // Histograms for data analysis + if (fillHistoData) { + registry.add("hMultFT0M", "Multiplicity FT0M", {HistType::kTH1F, {axisMultFT0M}}); + registry.add("hZVtx", "z vertex", {HistType::kTH1F, {axisPosZ}}); + registry.add("hDsPoolBin", "Ds candidates pool bin", {HistType::kTH1F, {axisPoolBin}}); + registry.add("hTracksPoolBin", "Particles associated pool bin", {HistType::kTH1F, {axisPoolBin}}); + } + + } + + //Preslice tracksPerCol = aod::hf_assoc_track_reduced::hfcRedCollisionId; + Preslice tracksPerCol = aod::hf_candidate_reduced::hfcRedCollisionId; + Preslice candPerCol = aod::hf_candidate_reduced::hfcRedCollisionId; + + void processDerivedDataME(aod::HfcRedCollisions const& collisions, + aod::DsCandReduceds const& candidates, + aod::AssocTrackReds const& tracks) + { + + BinningTypeDerived corrBinning{{zPoolBins, multPoolBins}, true}; + + auto tracksTuple = std::make_tuple(candidates, tracks); + + Pair pairData{corrBinning, numberEventsMixed, -1, collisions, tracksTuple, &cache}; + + for (const auto& [c1, tracks1, c2, tracks2] : pairData) { + if (tracks1.size() == 0) { + continue; + } + + int poolBin = corrBinning.getBin(std::make_tuple(c2.posZ(), c2.multiplicity())); + int poolBinDs = corrBinning.getBin(std::make_tuple(c1.posZ(), c1.multiplicity())); + registry.fill(HIST("hMultFT0M"), c1.multiplicity()); + registry.fill(HIST("hZVtx"), c1.posZ()); + registry.fill(HIST("hTracksPoolBin"), poolBin); + registry.fill(HIST("hDsPoolBin"), poolBinDs); + + for (const auto& [cand, pAssoc] : o2::soa::combinations(o2::soa::CombinationsFullIndexPolicy(tracks1, tracks2))) { + LOGF(info, "Mixed event tracks pair: (%d, %d) from events (%d, %d), track event: (%d, %d)", cand.index(), pAssoc.index(), c1.index(), c2.index(), cand.hfcRedCollisionId(), pAssoc.hfcRedCollisionId()); + + entryDsHadronPair(getDeltaPhi(pAssoc.phiAssocTrack(), cand.phiCand()), + pAssoc.etaAssocTrack() - cand.etaCand(), + cand.ptCand(), + pAssoc.ptAssocTrack(), + poolBin); + entryDsHadronRecoInfo(cand.invMassDs(), false, false); + entryDsHadronGenInfo(false, false, 0); + + } + } + } + PROCESS_SWITCH(HfCorrelatorDsHadronsReduced, processDerivedDataME, "Process Mixed Event Derived Data", true); +}; + +WorkflowSpec defineDataProcessing(ConfigContext const& cfgc) +{ + return WorkflowSpec{adaptAnalysisTask(cfgc)}; +} From 314af89a77dccb06eb78bec91f9fe2731e1dfcf3 Mon Sep 17 00:00:00 2001 From: ALICE Action Bot Date: Sat, 14 Dec 2024 14:45:17 +0000 Subject: [PATCH 02/12] Please consider the following formatting changes --- .../HFC/TableProducer/correlatorDsHadrons.cxx | 106 +++++++++--------- .../correlatorDsHadronsReduced.cxx | 18 ++- 2 files changed, 61 insertions(+), 63 deletions(-) diff --git a/PWGHF/HFC/TableProducer/correlatorDsHadrons.cxx b/PWGHF/HFC/TableProducer/correlatorDsHadrons.cxx index 7e7a81efddb..3fd1585a4a6 100644 --- a/PWGHF/HFC/TableProducer/correlatorDsHadrons.cxx +++ b/PWGHF/HFC/TableProducer/correlatorDsHadrons.cxx @@ -194,7 +194,7 @@ struct HfCorrelatorDsHadrons { Filter collisionFilter = aod::hf_selection_dmeson_collision::dmesonSel == true; Filter flagDsFilter = ((o2::aod::hf_track_index::hfflag & static_cast(1 << aod::hf_cand_3prong::DecayType::DsToKKPi)) != static_cast(0)) && (aod::hf_sel_candidate_ds::isSelDsToKKPi >= selectionFlagDs || aod::hf_sel_candidate_ds::isSelDsToPiKK >= selectionFlagDs); Filter trackFilter = (nabs(aod::track::eta) < etaTrackMax) && (aod::track::pt > ptTrackMin) && (aod::track::pt < ptTrackMax) && (nabs(aod::track::dcaXY) < dcaXYTrackMax) && (nabs(aod::track::dcaZ) < dcaZTrackMax); - + Preslice candsDsPerCollision = aod::hf_cand::collisionId; Preslice trackIndicesPerCollision = aod::track::collisionId; @@ -691,75 +691,75 @@ struct HfCorrelatorDsHadrons { } // end loop generated collision } PROCESS_SWITCH(HfCorrelatorDsHadrons, processMcGen, "Process MC Gen mode", false); - + int hfcReducedCollisionIndex = 0; - - void processDerivedDataDs(SelCollisionsWithDs const& collisions, + + void processDerivedDataDs(SelCollisionsWithDs const& collisions, CandDsData const& candidates, MyTracksData const& tracks) { - - for (const auto& collision : collisions){ - auto thisCollId = collision.globalIndex(); - auto candsDsThisColl = candidates.sliceBy(candsDsPerCollision, thisCollId); - auto tracksThisColl = tracks.sliceBy(trackIndicesPerCollision, thisCollId); - - // Ds fill histograms and Ds candidates information stored - for (const auto& candidate : candidates) { - // candidate selected - if (candidate.isSelDsToKKPi() >= selectionFlagDs) { - candReduced(hfcReducedCollisionIndex, candidate.phi(), candidate.eta(), candidate.pt(), hfHelper.invMassDsToKKPi(candidate)); - } else if (candidate.isSelDsToPiKK() >= selectionFlagDs) { - candReduced(hfcReducedCollisionIndex, candidate.phi(), candidate.eta(), candidate.pt(), hfHelper.invMassDsToPiKK(candidate)); + + for (const auto& collision : collisions) { + auto thisCollId = collision.globalIndex(); + auto candsDsThisColl = candidates.sliceBy(candsDsPerCollision, thisCollId); + auto tracksThisColl = tracks.sliceBy(trackIndicesPerCollision, thisCollId); + + // Ds fill histograms and Ds candidates information stored + for (const auto& candidate : candidates) { + // candidate selected + if (candidate.isSelDsToKKPi() >= selectionFlagDs) { + candReduced(hfcReducedCollisionIndex, candidate.phi(), candidate.eta(), candidate.pt(), hfHelper.invMassDsToKKPi(candidate)); + } else if (candidate.isSelDsToPiKK() >= selectionFlagDs) { + candReduced(hfcReducedCollisionIndex, candidate.phi(), candidate.eta(), candidate.pt(), hfHelper.invMassDsToPiKK(candidate)); + } } - } - // tracks information - for (const auto& track : tracks) { - if (!track.isGlobalTrackWoDCA()) { - continue; + // tracks information + for (const auto& track : tracks) { + if (!track.isGlobalTrackWoDCA()) { + continue; + } + assocTrackReduced(hfcReducedCollisionIndex, track.phi(), track.eta(), track.pt()); } - assocTrackReduced(hfcReducedCollisionIndex, track.phi(), track.eta(), track.pt()); + + collReduced(collision.multFT0M(), collision.posZ()); + hfcReducedCollisionIndex += 1; } - - collReduced(collision.multFT0M(), collision.posZ()); - hfcReducedCollisionIndex += 1; - } } PROCESS_SWITCH(HfCorrelatorDsHadrons, processDerivedDataDs, "Process derived data Ds", false); void processDerivedDataDsLastIndex(SelCollisionsWithDs const& collisions, - CandDsData const& candidates, - MyTracksData const& tracks) + CandDsData const& candidates, + MyTracksData const& tracks) { - - for (const auto& collision : collisions){ - auto thisCollId = collision.globalIndex(); - auto candsDsThisColl = candidates.sliceBy(candsDsPerCollision, thisCollId); - auto tracksThisColl = tracks.sliceBy(trackIndicesPerCollision, thisCollId); - - int indexHfcReducedCollision = collReduced.lastIndex() + 1; - - // Ds fill histograms and Ds candidates information stored - for (const auto& candidate : candidates) { - // candidate selected - if (candidate.isSelDsToKKPi() >= selectionFlagDs) { - candReduced(indexHfcReducedCollision, candidate.phi(), candidate.eta(), candidate.pt(), hfHelper.invMassDsToKKPi(candidate)); - } else if (candidate.isSelDsToPiKK() >= selectionFlagDs) { - candReduced(indexHfcReducedCollision, candidate.phi(), candidate.eta(), candidate.pt(), hfHelper.invMassDsToPiKK(candidate)); + + for (const auto& collision : collisions) { + auto thisCollId = collision.globalIndex(); + auto candsDsThisColl = candidates.sliceBy(candsDsPerCollision, thisCollId); + auto tracksThisColl = tracks.sliceBy(trackIndicesPerCollision, thisCollId); + + int indexHfcReducedCollision = collReduced.lastIndex() + 1; + + // Ds fill histograms and Ds candidates information stored + for (const auto& candidate : candidates) { + // candidate selected + if (candidate.isSelDsToKKPi() >= selectionFlagDs) { + candReduced(indexHfcReducedCollision, candidate.phi(), candidate.eta(), candidate.pt(), hfHelper.invMassDsToKKPi(candidate)); + } else if (candidate.isSelDsToPiKK() >= selectionFlagDs) { + candReduced(indexHfcReducedCollision, candidate.phi(), candidate.eta(), candidate.pt(), hfHelper.invMassDsToPiKK(candidate)); + } } - } - // tracks information - for (const auto& track : tracks) { - if (!track.isGlobalTrackWoDCA()) { - continue; + // tracks information + for (const auto& track : tracks) { + if (!track.isGlobalTrackWoDCA()) { + continue; + } + assocTrackReduced(indexHfcReducedCollision, track.phi(), track.eta(), track.pt()); } - assocTrackReduced(indexHfcReducedCollision, track.phi(), track.eta(), track.pt()); + + collReduced(collision.multFT0M(), collision.posZ()); } - - collReduced(collision.multFT0M(), collision.posZ()); - } } PROCESS_SWITCH(HfCorrelatorDsHadrons, processDerivedDataDsLastIndex, "Process derived data Ds w lastIndex", false); diff --git a/PWGHF/HFC/TableProducer/correlatorDsHadronsReduced.cxx b/PWGHF/HFC/TableProducer/correlatorDsHadronsReduced.cxx index 4f330b6bc43..20d052a2e75 100644 --- a/PWGHF/HFC/TableProducer/correlatorDsHadronsReduced.cxx +++ b/PWGHF/HFC/TableProducer/correlatorDsHadronsReduced.cxx @@ -70,13 +70,12 @@ struct HfCorrelatorDsHadronsReduced { registry.add("hDsPoolBin", "Ds candidates pool bin", {HistType::kTH1F, {axisPoolBin}}); registry.add("hTracksPoolBin", "Particles associated pool bin", {HistType::kTH1F, {axisPoolBin}}); } - } - - //Preslice tracksPerCol = aod::hf_assoc_track_reduced::hfcRedCollisionId; + + // Preslice tracksPerCol = aod::hf_assoc_track_reduced::hfcRedCollisionId; Preslice tracksPerCol = aod::hf_candidate_reduced::hfcRedCollisionId; Preslice candPerCol = aod::hf_candidate_reduced::hfcRedCollisionId; - + void processDerivedDataME(aod::HfcRedCollisions const& collisions, aod::DsCandReduceds const& candidates, aod::AssocTrackReds const& tracks) @@ -85,24 +84,24 @@ struct HfCorrelatorDsHadronsReduced { BinningTypeDerived corrBinning{{zPoolBins, multPoolBins}, true}; auto tracksTuple = std::make_tuple(candidates, tracks); - + Pair pairData{corrBinning, numberEventsMixed, -1, collisions, tracksTuple, &cache}; - + for (const auto& [c1, tracks1, c2, tracks2] : pairData) { if (tracks1.size() == 0) { continue; } - + int poolBin = corrBinning.getBin(std::make_tuple(c2.posZ(), c2.multiplicity())); int poolBinDs = corrBinning.getBin(std::make_tuple(c1.posZ(), c1.multiplicity())); registry.fill(HIST("hMultFT0M"), c1.multiplicity()); registry.fill(HIST("hZVtx"), c1.posZ()); registry.fill(HIST("hTracksPoolBin"), poolBin); registry.fill(HIST("hDsPoolBin"), poolBinDs); - + for (const auto& [cand, pAssoc] : o2::soa::combinations(o2::soa::CombinationsFullIndexPolicy(tracks1, tracks2))) { LOGF(info, "Mixed event tracks pair: (%d, %d) from events (%d, %d), track event: (%d, %d)", cand.index(), pAssoc.index(), c1.index(), c2.index(), cand.hfcRedCollisionId(), pAssoc.hfcRedCollisionId()); - + entryDsHadronPair(getDeltaPhi(pAssoc.phiAssocTrack(), cand.phiCand()), pAssoc.etaAssocTrack() - cand.etaCand(), cand.ptCand(), @@ -110,7 +109,6 @@ struct HfCorrelatorDsHadronsReduced { poolBin); entryDsHadronRecoInfo(cand.invMassDs(), false, false); entryDsHadronGenInfo(false, false, 0); - } } } From da70be966c6cae65559e207cd575269fb14e852c Mon Sep 17 00:00:00 2001 From: scattaru Date: Sat, 14 Dec 2024 15:54:59 +0100 Subject: [PATCH 03/12] Remove white spaces --- PWGHF/HFC/TableProducer/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PWGHF/HFC/TableProducer/CMakeLists.txt b/PWGHF/HFC/TableProducer/CMakeLists.txt index 4aac8769d9b..1847bcf9890 100644 --- a/PWGHF/HFC/TableProducer/CMakeLists.txt +++ b/PWGHF/HFC/TableProducer/CMakeLists.txt @@ -43,7 +43,7 @@ o2physics_add_dpl_workflow(correlator-ds-hadrons SOURCES correlatorDsHadrons.cxx PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore COMPONENT_NAME Analysis) - + o2physics_add_dpl_workflow(correlator-ds-hadrons-reduced SOURCES correlatorDsHadronsReduced.cxx PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore From 89f095d76ceb5e595b22437bebddee51f29e1e5c Mon Sep 17 00:00:00 2001 From: scattaru Date: Sat, 14 Dec 2024 17:43:12 +0100 Subject: [PATCH 04/12] Fox o2-linter --- PWGHF/HFC/TableProducer/correlatorDsHadrons.cxx | 15 ++++++++------- .../TableProducer/correlatorDsHadronsReduced.cxx | 13 +++++++------ 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/PWGHF/HFC/TableProducer/correlatorDsHadrons.cxx b/PWGHF/HFC/TableProducer/correlatorDsHadrons.cxx index 3fd1585a4a6..9a2c236e894 100644 --- a/PWGHF/HFC/TableProducer/correlatorDsHadrons.cxx +++ b/PWGHF/HFC/TableProducer/correlatorDsHadrons.cxx @@ -61,8 +61,8 @@ struct HfCorrelatorDsHadronsSelCollision { Configurable yCandMax{"yCandMax", 0.8, "max. cand. rapidity"}; Configurable ptCandMin{"ptCandMin", 1., "min. cand. pT"}; - SliceCache cache; HfHelper hfHelper; + SliceCache cache; using SelCollisions = soa::Join; using CandDsData = soa::Filtered>; @@ -169,6 +169,13 @@ struct HfCorrelatorDsHadrons { Configurable> binsPtHadron{"binsPtHadron", std::vector{0.3, 2., 4., 8., 12., 50.}, "pT bin limits for assoc particle"}; Configurable> binsPtEfficiencyD{"binsPtEfficiencyD", std::vector{o2::analysis::hf_cuts_ds_to_k_k_pi::vecBinsPt}, "pT bin limits for efficiency"}; Configurable> efficiencyD{"efficiencyD", {1., 1., 1., 1., 1., 1.}, "efficiency values for Ds meson"}; + + HfHelper hfHelper; + SliceCache cache; + + Preslice candsDsPerColPreslicelision = aod::hf_cand::collisionId; + Preslice trackIndicesPerCollision = aod::track::collisionId; + ConfigurableAxis zPoolBins{"zPoolBins", {VARIABLE_WIDTH, -10.0, -2.5, 2.5, 10.0}, "z vertex position pools"}; ConfigurableAxis multPoolBins{"multPoolBins", {VARIABLE_WIDTH, 0., 900., 1800., 6000.}, "event multiplicity pools (FT0M)"}; ConfigurableAxis binsMassD{"binsMassD", {200, 1.7, 2.25}, "inv. mass (K^{#pm}K^{-}#pi^{+}) (GeV/#it{c}^{2})"}; @@ -179,9 +186,6 @@ struct HfCorrelatorDsHadrons { ConfigurableAxis binsPosZ{"binsPosZ", {100, -10., 10.}, "primary vertex z coordinate"}; ConfigurableAxis binsPoolBin{"binsPoolBin", {9, 0., 9.}, "PoolBin"}; - HfHelper hfHelper; - SliceCache cache; - using SelCollisionsWithDs = soa::Filtered>; // collisionFilter applied // using SelCollisionsWithDsWithMc = soa::Filtered>; // collisionFilter applied using SelCollisionsMc = soa::Join; @@ -195,9 +199,6 @@ struct HfCorrelatorDsHadrons { Filter flagDsFilter = ((o2::aod::hf_track_index::hfflag & static_cast(1 << aod::hf_cand_3prong::DecayType::DsToKKPi)) != static_cast(0)) && (aod::hf_sel_candidate_ds::isSelDsToKKPi >= selectionFlagDs || aod::hf_sel_candidate_ds::isSelDsToPiKK >= selectionFlagDs); Filter trackFilter = (nabs(aod::track::eta) < etaTrackMax) && (aod::track::pt > ptTrackMin) && (aod::track::pt < ptTrackMax) && (nabs(aod::track::dcaXY) < dcaXYTrackMax) && (nabs(aod::track::dcaZ) < dcaZTrackMax); - Preslice candsDsPerCollision = aod::hf_cand::collisionId; - Preslice trackIndicesPerCollision = aod::track::collisionId; - HistogramRegistry registry{"registry", {}, OutputObjHandlingPolicy::AnalysisObject}; void init(InitContext&) diff --git a/PWGHF/HFC/TableProducer/correlatorDsHadronsReduced.cxx b/PWGHF/HFC/TableProducer/correlatorDsHadronsReduced.cxx index 20d052a2e75..946e61799f8 100644 --- a/PWGHF/HFC/TableProducer/correlatorDsHadronsReduced.cxx +++ b/PWGHF/HFC/TableProducer/correlatorDsHadronsReduced.cxx @@ -47,14 +47,19 @@ struct HfCorrelatorDsHadronsReduced { Configurable fillHistoData{"fillHistoData", true, "Flag for filling histograms in data processes"}; Configurable numberEventsMixed{"numberEventsMixed", 5, "Number of events mixed in ME process"}; + + SliceCache cache; + + // Preslice tracksPerCol = aod::hf_assoc_track_reduced::hfcRedCollisionId; + Preslice tracksPerCol = aod::hf_candidate_reduced::hfcRedCollisionId; + Preslice candPerCol = aod::hf_candidate_reduced::hfcRedCollisionId; + ConfigurableAxis zPoolBins{"zPoolBins", {VARIABLE_WIDTH, -10.0, -2.5, 2.5, 10.0}, "z vertex position pools"}; ConfigurableAxis multPoolBins{"multPoolBins", {VARIABLE_WIDTH, 0., 900., 1800., 6000.}, "event multiplicity pools (FT0M)"}; ConfigurableAxis binsMultFT0M{"binsMultFT0M", {600, 0., 6000.}, "Multiplicity as FT0M signal amplitude"}; ConfigurableAxis binsPosZ{"binsPosZ", {100, -10., 10.}, "primary vertex z coordinate"}; ConfigurableAxis binsPoolBin{"binsPoolBin", {9, 0., 9.}, "PoolBin"}; - SliceCache cache; - HistogramRegistry registry{"registry", {}, OutputObjHandlingPolicy::AnalysisObject}; void init(InitContext&) @@ -72,10 +77,6 @@ struct HfCorrelatorDsHadronsReduced { } } - // Preslice tracksPerCol = aod::hf_assoc_track_reduced::hfcRedCollisionId; - Preslice tracksPerCol = aod::hf_candidate_reduced::hfcRedCollisionId; - Preslice candPerCol = aod::hf_candidate_reduced::hfcRedCollisionId; - void processDerivedDataME(aod::HfcRedCollisions const& collisions, aod::DsCandReduceds const& candidates, aod::AssocTrackReds const& tracks) From 53184b564882b1b4f61bd7f774f5cee7f65161c1 Mon Sep 17 00:00:00 2001 From: scattaru Date: Sat, 14 Dec 2024 17:47:17 +0100 Subject: [PATCH 05/12] Fix o2-linter --- PWGHF/HFC/TableProducer/correlatorDsHadrons.cxx | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/PWGHF/HFC/TableProducer/correlatorDsHadrons.cxx b/PWGHF/HFC/TableProducer/correlatorDsHadrons.cxx index 9a2c236e894..9a946d307bf 100644 --- a/PWGHF/HFC/TableProducer/correlatorDsHadrons.cxx +++ b/PWGHF/HFC/TableProducer/correlatorDsHadrons.cxx @@ -175,6 +175,8 @@ struct HfCorrelatorDsHadrons { Preslice candsDsPerColPreslicelision = aod::hf_cand::collisionId; Preslice trackIndicesPerCollision = aod::track::collisionId; + Preslice perCollisionCandMc = o2::aod::mcparticle::mcCollisionId; + PresliceUnsorted> collPerCollMc = o2::aod::mccollisionlabel::mcCollisionId; ConfigurableAxis zPoolBins{"zPoolBins", {VARIABLE_WIDTH, -10.0, -2.5, 2.5, 10.0}, "z vertex position pools"}; ConfigurableAxis multPoolBins{"multPoolBins", {VARIABLE_WIDTH, 0., 900., 1800., 6000.}, "event multiplicity pools (FT0M)"}; @@ -585,9 +587,6 @@ struct HfCorrelatorDsHadrons { } PROCESS_SWITCH(HfCorrelatorDsHadrons, processMcRec, "Process MC Reco mode", false); - Preslice perCollisionCandMc = o2::aod::mcparticle::mcCollisionId; - PresliceUnsorted> collPerCollMc = o2::aod::mccollisionlabel::mcCollisionId; - /// Ds-Hadron correlation pair builder - for MC gen-level analysis (no filter/selection, only true signal) void processMcGen(SelCollisionsMc const& mcCollisions, soa::Join const& collisions, From 4a587ee1ecec9de58415387032825aef9a75c078 Mon Sep 17 00:00:00 2001 From: scattaru Date: Sat, 14 Dec 2024 17:50:25 +0100 Subject: [PATCH 06/12] Fix o2-linter --- .../HFC/TableProducer/correlatorDsHadrons.cxx | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/PWGHF/HFC/TableProducer/correlatorDsHadrons.cxx b/PWGHF/HFC/TableProducer/correlatorDsHadrons.cxx index 9a946d307bf..0d6a837ae72 100644 --- a/PWGHF/HFC/TableProducer/correlatorDsHadrons.cxx +++ b/PWGHF/HFC/TableProducer/correlatorDsHadrons.cxx @@ -173,6 +173,19 @@ struct HfCorrelatorDsHadrons { HfHelper hfHelper; SliceCache cache; + using SelCollisionsWithDs = soa::Filtered>; // collisionFilter applied + // using SelCollisionsWithDsWithMc = soa::Filtered>; // collisionFilter applied + using SelCollisionsMc = soa::Join; + using CandDsData = soa::Filtered>; // flagDsFilter applied + using CandDsMcReco = soa::Filtered>; // flagDsFilter applied + using CandDsMcGen = soa::Join; // flagDsFilter applied + using MyTracksData = soa::Filtered>; // trackFilter applied + using TracksWithMc = soa::Filtered>; // trackFilter applied + + Filter collisionFilter = aod::hf_selection_dmeson_collision::dmesonSel == true; + Filter flagDsFilter = ((o2::aod::hf_track_index::hfflag & static_cast(1 << aod::hf_cand_3prong::DecayType::DsToKKPi)) != static_cast(0)) && (aod::hf_sel_candidate_ds::isSelDsToKKPi >= selectionFlagDs || aod::hf_sel_candidate_ds::isSelDsToPiKK >= selectionFlagDs); + Filter trackFilter = (nabs(aod::track::eta) < etaTrackMax) && (aod::track::pt > ptTrackMin) && (aod::track::pt < ptTrackMax) && (nabs(aod::track::dcaXY) < dcaXYTrackMax) && (nabs(aod::track::dcaZ) < dcaZTrackMax); + Preslice candsDsPerColPreslicelision = aod::hf_cand::collisionId; Preslice trackIndicesPerCollision = aod::track::collisionId; Preslice perCollisionCandMc = o2::aod::mcparticle::mcCollisionId; @@ -188,19 +201,6 @@ struct HfCorrelatorDsHadrons { ConfigurableAxis binsPosZ{"binsPosZ", {100, -10., 10.}, "primary vertex z coordinate"}; ConfigurableAxis binsPoolBin{"binsPoolBin", {9, 0., 9.}, "PoolBin"}; - using SelCollisionsWithDs = soa::Filtered>; // collisionFilter applied - // using SelCollisionsWithDsWithMc = soa::Filtered>; // collisionFilter applied - using SelCollisionsMc = soa::Join; - using CandDsData = soa::Filtered>; // flagDsFilter applied - using CandDsMcReco = soa::Filtered>; // flagDsFilter applied - using CandDsMcGen = soa::Join; // flagDsFilter applied - using MyTracksData = soa::Filtered>; // trackFilter applied - using TracksWithMc = soa::Filtered>; // trackFilter applied - - Filter collisionFilter = aod::hf_selection_dmeson_collision::dmesonSel == true; - Filter flagDsFilter = ((o2::aod::hf_track_index::hfflag & static_cast(1 << aod::hf_cand_3prong::DecayType::DsToKKPi)) != static_cast(0)) && (aod::hf_sel_candidate_ds::isSelDsToKKPi >= selectionFlagDs || aod::hf_sel_candidate_ds::isSelDsToPiKK >= selectionFlagDs); - Filter trackFilter = (nabs(aod::track::eta) < etaTrackMax) && (aod::track::pt > ptTrackMin) && (aod::track::pt < ptTrackMax) && (nabs(aod::track::dcaXY) < dcaXYTrackMax) && (nabs(aod::track::dcaZ) < dcaZTrackMax); - HistogramRegistry registry{"registry", {}, OutputObjHandlingPolicy::AnalysisObject}; void init(InitContext&) From b74b72ecb0e3c88725a6993bf931b8df440eca8c Mon Sep 17 00:00:00 2001 From: ALICE Action Bot Date: Sat, 14 Dec 2024 16:50:59 +0000 Subject: [PATCH 07/12] Please consider the following formatting changes --- PWGHF/HFC/TableProducer/correlatorDsHadrons.cxx | 8 ++++---- PWGHF/HFC/TableProducer/correlatorDsHadronsReduced.cxx | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/PWGHF/HFC/TableProducer/correlatorDsHadrons.cxx b/PWGHF/HFC/TableProducer/correlatorDsHadrons.cxx index 0d6a837ae72..6bd1b63766b 100644 --- a/PWGHF/HFC/TableProducer/correlatorDsHadrons.cxx +++ b/PWGHF/HFC/TableProducer/correlatorDsHadrons.cxx @@ -169,10 +169,10 @@ struct HfCorrelatorDsHadrons { Configurable> binsPtHadron{"binsPtHadron", std::vector{0.3, 2., 4., 8., 12., 50.}, "pT bin limits for assoc particle"}; Configurable> binsPtEfficiencyD{"binsPtEfficiencyD", std::vector{o2::analysis::hf_cuts_ds_to_k_k_pi::vecBinsPt}, "pT bin limits for efficiency"}; Configurable> efficiencyD{"efficiencyD", {1., 1., 1., 1., 1., 1.}, "efficiency values for Ds meson"}; - + HfHelper hfHelper; SliceCache cache; - + using SelCollisionsWithDs = soa::Filtered>; // collisionFilter applied // using SelCollisionsWithDsWithMc = soa::Filtered>; // collisionFilter applied using SelCollisionsMc = soa::Join; @@ -185,12 +185,12 @@ struct HfCorrelatorDsHadrons { Filter collisionFilter = aod::hf_selection_dmeson_collision::dmesonSel == true; Filter flagDsFilter = ((o2::aod::hf_track_index::hfflag & static_cast(1 << aod::hf_cand_3prong::DecayType::DsToKKPi)) != static_cast(0)) && (aod::hf_sel_candidate_ds::isSelDsToKKPi >= selectionFlagDs || aod::hf_sel_candidate_ds::isSelDsToPiKK >= selectionFlagDs); Filter trackFilter = (nabs(aod::track::eta) < etaTrackMax) && (aod::track::pt > ptTrackMin) && (aod::track::pt < ptTrackMax) && (nabs(aod::track::dcaXY) < dcaXYTrackMax) && (nabs(aod::track::dcaZ) < dcaZTrackMax); - + Preslice candsDsPerColPreslicelision = aod::hf_cand::collisionId; Preslice trackIndicesPerCollision = aod::track::collisionId; Preslice perCollisionCandMc = o2::aod::mcparticle::mcCollisionId; PresliceUnsorted> collPerCollMc = o2::aod::mccollisionlabel::mcCollisionId; - + ConfigurableAxis zPoolBins{"zPoolBins", {VARIABLE_WIDTH, -10.0, -2.5, 2.5, 10.0}, "z vertex position pools"}; ConfigurableAxis multPoolBins{"multPoolBins", {VARIABLE_WIDTH, 0., 900., 1800., 6000.}, "event multiplicity pools (FT0M)"}; ConfigurableAxis binsMassD{"binsMassD", {200, 1.7, 2.25}, "inv. mass (K^{#pm}K^{-}#pi^{+}) (GeV/#it{c}^{2})"}; diff --git a/PWGHF/HFC/TableProducer/correlatorDsHadronsReduced.cxx b/PWGHF/HFC/TableProducer/correlatorDsHadronsReduced.cxx index 946e61799f8..37cf40766f2 100644 --- a/PWGHF/HFC/TableProducer/correlatorDsHadronsReduced.cxx +++ b/PWGHF/HFC/TableProducer/correlatorDsHadronsReduced.cxx @@ -47,13 +47,13 @@ struct HfCorrelatorDsHadronsReduced { Configurable fillHistoData{"fillHistoData", true, "Flag for filling histograms in data processes"}; Configurable numberEventsMixed{"numberEventsMixed", 5, "Number of events mixed in ME process"}; - + SliceCache cache; - + // Preslice tracksPerCol = aod::hf_assoc_track_reduced::hfcRedCollisionId; Preslice tracksPerCol = aod::hf_candidate_reduced::hfcRedCollisionId; Preslice candPerCol = aod::hf_candidate_reduced::hfcRedCollisionId; - + ConfigurableAxis zPoolBins{"zPoolBins", {VARIABLE_WIDTH, -10.0, -2.5, 2.5, 10.0}, "z vertex position pools"}; ConfigurableAxis multPoolBins{"multPoolBins", {VARIABLE_WIDTH, 0., 900., 1800., 6000.}, "event multiplicity pools (FT0M)"}; ConfigurableAxis binsMultFT0M{"binsMultFT0M", {600, 0., 6000.}, "Multiplicity as FT0M signal amplitude"}; From 25e7bc49fd71db83128d76db37b9b2db45240942 Mon Sep 17 00:00:00 2001 From: scattaru Date: Mon, 16 Dec 2024 07:43:34 +0100 Subject: [PATCH 08/12] Fix bug compilation --- PWGHF/HFC/TableProducer/correlatorDsHadrons.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PWGHF/HFC/TableProducer/correlatorDsHadrons.cxx b/PWGHF/HFC/TableProducer/correlatorDsHadrons.cxx index 6bd1b63766b..02b543f2cdc 100644 --- a/PWGHF/HFC/TableProducer/correlatorDsHadrons.cxx +++ b/PWGHF/HFC/TableProducer/correlatorDsHadrons.cxx @@ -186,7 +186,7 @@ struct HfCorrelatorDsHadrons { Filter flagDsFilter = ((o2::aod::hf_track_index::hfflag & static_cast(1 << aod::hf_cand_3prong::DecayType::DsToKKPi)) != static_cast(0)) && (aod::hf_sel_candidate_ds::isSelDsToKKPi >= selectionFlagDs || aod::hf_sel_candidate_ds::isSelDsToPiKK >= selectionFlagDs); Filter trackFilter = (nabs(aod::track::eta) < etaTrackMax) && (aod::track::pt > ptTrackMin) && (aod::track::pt < ptTrackMax) && (nabs(aod::track::dcaXY) < dcaXYTrackMax) && (nabs(aod::track::dcaZ) < dcaZTrackMax); - Preslice candsDsPerColPreslicelision = aod::hf_cand::collisionId; + Preslice candsDsPerColPerCollision = aod::hf_cand::collisionId; Preslice trackIndicesPerCollision = aod::track::collisionId; Preslice perCollisionCandMc = o2::aod::mcparticle::mcCollisionId; PresliceUnsorted> collPerCollMc = o2::aod::mccollisionlabel::mcCollisionId; From 11f7a43fdadf650b6dc95d0a7ce33078b55738ff Mon Sep 17 00:00:00 2001 From: scattaru Date: Mon, 16 Dec 2024 08:31:19 +0100 Subject: [PATCH 09/12] Fix bug compilation --- PWGHF/HFC/TableProducer/correlatorDsHadrons.cxx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/PWGHF/HFC/TableProducer/correlatorDsHadrons.cxx b/PWGHF/HFC/TableProducer/correlatorDsHadrons.cxx index 02b543f2cdc..1caca8e9cb1 100644 --- a/PWGHF/HFC/TableProducer/correlatorDsHadrons.cxx +++ b/PWGHF/HFC/TableProducer/correlatorDsHadrons.cxx @@ -186,7 +186,7 @@ struct HfCorrelatorDsHadrons { Filter flagDsFilter = ((o2::aod::hf_track_index::hfflag & static_cast(1 << aod::hf_cand_3prong::DecayType::DsToKKPi)) != static_cast(0)) && (aod::hf_sel_candidate_ds::isSelDsToKKPi >= selectionFlagDs || aod::hf_sel_candidate_ds::isSelDsToPiKK >= selectionFlagDs); Filter trackFilter = (nabs(aod::track::eta) < etaTrackMax) && (aod::track::pt > ptTrackMin) && (aod::track::pt < ptTrackMax) && (nabs(aod::track::dcaXY) < dcaXYTrackMax) && (nabs(aod::track::dcaZ) < dcaZTrackMax); - Preslice candsDsPerColPerCollision = aod::hf_cand::collisionId; + Preslice candsDsPerCollision = aod::hf_cand::collisionId; Preslice trackIndicesPerCollision = aod::track::collisionId; Preslice perCollisionCandMc = o2::aod::mcparticle::mcCollisionId; PresliceUnsorted> collPerCollMc = o2::aod::mccollisionlabel::mcCollisionId; @@ -195,6 +195,7 @@ struct HfCorrelatorDsHadrons { ConfigurableAxis multPoolBins{"multPoolBins", {VARIABLE_WIDTH, 0., 900., 1800., 6000.}, "event multiplicity pools (FT0M)"}; ConfigurableAxis binsMassD{"binsMassD", {200, 1.7, 2.25}, "inv. mass (K^{#pm}K^{-}#pi^{+}) (GeV/#it{c}^{2})"}; ConfigurableAxis binsEta{"binsEta", {50, -2., 2.}, "#it{#eta}"}; + ConfigurableAxis binsPhi{"binsPhi", {64, -PIHalf, 3. * PIHalf}, "#it{#varphi}"}; ConfigurableAxis binsMultiplicity{"binsMultiplicity", {200, 0., 800.}, "Multiplicity"}; ConfigurableAxis binsMultFT0M{"binsMultFT0M", {600, 0., 6000.}, "Multiplicity as FT0M signal amplitude"}; From 69e2292f958a6045c924f33140c99df8f7327ae3 Mon Sep 17 00:00:00 2001 From: scattaru Date: Tue, 17 Dec 2024 11:29:27 +0100 Subject: [PATCH 10/12] Fix struct memeber order --- PWGHF/HFC/TableProducer/correlatorDsHadrons.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/PWGHF/HFC/TableProducer/correlatorDsHadrons.cxx b/PWGHF/HFC/TableProducer/correlatorDsHadrons.cxx index 1caca8e9cb1..81a957bb5cd 100644 --- a/PWGHF/HFC/TableProducer/correlatorDsHadrons.cxx +++ b/PWGHF/HFC/TableProducer/correlatorDsHadrons.cxx @@ -169,6 +169,8 @@ struct HfCorrelatorDsHadrons { Configurable> binsPtHadron{"binsPtHadron", std::vector{0.3, 2., 4., 8., 12., 50.}, "pT bin limits for assoc particle"}; Configurable> binsPtEfficiencyD{"binsPtEfficiencyD", std::vector{o2::analysis::hf_cuts_ds_to_k_k_pi::vecBinsPt}, "pT bin limits for efficiency"}; Configurable> efficiencyD{"efficiencyD", {1., 1., 1., 1., 1., 1.}, "efficiency values for Ds meson"}; + + int hfcReducedCollisionIndex = 0; HfHelper hfHelper; SliceCache cache; @@ -693,8 +695,6 @@ struct HfCorrelatorDsHadrons { } PROCESS_SWITCH(HfCorrelatorDsHadrons, processMcGen, "Process MC Gen mode", false); - int hfcReducedCollisionIndex = 0; - void processDerivedDataDs(SelCollisionsWithDs const& collisions, CandDsData const& candidates, MyTracksData const& tracks) From adb38cda56550b3d80fb474854a515455cce5dab Mon Sep 17 00:00:00 2001 From: ALICE Action Bot Date: Tue, 17 Dec 2024 10:30:06 +0000 Subject: [PATCH 11/12] Please consider the following formatting changes --- PWGHF/HFC/TableProducer/correlatorDsHadrons.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PWGHF/HFC/TableProducer/correlatorDsHadrons.cxx b/PWGHF/HFC/TableProducer/correlatorDsHadrons.cxx index 81a957bb5cd..155e71d2ec4 100644 --- a/PWGHF/HFC/TableProducer/correlatorDsHadrons.cxx +++ b/PWGHF/HFC/TableProducer/correlatorDsHadrons.cxx @@ -169,7 +169,7 @@ struct HfCorrelatorDsHadrons { Configurable> binsPtHadron{"binsPtHadron", std::vector{0.3, 2., 4., 8., 12., 50.}, "pT bin limits for assoc particle"}; Configurable> binsPtEfficiencyD{"binsPtEfficiencyD", std::vector{o2::analysis::hf_cuts_ds_to_k_k_pi::vecBinsPt}, "pT bin limits for efficiency"}; Configurable> efficiencyD{"efficiencyD", {1., 1., 1., 1., 1., 1.}, "efficiency values for Ds meson"}; - + int hfcReducedCollisionIndex = 0; HfHelper hfHelper; From 6dced6c72bc73c96d0f58f1936223b40ea14ae89 Mon Sep 17 00:00:00 2001 From: Samuele Cattaruzzi <124249902+scattaru@users.noreply.github.com> Date: Tue, 17 Dec 2024 12:11:00 +0100 Subject: [PATCH 12/12] Update PWGHF/HFC/TableProducer/correlatorDsHadrons.cxx MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Vít Kučera --- PWGHF/HFC/TableProducer/correlatorDsHadrons.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PWGHF/HFC/TableProducer/correlatorDsHadrons.cxx b/PWGHF/HFC/TableProducer/correlatorDsHadrons.cxx index 155e71d2ec4..090b3f45d23 100644 --- a/PWGHF/HFC/TableProducer/correlatorDsHadrons.cxx +++ b/PWGHF/HFC/TableProducer/correlatorDsHadrons.cxx @@ -724,7 +724,7 @@ struct HfCorrelatorDsHadrons { } collReduced(collision.multFT0M(), collision.posZ()); - hfcReducedCollisionIndex += 1; + hfcReducedCollisionIndex++; } } PROCESS_SWITCH(HfCorrelatorDsHadrons, processDerivedDataDs, "Process derived data Ds", false);