From c77f71fb861a5c44f3b189c82d1c90e1b9e9bb0c Mon Sep 17 00:00:00 2001 From: ALICE Action Bot Date: Mon, 2 Jun 2025 14:45:30 +0000 Subject: [PATCH] Please consider the following formatting changes --- ALICE3/DataModel/OTFMulticharm.h | 4 +- .../TableProducer/alice3-multicharmTable.cxx | 15 ++--- ALICE3/Tasks/alice3-multicharm.cxx | 66 +++++++++---------- 3 files changed, 40 insertions(+), 45 deletions(-) diff --git a/ALICE3/DataModel/OTFMulticharm.h b/ALICE3/DataModel/OTFMulticharm.h index 22c646f8bfe..c04ad88b4bf 100644 --- a/ALICE3/DataModel/OTFMulticharm.h +++ b/ALICE3/DataModel/OTFMulticharm.h @@ -32,7 +32,6 @@ DECLARE_SOA_INDEX_COLUMN_FULL(XiCPion1, xiCPion1, int, Tracks, "_Pi1XiC"); DECLARE_SOA_INDEX_COLUMN_FULL(XiCPion2, xiCPion2, int, Tracks, "_Pi2XiC"); DECLARE_SOA_INDEX_COLUMN_FULL(XiCCPion, xiCCPion, int, Tracks, "_PiXiCC"); - DECLARE_SOA_COLUMN(XicMass, xicMass, float); DECLARE_SOA_COLUMN(XiccMass, xiccMass, float); @@ -100,7 +99,6 @@ DECLARE_SOA_COLUMN(Pi2cEta, pi2cEta, float); DECLARE_SOA_COLUMN(PiccPt, piccPt, float); DECLARE_SOA_COLUMN(PiccEta, piccEta, float); - } // namespace otfmulticharm DECLARE_SOA_TABLE(MCharmIndices, "AOD", "MCharmIndices", o2::soa::Index<>, @@ -158,7 +156,7 @@ DECLARE_SOA_TABLE(MCharmCores, "AOD", "MCharmCores", otfmulticharm::PiccTofNSigmaInner, otfmulticharm::PiccTofDeltaOuter, otfmulticharm::PiccTofNSigmaOuter, - + otfmulticharm::BachPt, otfmulticharm::BachEta, diff --git a/ALICE3/TableProducer/alice3-multicharmTable.cxx b/ALICE3/TableProducer/alice3-multicharmTable.cxx index 7b55cb46f7b..16b16c666d8 100644 --- a/ALICE3/TableProducer/alice3-multicharmTable.cxx +++ b/ALICE3/TableProducer/alice3-multicharmTable.cxx @@ -726,14 +726,14 @@ struct alice3multicharmTable { thisXiCcandidate.dca, thisXiCCcandidate.dca, thisXiCcandidate.mass, thisXiCCcandidate.mass, thisXiCCcandidate.pt, thisXiCCcandidate.eta, - xi.dcaXY(), xi.dcaZ(), - xicdcaXY, xicdcaZ, + xi.dcaXY(), xi.dcaZ(), + xicdcaXY, xicdcaZ, xiccdcaXY, xiccdcaZ, - piFromXi.dcaXY(), piFromXi.dcaZ(), - piFromLa.dcaXY(), piFromLa.dcaZ(), + piFromXi.dcaXY(), piFromXi.dcaZ(), + piFromLa.dcaXY(), piFromLa.dcaZ(), prFromLa.dcaXY(), prFromLa.dcaZ(), - pi1c.dcaXY(), pi1c.dcaZ(), - pi2c.dcaXY(), pi2c.dcaZ(), + pi1c.dcaXY(), pi1c.dcaZ(), + pi2c.dcaXY(), pi2c.dcaZ(), picc.dcaXY(), picc.dcaZ(), xicDecayRadius2D, xiccDecayRadius2D, xicProperLength, xicDecayDistanceFromPV, @@ -749,8 +749,7 @@ struct alice3multicharmTable { piFromLa.pt(), piFromLa.eta(), pi1c.pt(), pi1c.eta(), pi2c.pt(), pi2c.eta(), - picc.pt(), picc.eta() - ); + picc.pt(), picc.eta()); } } histos.fill(HIST("hCombinationsXiCC"), nCombinationsCC); diff --git a/ALICE3/Tasks/alice3-multicharm.cxx b/ALICE3/Tasks/alice3-multicharm.cxx index ef7e07e5fbc..34276a800b3 100644 --- a/ALICE3/Tasks/alice3-multicharm.cxx +++ b/ALICE3/Tasks/alice3-multicharm.cxx @@ -53,17 +53,15 @@ #include "DetectorsVertexing/PVertexerHelpers.h" #include "CommonConstants/PhysicsConstants.h" - using namespace o2; using namespace o2::framework; using namespace o2::framework::expressions; using multicharmtracks = soa::Join; -struct alice3multicharm -{ +struct alice3multicharm { SliceCache cache; - + ConfigurableAxis axisEta{"axisEta", {80, -4.0f, +4.0f}, "#eta"}; ConfigurableAxis axisXiccMass{"axisXiccMass", {200, 3.521f, 3.721f}, "Xicc Inv Mass (GeV/c^{2})"}; ConfigurableAxis axisDCA{"axisDCA", {400, 0, 400}, "DCA (#mum)"}; @@ -82,7 +80,7 @@ struct alice3multicharm Configurable picMinDCAz{"picMinDCAz", -1, "[0] in |DCAxy| > [0]+[1]/pT"}; Configurable picMaxTofDiffInner{"picTofDiffInner", 1e+4, "|signal - expected| (ps)"}; Configurable picMinPt{"picMinPt", -1, "Minimum pT for Xic pions"}; - + Configurable piccMinDCAxy{"piccMinDCAxy", -1, "[0] in |DCAxy| > [0]+[1]/pT"}; Configurable piccMinDCAz{"piccMinDCAz", -1, "[0] in |DCAz| > [0]+[1]/pT"}; Configurable piccMaxTofDiffInner{"piccMaxTofDiffInner", 1e+4, "|signal - expected| (ps)"}; @@ -97,7 +95,7 @@ struct alice3multicharm Configurable xicMinDecayDistanceFromPV{"xicMinDecayDistanceFromPV", -1, "Minimum distance for Xic decay from PV (cm)"}; Configurable xicMinProperLength{"xicMinProperLength", -1, "Minimum proper length for Xic decay (cm)"}; Configurable xicMaxProperLength{"xicMaxProperLength", 1e+4, "Minimum proper length for Xic decay (cm)"}; - + Configurable xiccMaxDauDCA{"xiccMaxDauDCA", 1e+4, "DCA between Xicc daughters (cm)"}; Configurable xiccMinRadius{"xiccMinRadius", -1, "Minimum R2D for Xicc decay (cm)"}; Configurable xiccMinProperLength{"xiccMinProperLength", -1, "Minimum proper length for Xicc decay (cm)"}; @@ -141,59 +139,59 @@ struct alice3multicharm for (const auto& xiccCand : multiCharmTracks) { if (xiccCand.xicDauDCA() > xicMaxDauDCA || xiccCand.xiccDauDCA() > xiccMaxDauDCA) continue; - + if (std::fabs(xiccCand.xiDCAxy()) < xiMinDCAxy || std::fabs(xiccCand.xiDCAz()) < xiMinDCAz) continue; - + if (std::fabs(xiccCand.pi1cDCAxy()) < picMinDCAxy || std::fabs(xiccCand.pi1cDCAz()) < picMinDCAz) - continue; - + continue; + if (std::fabs(xiccCand.pi2cDCAxy()) < picMinDCAxy || std::fabs(xiccCand.pi2cDCAz()) < picMinDCAz) - continue; - + continue; + if (std::fabs(xiccCand.piccDCAxy()) < piccMinDCAxy || std::fabs(xiccCand.piccDCAz()) < piccMinDCAz) - continue; - + continue; + if (std::fabs(xiccCand.xicDCAxy()) < xicMinDCAxy || std::fabs(xiccCand.xicDCAz()) < xicMinDCAz) - continue; - + continue; + if (std::fabs(xiccCand.pi1cDCAxy()) < picMinDCAxy || std::fabs(xiccCand.pi1cDCAz()) < picMinDCAz) - continue; - + continue; + if (std::fabs(xiccCand.pi2cDCAxy()) < picMinDCAxy || std::fabs(xiccCand.pi2cDCAz()) < picMinDCAz) continue; - + if (std::fabs(xiccCand.xiccDCAxy()) > xiccMaxDCAxy || std::fabs(xiccCand.xiccDCAz()) > xiccMaxDCAz) continue; - + // Cut on time delta as LoI for now if (xiccCand.pi1cTofDeltaInner() > picMaxTofDiffInner) - continue; - + continue; + if (xiccCand.pi2cTofDeltaInner() > picMaxTofDiffInner) continue; - + if (xiccCand.piccTofDeltaInner() > piccMaxTofDiffInner) - continue; - + continue; + if (xiccCand.pi1cPt() < picMinPt || xiccCand.pi2cPt() < picMinPt) continue; - + if (xiccCand.piccPt() < piccMinPt) - continue; - + continue; + if (xiccCand.xicDecayRadius2D() < xicMinRadius) - continue; - + continue; + if (xiccCand.xiccDecayRadius2D() < xiccMinRadius) continue; - + if (xiccCand.xicProperLength() < xicMinProperLength || xiccCand.xicProperLength() > xicMaxProperLength) continue; - + if (xiccCand.xiccProperLength() < xiccMinProperLength || xiccCand.xiccProperLength() > xiccMaxProperLength) - continue; - + continue; + if (xiccCand.xicDistanceFromPV() < xicMinDecayDistanceFromPV) continue;