From 88cef53f10010657b0b144d333f7b0f3410a8bcd Mon Sep 17 00:00:00 2001 From: ALICE Action Bot Date: Tue, 10 Nov 2026 07:09:09 +0000 Subject: [PATCH] Please consider the following formatting changes --- PWGCF/Femto/Core/closeTripletRejection.h | 2 +- PWGCF/Femto/Core/sigma0HistManager.h | 54 +++++++++---------- PWGCF/Femto/Core/tripletBuilder.h | 3 +- PWGCF/Femto/DataModel/FemtoTables.h | 28 +++++----- .../TableProducer/femtoSigma0Producer.cxx | 1 - .../Tasks/femtoTripletTrackTrackSigma0.cxx | 16 +++--- 6 files changed, 51 insertions(+), 53 deletions(-) diff --git a/PWGCF/Femto/Core/closeTripletRejection.h b/PWGCF/Femto/Core/closeTripletRejection.h index 2b6025c4db5..ece3024343b 100644 --- a/PWGCF/Femto/Core/closeTripletRejection.h +++ b/PWGCF/Femto/Core/closeTripletRejection.h @@ -258,7 +258,7 @@ class CloseTripletRejectionTrackTrackSigma0 bool isClose12 = mCtrTrack12.isClosePair(track1, track2, trackTable, tripletHistManager); bool isClose1Sigma0 = mCtrTrack1Sigma0.isClosePair(track1, sigma0, trackTable, tripletHistManager); bool isClose2Sigma0 = mCtrTrack2Sigma0.isClosePair(track2, sigma0, trackTable, tripletHistManager); - return isClose12 || isClose1Sigma0|| isClose2Sigma0; + return isClose12 || isClose1Sigma0 || isClose2Sigma0; } private: diff --git a/PWGCF/Femto/Core/sigma0HistManager.h b/PWGCF/Femto/Core/sigma0HistManager.h index 46eff0f47ad..e89c342923d 100644 --- a/PWGCF/Femto/Core/sigma0HistManager.h +++ b/PWGCF/Femto/Core/sigma0HistManager.h @@ -18,9 +18,9 @@ #include "PWGCF/Femto/Core/histManager.h" #include "PWGCF/Femto/Core/modes.h" +#include "PWGCF/Femto/Core/photonHistManager.h" #include "PWGCF/Femto/Core/trackHistManager.h" #include "PWGCF/Femto/Core/v0HistManager.h" -#include "PWGCF/Femto/Core/photonHistManager.h" #include #include @@ -158,29 +158,29 @@ constexpr std::array, kSigma0HistLast> HistTab {kTruePtVsPt, {(conf).pt, (conf).pt}}, \ {kTrueEtaVsEta, {(conf).eta, (conf).eta}}, \ {kTruePhiVsPhi, {(conf).phi, (conf).phi}}, \ - {kPdg, {(conf).pdgCodes}}, + {kPdg, {(conf).pdgCodes}}, // NOLINTNEXTLINE(cppcoreguidelines-macro-usage) -#define SIGMA0_HIST_QA_MAP(confAnalysis, confQa) \ - {kCosPa, {(confQa).cosPa}}, \ - {kDecayVtxX, {(confQa).decayVertex}}, \ - {kDecayVtxY, {(confQa).decayVertex}}, \ - {kDecayVtxZ, {(confQa).decayVertex}}, \ - {kDecayVtx, {(confQa).decayVertex}}, \ - {kPtVsEta, {(confAnalysis).pt, (confAnalysis).eta}}, \ - {kPtVsPhi, {(confAnalysis).pt, (confAnalysis).phi}}, \ - {kPhiVsEta, {(confAnalysis).phi, (confAnalysis).eta}}, \ - {kPtVsCosPa, {(confAnalysis).pt, (confQa).cosPa}}, \ - {kMassSigma0, {(confQa).massSigma0}}, \ - {kMassAntiSigma0, {(confQa).massAntiSigma0}}, \ - {kPtVsSigma0Mass, {(confAnalysis).pt, (confQa).massSigma0}}, \ - {kPtVsAntiSigma0Mass, {(confAnalysis).pt, (confQa).massAntiSigma0}}, \ +#define SIGMA0_HIST_QA_MAP(confAnalysis, confQa) \ + {kCosPa, {(confQa).cosPa}}, \ + {kDecayVtxX, {(confQa).decayVertex}}, \ + {kDecayVtxY, {(confQa).decayVertex}}, \ + {kDecayVtxZ, {(confQa).decayVertex}}, \ + {kDecayVtx, {(confQa).decayVertex}}, \ + {kPtVsEta, {(confAnalysis).pt, (confAnalysis).eta}}, \ + {kPtVsPhi, {(confAnalysis).pt, (confAnalysis).phi}}, \ + {kPhiVsEta, {(confAnalysis).phi, (confAnalysis).eta}}, \ + {kPtVsCosPa, {(confAnalysis).pt, (confQa).cosPa}}, \ + {kMassSigma0, {(confQa).massSigma0}}, \ + {kMassAntiSigma0, {(confQa).massAntiSigma0}}, \ + {kPtVsSigma0Mass, {(confAnalysis).pt, (confQa).massSigma0}}, \ + {kPtVsAntiSigma0Mass, {(confAnalysis).pt, (confQa).massAntiSigma0}}, \ {kSigma0MassVsAntiSigma0Mass, {(confQa).massSigma0, (confQa).massAntiSigma0}}, // NOLINTNEXTLINE(cppcoreguidelines-macro-usage) -#define SIGMA0_HIST_MC_QA_MAP(confAnalysis, confQa) \ - {kNoMcParticle, {(confAnalysis).pt, (confQa).cosPa}}, \ - {kPrimary, {(confAnalysis).pt, (confQa).cosPa}}, +#define SIGMA0_HIST_MC_QA_MAP(confAnalysis, confQa) \ + {kNoMcParticle, {(confAnalysis).pt, (confQa).cosPa}}, \ + {kPrimary, {(confAnalysis).pt, (confQa).cosPa}}, template auto makeSigma0HistSpecMap(const T& confBinningAnalysis) @@ -237,7 +237,7 @@ class Sigma0HistManager Sigma0HistManager() = default; ~Sigma0HistManager() = default; - // minimal init + // minimal init template void init(o2::framework::HistogramRegistry* registry, std::map> const& Sigma0Specs, @@ -273,7 +273,7 @@ class Sigma0HistManager this->initQa(Sigma0Specs); } } - + // init with qa + lambda and photon managers template void init(o2::framework::HistogramRegistry* registry, @@ -296,18 +296,18 @@ class Sigma0HistManager void fill(T1 const& sigma0candidate) { if constexpr (modes::isFlagSet(mode, modes::Mode::kReco)) { - this->fillAnalysis(sigma0candidate); - } + this->fillAnalysis(sigma0candidate); + } if constexpr (modes::isFlagSet(mode, modes::Mode::kQa)) { - this->fillQa(sigma0candidate); + this->fillQa(sigma0candidate); } } - // wrapper for tripletProcessHelpers + // wrapper for tripletProcessHelpers template void fill(T1 const& sigma0candidate, T2 const& tracks) { - this->fillAnalysis(sigma0candidate); + this->fillAnalysis(sigma0candidate); } // fill sigma0 + lambda + photon @@ -333,7 +333,7 @@ class Sigma0HistManager template void fill(T1 const& sigma0candidate, T2 const& trackTable, T3 const& col, T4 const& mcParticles, T5 const& mcMothers, T6 const& mcPartonicMothers) { - this->template fillMc(sigma0candidate, col, mcParticles, mcMothers, mcPartonicMothers); + this->template fillMc(sigma0candidate, col, mcParticles, mcMothers, mcPartonicMothers); } // fill mc + lambda + photon template diff --git a/PWGCF/Femto/Core/tripletBuilder.h b/PWGCF/Femto/Core/tripletBuilder.h index 4912b58827c..fc516d59942 100644 --- a/PWGCF/Femto/Core/tripletBuilder.h +++ b/PWGCF/Femto/Core/tripletBuilder.h @@ -23,12 +23,12 @@ #include "PWGCF/Femto/Core/modes.h" #include "PWGCF/Femto/Core/pairHistManager.h" #include "PWGCF/Femto/Core/particleCleaner.h" +#include "PWGCF/Femto/Core/sigma0HistManager.h" #include "PWGCF/Femto/Core/trackHistManager.h" #include "PWGCF/Femto/Core/tripletCleaner.h" #include "PWGCF/Femto/Core/tripletHistManager.h" #include "PWGCF/Femto/Core/tripletProcessHelpers.h" #include "PWGCF/Femto/Core/v0HistManager.h" -#include "PWGCF/Femto/Core/sigma0HistManager.h" #include "PWGCF/Femto/DataModel/FemtoTables.h" #include @@ -1284,7 +1284,6 @@ class TripletTrackTrackSigma0Builder std::uniform_int_distribution<> mDist; }; - // builder for triplets of generated particles (mc truth only, kMc without kReco) // covers all triplet types, since e.g. a lambda is just another mc particle template , - femtobase::stored::FColId, - femtobase::stored::SignedPt, - femtobase::stored::Eta, - femtobase::stored::Phi, - femtobase::stored::Mass, - femtosigma0s::LambdaId, - femtosigma0s::PosDauId, - femtosigma0s::NegDauId, - femtosigma0s::PhotonId, - femtobase::dynamic::Pt, - femtobase::dynamic::Sign); + o2::soa::Index<>, + femtobase::stored::FColId, + femtobase::stored::SignedPt, + femtobase::stored::Eta, + femtobase::stored::Phi, + femtobase::stored::Mass, + femtosigma0s::LambdaId, + femtosigma0s::PosDauId, + femtosigma0s::NegDauId, + femtosigma0s::PhotonId, + femtobase::dynamic::Pt, + femtobase::dynamic::Sign); using FSigma0s = FSigma0s_001; DECLARE_SOA_TABLE_STAGED_VERSIONED(FSigma0Masks_001, "FSIGMA0MASK", 1, //! sigma0 masks diff --git a/PWGCF/Femto/TableProducer/femtoSigma0Producer.cxx b/PWGCF/Femto/TableProducer/femtoSigma0Producer.cxx index f0f557a37ad..3945612dc39 100644 --- a/PWGCF/Femto/TableProducer/femtoSigma0Producer.cxx +++ b/PWGCF/Femto/TableProducer/femtoSigma0Producer.cxx @@ -57,4 +57,3 @@ WorkflowSpec defineDataProcessing(ConfigContext const& cfgc) { return WorkflowSpec{adaptAnalysisTask(cfgc)}; } - diff --git a/PWGCF/Femto/Tasks/femtoTripletTrackTrackSigma0.cxx b/PWGCF/Femto/Tasks/femtoTripletTrackTrackSigma0.cxx index 23a8a66f275..a7340854fbe 100644 --- a/PWGCF/Femto/Tasks/femtoTripletTrackTrackSigma0.cxx +++ b/PWGCF/Femto/Tasks/femtoTripletTrackTrackSigma0.cxx @@ -21,14 +21,14 @@ #include "PWGCF/Femto/Core/pairCleaner.h" #include "PWGCF/Femto/Core/particleCleaner.h" #include "PWGCF/Femto/Core/partitions.h" +#include "PWGCF/Femto/Core/photonHistManager.h" +#include "PWGCF/Femto/Core/sigma0Builder.h" +#include "PWGCF/Femto/Core/sigma0HistManager.h" #include "PWGCF/Femto/Core/trackBuilder.h" #include "PWGCF/Femto/Core/trackHistManager.h" #include "PWGCF/Femto/Core/tripletBuilder.h" #include "PWGCF/Femto/Core/tripletHistManager.h" -#include "PWGCF/Femto/Core/sigma0Builder.h" -#include "PWGCF/Femto/Core/sigma0HistManager.h" #include "PWGCF/Femto/Core/v0HistManager.h" -#include "PWGCF/Femto/Core/photonHistManager.h" #include "PWGCF/Femto/DataModel/FemtoTables.h" #include @@ -44,8 +44,8 @@ #include #include -#include #include +#include using namespace o2::analysis::femto; @@ -80,8 +80,8 @@ struct FemtoTripletTrackTrackSigma0 { trackhistmanager::ConfTrackBinning1 confTrackBinning1; trackbuilder::ConfTrackSelection2 confTrackSelections2; trackhistmanager::ConfTrackBinning2 confTrackBinning2; - inline static constexpr std::string_view PrefixTrack1 = "Track1/"; - inline static constexpr std::string_view PrefixTrack2 = "Track2/"; + inline static constexpr std::string_view PrefixTrack1 = "Track1/"; + inline static constexpr std::string_view PrefixTrack2 = "Track2/"; // particle cleaners (mc only) particlecleaner::ConfTrackCleaner1 confTrackCleaner1; @@ -98,9 +98,9 @@ struct FemtoTripletTrackTrackSigma0 { // setup for photon and lambda v0histmanager::ConfLambdaBinning1 confLambdaBinning; - inline static constexpr std::string_view PrefixPhoton = "Sigma0/DauPhoton/"; + inline static constexpr std::string_view PrefixPhoton = "Sigma0/DauPhoton/"; photonhistmanager::ConfPhotonBinning confPhotonBinning; - inline static constexpr std::string_view PrefixLambda = "Sigma0/DauLambda/"; + inline static constexpr std::string_view PrefixLambda = "Sigma0/DauLambda/"; // setup sigma0s sigma0builder::ConfSigma0SelectionDefault confSigma0Selection;