From 944491684e335f6b3a8b33313839b92252715bad Mon Sep 17 00:00:00 2001 From: ALICE Action Bot Date: Thu, 18 Apr 2024 15:22:42 +0000 Subject: [PATCH] Please consider the following formatting changes --- .../candidateCreatorCharmResoReduced.cxx | 44 +++++++++---------- .../dataCreatorCharmResoReduced.cxx | 37 ++++++++-------- .../TableProducer/treeCreatorDplusToPiKPi.cxx | 12 ++--- 3 files changed, 46 insertions(+), 47 deletions(-) diff --git a/PWGHF/D2H/TableProducer/candidateCreatorCharmResoReduced.cxx b/PWGHF/D2H/TableProducer/candidateCreatorCharmResoReduced.cxx index 6e6d8e02596..28deede7c74 100644 --- a/PWGHF/D2H/TableProducer/candidateCreatorCharmResoReduced.cxx +++ b/PWGHF/D2H/TableProducer/candidateCreatorCharmResoReduced.cxx @@ -74,7 +74,7 @@ struct HfCandidateCreatorCharmResoReduced { Configurable> binsPt{"binsPt", std::vector{vecBins}, "pT bin limits"}; using reducedDWithMl = soa::Join; - + // Partition of V0 candidates based on v0Type Partition candidatesK0s = aod::hf_reso_cand_reduced::v0Type == (uint8_t)1 || aod::hf_reso_cand_reduced::v0Type == (uint8_t)3 || aod::hf_reso_cand_reduced::v0Type == (uint8_t)5; Partition candidatesLambda = aod::hf_reso_cand_reduced::v0Type == (uint8_t)2 || aod::hf_reso_cand_reduced::v0Type == (uint8_t)4; @@ -95,7 +95,7 @@ struct HfCandidateCreatorCharmResoReduced { if ((std::accumulate(doprocess.begin(), doprocess.end(), 0)) != 1) { LOGP(fatal, "Only one process function should be enabled! Please check your configuration!"); } - // histograms + // histograms const AxisSpec axisPt{(std::vector)vecBins, "#it{p}_{T} (GeV/#it{c})"}; registry.add("hMassDs1", "Ds1 candidates;m_{Ds1} (GeV/#it{c}^{2});entries", {HistType::kTH2F, {{100, 2.4, 2.7}, {(std::vector)binsPt, "#it{p}_{T} (GeV/#it{c})"}}}); registry.add("hMassDs2Star", "Ds^{*}2 candidates; m_Ds^{*}2 (GeV/#it{c}^{2}) ;entries", {HistType::kTH2F, {{100, 2.4, 2.7}, {(std::vector)binsPt, "#it{p}_{T} (GeV/#it{c})"}}}); @@ -119,7 +119,7 @@ struct HfCandidateCreatorCharmResoReduced { massDplus = o2::constants::physics::MassDPlus; massDstar = o2::constants::physics::MassDStar; } - /// Basic selection of D candidates + /// Basic selection of D candidates /// \param candD is the reduced D meson candidate /// \return true if selections are passed template @@ -138,7 +138,7 @@ struct HfCandidateCreatorCharmResoReduced { return true; } - /// Basic selection of V0 candidates + /// Basic selection of V0 candidates /// \param candV0 is the reduced V0 candidate /// \param candD is the reduced D meson candidate /// \return true if selections are passed @@ -155,7 +155,8 @@ struct HfCandidateCreatorCharmResoReduced { } else if (channel == DecayChannel::XcToDplusLambda || channel == DecayChannel::LambdaDminus) { massV0 = massLambda; int wsFact{1}; - if (channel == DecayChannel::LambdaDminus) wsFact = -1; + if (channel == DecayChannel::LambdaDminus) + wsFact = -1; uint8_t targetV0Type{0}; if (wsFact * candD.dType() > 0) { invMassV0 = candV0.invMassLambda(); @@ -253,8 +254,8 @@ struct HfCandidateCreatorCharmResoReduced { candV0.cpa(), candV0.dca(), candV0.radius()); - if constexpr(fillMl) { - mlScores(candD.mlScoreBkgMassHypo0(),candD.mlScorePromptMassHypo0(),candD.mlScoreNonpromptMassHypo0()); + if constexpr (fillMl) { + mlScores(candD.mlScoreBkgMassHypo0(), candD.mlScorePromptMassHypo0(), candD.mlScoreNonpromptMassHypo0()); } } } @@ -267,10 +268,10 @@ struct HfCandidateCreatorCharmResoReduced { runCandidateCreation(collision, candsD, candidatesK0s); } PROCESS_SWITCH(HfCandidateCreatorCharmResoReduced, processDs2StarToDplusK0s, "Process Ds2* candidates without ML info", true); - + void processDs2StarToDplusK0sWithMl(aod::HfRedCollisions::iterator const& collision, - soa::Join const& candsD, - aod::HfRedVzeros const&) + soa::Join const& candsD, + aod::HfRedVzeros const&) { runCandidateCreation(collision, candsD, candidatesK0s); } @@ -283,10 +284,10 @@ struct HfCandidateCreatorCharmResoReduced { runCandidateCreation(collision, candsD, candidatesK0s); } PROCESS_SWITCH(HfCandidateCreatorCharmResoReduced, processDs1ToDstarK0s, "Process Ds1 candidates without Ml info", false); - + void processDs1ToDstarK0sWithMl(aod::HfRedCollisions::iterator const& collision, - soa::Join const& candsD, - aod::HfRedVzeros const&) + soa::Join const& candsD, + aod::HfRedVzeros const&) { runCandidateCreation(collision, candsD, candidatesK0s); } @@ -299,27 +300,26 @@ struct HfCandidateCreatorCharmResoReduced { runCandidateCreation(collision, candsD, candidatesLambda); } PROCESS_SWITCH(HfCandidateCreatorCharmResoReduced, processXcToDplusLambda, "Process Xc candidates without Ml info", false); - + void processXcToDplusLambdaWithMl(aod::HfRedCollisions::iterator const& collision, - soa::Join const& candsD, - aod::HfRedVzeros const&) + soa::Join const& candsD, + aod::HfRedVzeros const&) { runCandidateCreation(collision, candsD, candidatesLambda); } PROCESS_SWITCH(HfCandidateCreatorCharmResoReduced, processXcToDplusLambdaWithMl, "Process Xc candidates with Ml info", false); - void processLambdaDminus(aod::HfRedCollisions::iterator const& collision, - aod::HfRed3PrNoTrks const& candsD, - aod::HfRedVzeros const&) + aod::HfRed3PrNoTrks const& candsD, + aod::HfRedVzeros const&) { runCandidateCreation(collision, candsD, candidatesLambda); } PROCESS_SWITCH(HfCandidateCreatorCharmResoReduced, processLambdaDminus, "Process LambdaDminus candidates without Ml info", false); - + void processLambdaDminusWithMl(aod::HfRedCollisions::iterator const& collision, - soa::Join const& candsD, - aod::HfRedVzeros const&) + soa::Join const& candsD, + aod::HfRedVzeros const&) { runCandidateCreation(collision, candsD, candidatesLambda); } diff --git a/PWGHF/D2H/TableProducer/dataCreatorCharmResoReduced.cxx b/PWGHF/D2H/TableProducer/dataCreatorCharmResoReduced.cxx index cc60a4bb739..1acec493668 100644 --- a/PWGHF/D2H/TableProducer/dataCreatorCharmResoReduced.cxx +++ b/PWGHF/D2H/TableProducer/dataCreatorCharmResoReduced.cxx @@ -69,17 +69,16 @@ enum DType : uint8_t { /// Creation of D-V0 pairs struct HfDataCreatorCharmResoReduced { - + // Produces AOD tables to store track information Produces hfReducedCollision; // Defined in PWGHF/D2H/DataModel/ReducedDataModel.h Produces hfCollisionCounter; // Defined in PWGHF/D2H/DataModel/ReducedDataModel.h - //V0 and D candidates reduced tables + // V0 and D candidates reduced tables Produces hfCandV0; // Defined in PWGHF/D2H/DataModel/ReducedDataModel.h Produces hfCandD; // Defined in PWGHF/D2H/DataModel/ReducedDataModel.h - //ML optional Tables - Produces hfCandDMl; // Defined in PWGHF/D2H/DataModel/ReducedDataModel.h + // ML optional Tables + Produces hfCandDMl; // Defined in PWGHF/D2H/DataModel/ReducedDataModel.h - // CCDB configuration o2::ccdb::CcdbApi ccdbApi; Service ccdb; @@ -256,7 +255,7 @@ struct HfDataCreatorCharmResoReduced { prongIdsD[1] = candD.prong1Id(); prongIdsD[2] = candD.prongPiId(); dtype = candD.signSoftPi() * DType::Dstar; - if constexpr(withMl){ + if constexpr (withMl) { std::copy(candD.mlProbDstarToD0Pi().begin(), candD.mlProbDstarToD0Pi().end(), bdtScores.begin()); } } else if constexpr (DecayChannel == DecayChannel::DplusV0) { @@ -271,7 +270,7 @@ struct HfDataCreatorCharmResoReduced { prongIdsD[1] = candD.prong1Id(); prongIdsD[2] = candD.prong2Id(); dtype = static_cast(prong0.sign() * DType::Dplus); - if constexpr(withMl){ + if constexpr (withMl) { std::copy(candD.mlProbDplusToPiKPi().begin(), candD.mlProbDplusToPiKPi().end(), bdtScores.begin()); } } // else if @@ -356,8 +355,8 @@ struct HfDataCreatorCharmResoReduced { pVecD[0], pVecD[1], pVecD[2], dtype); if constexpr (withMl) { - hfCandDMl(bdtScores[0], bdtScores[1], bdtScores[2]); - } + hfCandDMl(bdtScores[0], bdtScores[1], bdtScores[2]); + } fillHfReducedCollision = true; switch (DecayChannel) { case DecayChannel::DstarV0: @@ -404,11 +403,11 @@ struct HfDataCreatorCharmResoReduced { PROCESS_SWITCH(HfDataCreatorCharmResoReduced, processDplusV0, "Process Dplus candidates without MC info and without ML info", true); void processDplusV0WithMl(aod::Collisions const& collisions, - CandsDplusFilteredWithMl const& candsDplus, - aod::TrackAssoc const& trackIndices, - aod::V0Datas const& V0s, - BigTracksPID const& tracks, - aod::BCsWithTimestamps const& bcs) + CandsDplusFilteredWithMl const& candsDplus, + aod::TrackAssoc const& trackIndices, + aod::V0Datas const& V0s, + BigTracksPID const& tracks, + aod::BCsWithTimestamps const& bcs) { // handle normalization by the right number of collisions hfCollisionCounter(collisions.tableSize()); @@ -442,11 +441,11 @@ struct HfDataCreatorCharmResoReduced { PROCESS_SWITCH(HfDataCreatorCharmResoReduced, processDstarV0, "Process DStar candidates without MC info and without ML info", false); void processDstarV0WithMl(aod::Collisions const& collisions, - CandDstarFilteredWithMl const& candsDstar, - aod::TrackAssoc const& trackIndices, - aod::V0Datas const& V0s, - BigTracksPID const& tracks, - aod::BCsWithTimestamps const& bcs) + CandDstarFilteredWithMl const& candsDstar, + aod::TrackAssoc const& trackIndices, + aod::V0Datas const& V0s, + BigTracksPID const& tracks, + aod::BCsWithTimestamps const& bcs) { // handle normalization by the right number of collisions hfCollisionCounter(collisions.tableSize()); diff --git a/PWGHF/TableProducer/treeCreatorDplusToPiKPi.cxx b/PWGHF/TableProducer/treeCreatorDplusToPiKPi.cxx index 5faf9336b8e..75d43c1b490 100644 --- a/PWGHF/TableProducer/treeCreatorDplusToPiKPi.cxx +++ b/PWGHF/TableProducer/treeCreatorDplusToPiKPi.cxx @@ -93,8 +93,8 @@ DECLARE_SOA_TABLE(HfCandDpLites, "AOD", "HFCANDDPLITE", hf_cand::ImpactParameter0, hf_cand::ImpactParameter1, hf_cand::ImpactParameter2, - hf_cand::ImpactParameterZ0, - hf_cand::ImpactParameterZ1, + hf_cand::ImpactParameterZ0, + hf_cand::ImpactParameterZ1, hf_cand::ImpactParameterZ2, full::NSigTpcPi0, full::NSigTpcKa0, @@ -167,11 +167,11 @@ DECLARE_SOA_TABLE(HfCandDpFulls, "AOD", "HFCANDDPFULL", hf_cand::ErrorImpactParameter0, hf_cand::ErrorImpactParameter1, hf_cand::ErrorImpactParameter2, - hf_cand::ImpactParameterZ0, - hf_cand::ImpactParameterZ1, + hf_cand::ImpactParameterZ0, + hf_cand::ImpactParameterZ1, hf_cand::ImpactParameterZ2, - hf_cand::ErrorImpactParameterZ0, - hf_cand::ErrorImpactParameterZ1, + hf_cand::ErrorImpactParameterZ0, + hf_cand::ErrorImpactParameterZ1, hf_cand::ErrorImpactParameterZ2, full::NSigTpcPi0, full::NSigTpcKa0,