From b9bf561ec19e24170126103cad62ffbe11303a28 Mon Sep 17 00:00:00 2001 From: ddobrigk Date: Thu, 30 Nov 2023 20:29:29 +0100 Subject: [PATCH 1/2] Rename, adjust strange track ref --- PWGLF/DataModel/LFStrangenessTables.h | 8 +--- PWGLF/TableProducer/strangederivedbuilder.cxx | 47 ++++++++----------- 2 files changed, 22 insertions(+), 33 deletions(-) diff --git a/PWGLF/DataModel/LFStrangenessTables.h b/PWGLF/DataModel/LFStrangenessTables.h index 6d5d0374f7d..e089436a5ba 100644 --- a/PWGLF/DataModel/LFStrangenessTables.h +++ b/PWGLF/DataModel/LFStrangenessTables.h @@ -659,12 +659,8 @@ DECLARE_SOA_TABLE(TraCascCollRefs, "AOD", "TRACASCCOLLREF", //! optional table t DECLARE_SOA_TABLE(CascExtras, "AOD", "CASCEXTRA", //! optional table to refer to custom track extras o2::soa::Index<>, cascdata::PosTrackExtraId, cascdata::NegTrackExtraId, cascdata::BachTrackExtraId, o2::soa::Marker<1>); -DECLARE_SOA_TABLE(KFCascExtras, "AOD", "KFCASCEXTRA", //! optional table to refer to custom track extras - o2::soa::Index<>, cascdata::PosTrackExtraId, cascdata::NegTrackExtraId, - cascdata::BachTrackExtraId, o2::soa::Marker<2>); -DECLARE_SOA_TABLE(TraCascExtras, "AOD", "TRACASCEXTRA", //! optional table to refer to custom track extras - o2::soa::Index<>, cascdata::PosTrackExtraId, cascdata::NegTrackExtraId, - cascdata::BachTrackExtraId, cascdata::StrangeTrackExtraId); +DECLARE_SOA_TABLE(StraTrackExtras, "AOD", "STRATRACKEXTRAS", //! optional table to refer to custom track extras + o2::soa::Index<>, cascdata::StrangeTrackExtraId); DECLARE_SOA_TABLE(StoredCascCores, "AOD", "CASCCORE", //! core information about decay, viable with AO2Ds or derived cascdata::Sign, cascdata::MXi, cascdata::MOmega, diff --git a/PWGLF/TableProducer/strangederivedbuilder.cxx b/PWGLF/TableProducer/strangederivedbuilder.cxx index 9d5b35066bf..0932d6deba7 100644 --- a/PWGLF/TableProducer/strangederivedbuilder.cxx +++ b/PWGLF/TableProducer/strangederivedbuilder.cxx @@ -73,8 +73,7 @@ struct strangederivedbuilder { Produces dauTrackTPCPIDs; // daughter track TPC PID Produces v0Extras; // references DauTracks from V0s Produces cascExtras; // references DauTracks from cascades - Produces kfcascExtras; // references DauTracks from KF cascades - Produces tracascExtras; // references DauTracks from tracked cascades + Produces straTrackExtras; // references DauTracks from tracked cascades //__________________________________________________ // cascade interlinks @@ -302,27 +301,9 @@ struct strangederivedbuilder { } //__________________________________________________ // populate track references - for (auto const& casc : KFCascades) { - auto bachTrack = casc.bachelor_as(); - auto v0 = casc.v0(); - auto posTrack = v0.posTrack_as(); - auto negTrack = v0.negTrack_as(); - kfcascExtras(trackMap[posTrack.globalIndex()], - trackMap[negTrack.globalIndex()], - trackMap[bachTrack.globalIndex()]); // joinable with KFCascDatas - } - //__________________________________________________ - // populate track references for (auto const& casc : TraCascades) { - auto bachTrack = casc.bachelor_as(); - auto v0 = casc.v0(); - auto posTrack = v0.posTrack_as(); - auto negTrack = v0.negTrack_as(); auto strangeTrack = casc.strangeTrack_as(); - tracascExtras(trackMap[posTrack.globalIndex()], - trackMap[negTrack.globalIndex()], - trackMap[bachTrack.globalIndex()], - trackMap[strangeTrack.globalIndex()]); // joinable with TraCascDatas + straTrackExtras(trackMap[strangeTrack.globalIndex()]); // joinable with TraCascDatas } //__________________________________________________ // circle back and populate actual DauTrackExtra table @@ -340,18 +321,16 @@ struct strangederivedbuilder { using interlinkedCascades = soa::Join; - void processCascadeInterlink(interlinkedCascades const& masterCascades, aod::CascIndices const& Cascades, aod::KFCascIndices const& KFCascades, aod::TraCascIndices const& TraCascades) + void processCascadeInterlinkTracked(interlinkedCascades const& masterCascades, aod::CascIndices const& Cascades, aod::TraCascIndices const& TraCascades) { // Standard to tracked for (auto const& c : Cascades) { - int indexTracked = -1, indexKF = -1; + int indexTracked = -1; if (c.has_cascade()) { auto cascade = c.cascade_as(); indexTracked = cascade.traCascDataId(); - indexKF = cascade.kfCascDataId(); } cascToTraRefs(indexTracked); - cascToKFRefs(indexKF); } // Tracked to standard for (auto const& c : TraCascades) { @@ -362,7 +341,20 @@ struct strangederivedbuilder { } traToCascRefs(index); } - // Tracked to KF + } + + void processCascadeInterlinkKF(interlinkedCascades const& masterCascades, aod::CascIndices const& Cascades, aod::KFCascIndices const& KFCascades) + { + // Standard to KF + for (auto const& c : Cascades) { + int indexKF = -1; + if (c.has_cascade()) { + auto cascade = c.cascade_as(); + indexKF = cascade.kfCascDataId(); + } + cascToKFRefs(indexKF); + } + // KF to standard for (auto const& c : KFCascades) { int index = -1; if (c.has_cascade()) { @@ -392,7 +384,8 @@ struct strangederivedbuilder { PROCESS_SWITCH(strangederivedbuilder, processCollisions, "Produce collisions (V0s + casc)", true); PROCESS_SWITCH(strangederivedbuilder, processTrackExtrasV0sOnly, "Produce track extra information (V0s only)", true); PROCESS_SWITCH(strangederivedbuilder, processTrackExtras, "Produce track extra information (V0s + casc)", true); - PROCESS_SWITCH(strangederivedbuilder, processCascadeInterlink, "Produce tables interconnecting cascades", true); + PROCESS_SWITCH(strangederivedbuilder, processCascadeInterlinkTracked, "Produce tables interconnecting cascades", false); + PROCESS_SWITCH(strangederivedbuilder, processCascadeInterlinkKF, "Produce tables interconnecting cascades", false); PROCESS_SWITCH(strangederivedbuilder, processSimulation, "Produce simulated information", true); }; From fe66a237f28f77208ded0a29d6176b5b83ff9da6 Mon Sep 17 00:00:00 2001 From: ALICE Builder Date: Thu, 30 Nov 2023 20:31:15 +0100 Subject: [PATCH 2/2] Please consider the following formatting changes (#194) --- PWGLF/TableProducer/strangederivedbuilder.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PWGLF/TableProducer/strangederivedbuilder.cxx b/PWGLF/TableProducer/strangederivedbuilder.cxx index 0932d6deba7..c0e7e4b3333 100644 --- a/PWGLF/TableProducer/strangederivedbuilder.cxx +++ b/PWGLF/TableProducer/strangederivedbuilder.cxx @@ -73,7 +73,7 @@ struct strangederivedbuilder { Produces dauTrackTPCPIDs; // daughter track TPC PID Produces v0Extras; // references DauTracks from V0s Produces cascExtras; // references DauTracks from cascades - Produces straTrackExtras; // references DauTracks from tracked cascades + Produces straTrackExtras; // references DauTracks from tracked cascades //__________________________________________________ // cascade interlinks