From 4de8a7932b0d165928344ab6edb1796c1f174216 Mon Sep 17 00:00:00 2001 From: ALICE Action Bot Date: Wed, 28 Feb 2024 15:10:35 +0000 Subject: [PATCH] Please consider the following formatting changes --- PWGHF/D2H/DataModel/ReducedDataModel.h | 6 +- .../TableProducer/dataCreatorDV0Reduced.cxx | 57 +++++++++---------- 2 files changed, 30 insertions(+), 33 deletions(-) diff --git a/PWGHF/D2H/DataModel/ReducedDataModel.h b/PWGHF/D2H/DataModel/ReducedDataModel.h index 8d9d289c252..9fea8ebf8c6 100644 --- a/PWGHF/D2H/DataModel/ReducedDataModel.h +++ b/PWGHF/D2H/DataModel/ReducedDataModel.h @@ -381,9 +381,9 @@ DECLARE_SOA_COLUMN(InvMassAntiLambda, invMassAntiLambda, float); //! Invariant m DECLARE_SOA_COLUMN(Px, px, float); //! Momentum of V0/3 prong candidate in GeV/c DECLARE_SOA_COLUMN(Py, py, float); DECLARE_SOA_COLUMN(Pz, pz, float); -DECLARE_SOA_COLUMN(CosP, cosp, float); //! Cos PA of V0 candidate -DECLARE_SOA_COLUMN(DCA, dca, float); //! DCA of V0 candidate -DECLARE_SOA_COLUMN(Radius, radius, float); //! Radius of V0 candidate +DECLARE_SOA_COLUMN(CosP, cosp, float); //! Cos PA of V0 candidate +DECLARE_SOA_COLUMN(DCA, dca, float); //! DCA of V0 candidate +DECLARE_SOA_COLUMN(Radius, radius, float); //! Radius of V0 candidate DECLARE_SOA_COLUMN(V0Type, v0Type, uint8_t); //! Bitmap with mass hypothesis of the V0 DECLARE_SOA_COLUMN(DType, dType, int8_t); //! Integer with selected D candidate type: 1 = Dplus, -1 = Dminus, 2 = DstarPlus, -2 = DstarMinus } // namespace hf_reso_cand_reduced diff --git a/PWGHF/D2H/TableProducer/dataCreatorDV0Reduced.cxx b/PWGHF/D2H/TableProducer/dataCreatorDV0Reduced.cxx index b37ee0dea6e..018a3b3083a 100644 --- a/PWGHF/D2H/TableProducer/dataCreatorDV0Reduced.cxx +++ b/PWGHF/D2H/TableProducer/dataCreatorDV0Reduced.cxx @@ -54,7 +54,7 @@ enum Event : uint8_t { enum DecayChannel : uint8_t { DstarV0 = 0, DplusV0 - }; +}; enum V0_type : uint8_t { K0s = 0, @@ -98,8 +98,6 @@ struct HfDataCreatorDV0Reduced { Configurable maxV0dauDCA{"maxV0dauDCA", 1., "maximum DCA for V0 daughters"}; Configurable maxNsigmaPrForLambda{"maxNsigmaPrForLambda", 4., "maximum proton NSigma in TPC and TOF for Lambdas"}; - - // material correction for track propagation o2::base::MatLayerCylSet* lut; o2::base::Propagator::MatCorrType matCorr = o2::base::Propagator::MatCorrType::USEMatCorrLUT; @@ -160,7 +158,7 @@ struct HfDataCreatorDV0Reduced { /// \param collision is the current collision /// \return a bitmap with mass hypotesis if passes all cuts template - inline uint8_t isSelectedV0(const V0& v0, const Coll& collision, const std::array& dauTracks, const std::array& dDaughtersIDs) + inline uint8_t isSelectedV0(const V0& v0, const Coll& collision, const std::array& dauTracks, const std::array& dDaughtersIDs) { uint8_t isSelected{BIT(K0s) | BIT(Lambda) | BIT(AntiLambda)}; // reject VOs that share daughters with D @@ -171,7 +169,7 @@ struct HfDataCreatorDV0Reduced { if (std::fabs(v0.negativeeta()) > minV0dauEta || std::fabs(v0.positiveeta()) > minV0dauEta) { // cut all V0 daughters with |eta| > 1. return 0; } - //minimum v0radius + // minimum v0radius if (v0.v0radius() < minK0sLambdaRadius) { return 0; } @@ -181,10 +179,10 @@ struct HfDataCreatorDV0Reduced { return 0; } // DCA V0 and V0 daughters to select for primary V0s - if (v0.dcav0topv() > maxV0DCA || v0.dcaV0daughters() > maxV0dauDCA || std::fabs(v0.dcapostopv()) maxV0DCA || v0.dcaV0daughters() > maxV0dauDCA || std::fabs(v0.dcapostopv()) < minV0dauDCA || std::fabs(v0.dcanegtopv()) < minV0dauDCA) { return 0; - } - //mass hypotesis + } + // mass hypotesis if (TESTBIT(isSelected, K0s) && std::fabs(v0.mK0Short() - MassK0) > deltaMassK0s) { CLRBIT(isSelected, K0s); } @@ -268,15 +266,15 @@ struct HfDataCreatorDV0Reduced { prongIdsD[1] = candD.prong1Id(); prongIdsD[2] = candD.prong2Id(); d_type = candD.sign() * TypeD::Dplus; - } // else if + } // else if // Loop on V0 candidates for (const auto& v0 : V0s) { auto posTrack = v0.posTrack_as(); auto negTrack = v0.negTrack_as(); - //Apply selsection + // Apply selsection v0_type = isSelectedV0(v0, collision, std::array{posTrack, negTrack}, prongIdsD); - if (v0_type == 0){ + if (v0_type == 0) { continue; } // propagate V0 to primary vertex (if enabled) @@ -291,38 +289,37 @@ struct HfDataCreatorDV0Reduced { o2::base::Propagator::Instance()->propagateToDCABxByBz({collision.posX(), collision.posY(), collision.posZ()}, trackParK0, 2.f, matCorr, &dcaInfo); getPxPyPz(trackParK0, pVecV0); } - float ptV0 = sqrt(pVecV0[0] * pVecV0[0] + pVecV0[1] * pVecV0[1]);\ - // fill histos + float ptV0 = sqrt(pVecV0[0] * pVecV0[0] + pVecV0[1] * pVecV0[1]); // fill histos registry.fill(HIST("hPtV0"), ptV0); registry.fill(HIST("hV0_type"), v0_type); - if (TESTBIT(v0_type, K0s)){ + if (TESTBIT(v0_type, K0s)) { massV0 = MassK0; auto invMass2DV0 = RecoDecay::m2(std::array{pVecD, pVecV0}, std::array{massD, massV0}); registry.fill(HIST("hMassK0s"), v0.mK0Short()); switch (DecayChannel) { - case DecayChannel::DstarV0: - registry.fill(HIST("hMassDs1"), sqrt(invMass2DV0) - invMassD); - break; - case DecayChannel::DplusV0: - registry.fill(HIST("hMassDsStar2"), sqrt(invMass2DV0) - invMassD); - break; - default: - break; + case DecayChannel::DstarV0: + registry.fill(HIST("hMassDs1"), sqrt(invMass2DV0) - invMassD); + break; + case DecayChannel::DplusV0: + registry.fill(HIST("hMassDsStar2"), sqrt(invMass2DV0) - invMassD); + break; + default: + break; } } - if (TESTBIT(v0_type, Lambda)){ + if (TESTBIT(v0_type, Lambda)) { massV0 = MassLambda0; auto invMass2DV0 = RecoDecay::m2(std::array{pVecD, pVecV0}, std::array{massD, massV0}); registry.fill(HIST("hMassLambda"), v0.mLambda()); - if(DecayChannel == DecayChannel::DplusV0){ + if (DecayChannel == DecayChannel::DplusV0) { registry.fill(HIST("hMassXcRes"), sqrt(invMass2DV0) - invMassD); } } - if(TESTBIT(v0_type, AntiLambda)){ + if (TESTBIT(v0_type, AntiLambda)) { massV0 = MassLambda0; auto invMass2DV0 = RecoDecay::m2(std::array{pVecD, pVecV0}, std::array{massD, massV0}); registry.fill(HIST("hMassLambda"), v0.mAntiLambda()); - if(DecayChannel == DecayChannel::DplusV0){ + if (DecayChannel == DecayChannel::DplusV0) { registry.fill(HIST("hMassXcRes"), sqrt(invMass2DV0) - invMassD); } } @@ -399,10 +396,10 @@ struct HfDataCreatorDV0Reduced { PROCESS_SWITCH(HfDataCreatorDV0Reduced, processDplusV0, "Process Dplus candidates without MC info and without ML info", true); void processDstarV0(aod::Collisions const& collisions, - CandDstarFiltered const& candsDstar, - aod::TrackAssoc const& trackIndices, - aod::V0Datas const& V0s, - aod::BCsWithTimestamps const& bcs) + CandDstarFiltered const& candsDstar, + aod::TrackAssoc const& trackIndices, + aod::V0Datas const& V0s, + aod::BCsWithTimestamps const& bcs) { // handle normalization by the right number of collisions hfCollisionCounter(collisions.tableSize());