From 14198a07fee5a23d5d14ecaf863f3febe3e7b4f2 Mon Sep 17 00:00:00 2001 From: Luigi Dello Stritto Date: Thu, 21 Nov 2024 13:11:58 +0100 Subject: [PATCH 1/4] Add MC T0M centrality to the Lc derived data --- PWGHF/DataModel/DerivedTables.h | 2 ++ PWGHF/TableProducer/derivedDataCreatorLcToPKPi.cxx | 8 ++++++-- PWGJE/Core/JetHFUtilities.h | 4 +++- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/PWGHF/DataModel/DerivedTables.h b/PWGHF/DataModel/DerivedTables.h index 88f570b47c0..30d2f67e08d 100644 --- a/PWGHF/DataModel/DerivedTables.h +++ b/PWGHF/DataModel/DerivedTables.h @@ -25,6 +25,7 @@ #include "PWGHF/DataModel/CandidateReconstructionTables.h" #include "PWGHF/DataModel/CandidateSelectionTables.h" +#include "PWGLF/DataModel/mcCentrality.h" namespace o2::aod { @@ -194,6 +195,7 @@ DECLARE_SOA_TABLE_STAGED(Hf3PMcCollBases, "HF3PMCCOLLBASE", //! Table with basic mccollision::PosX, mccollision::PosY, mccollision::PosZ, + cent::CentFT0M, o2::soa::Marker); using Hf3PMcCollBase = Hf3PMcCollBases::iterator; diff --git a/PWGHF/TableProducer/derivedDataCreatorLcToPKPi.cxx b/PWGHF/TableProducer/derivedDataCreatorLcToPKPi.cxx index 5827f26a1aa..de779b23a68 100644 --- a/PWGHF/TableProducer/derivedDataCreatorLcToPKPi.cxx +++ b/PWGHF/TableProducer/derivedDataCreatorLcToPKPi.cxx @@ -33,6 +33,8 @@ #include "PWGHF/DataModel/DerivedTables.h" #include "PWGHF/Utils/utilsDerivedData.h" +#include "PWGLF/DataModel/mcCentrality.h" + using namespace o2; using namespace o2::framework; using namespace o2::framework::expressions; @@ -85,13 +87,14 @@ struct HfDerivedDataCreatorLcToPKPi { using CollisionsWCentMult = soa::Join; using CollisionsWMcCentMult = soa::Join; + using McCollisionsWCentMult = soa::Join; using TracksWPid = soa::Join; using SelectedCandidates = soa::Filtered>; using SelectedCandidatesMc = soa::Filtered>; using SelectedCandidatesMl = soa::Filtered>; using SelectedCandidatesMcMl = soa::Filtered>; using MatchedGenCandidatesMc = soa::Filtered>; - using TypeMcCollisions = aod::McCollisions; + using TypeMcCollisions = McCollisionsWCentMult; Filter filterSelectCandidates = aod::hf_sel_candidate_lc::isSelLcToPKPi >= 1 || aod::hf_sel_candidate_lc::isSelLcToPiKP >= 1; Filter filterMcGenMatching = nabs(aod::hf_cand_3prong::flagMcMatchGen) == static_cast(BIT(aod::hf_cand_3prong::DecayType::LcToPKPi)); @@ -159,7 +162,8 @@ struct HfDerivedDataCreatorLcToPKPi { rowMcCollBase( mcCollision.posX(), mcCollision.posY(), - mcCollision.posZ()); + mcCollision.posZ(), + mcCollision.centFT0M()); } if (fillMcCollId) { rowMcCollId( diff --git a/PWGJE/Core/JetHFUtilities.h b/PWGJE/Core/JetHFUtilities.h index 39ce84a879f..19cf612f8ee 100644 --- a/PWGJE/Core/JetHFUtilities.h +++ b/PWGJE/Core/JetHFUtilities.h @@ -44,6 +44,8 @@ #include "PWGJE/Core/JetFinder.h" #include "PWGJE/DataModel/Jet.h" +#include "PWGLF/DataModel/mcCentrality.h" + namespace jethfutilities { @@ -549,7 +551,7 @@ void fillD0McCollisionTable(T const& mcCollision, U& D0McCollisionTable, int32_t template void fillLcMcCollisionTable(T const& mcCollision, U& LcMcCollisionTable, int32_t& LcMcCollisionTableIndex) { - LcMcCollisionTable(mcCollision.posX(), mcCollision.posY(), mcCollision.posZ()); + LcMcCollisionTable(mcCollision.posX(), mcCollision.posY(), mcCollision.posZ(), mcCollision.centFT0M()); LcMcCollisionTableIndex = LcMcCollisionTable.lastIndex(); } From a5d3879ddfa52ba7d0231b5095a2c3e8cb97633e Mon Sep 17 00:00:00 2001 From: Luigi Dello Stritto Date: Thu, 21 Nov 2024 13:28:15 +0100 Subject: [PATCH 2/4] fix --- PWGHF/DataModel/DerivedTables.h | 3 ++- PWGHF/TableProducer/derivedDataCreatorLcToPKPi.cxx | 6 +++--- PWGJE/Core/JetHFUtilities.h | 3 ++- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/PWGHF/DataModel/DerivedTables.h b/PWGHF/DataModel/DerivedTables.h index 30d2f67e08d..441d412ea2f 100644 --- a/PWGHF/DataModel/DerivedTables.h +++ b/PWGHF/DataModel/DerivedTables.h @@ -23,9 +23,10 @@ #include "Common/Core/RecoDecay.h" +#include "PWGLF/DataModel/mcCentrality.h" + #include "PWGHF/DataModel/CandidateReconstructionTables.h" #include "PWGHF/DataModel/CandidateSelectionTables.h" -#include "PWGLF/DataModel/mcCentrality.h" namespace o2::aod { diff --git a/PWGHF/TableProducer/derivedDataCreatorLcToPKPi.cxx b/PWGHF/TableProducer/derivedDataCreatorLcToPKPi.cxx index de779b23a68..512d6f3af09 100644 --- a/PWGHF/TableProducer/derivedDataCreatorLcToPKPi.cxx +++ b/PWGHF/TableProducer/derivedDataCreatorLcToPKPi.cxx @@ -27,13 +27,14 @@ #include "Common/DataModel/Centrality.h" #include "Common/DataModel/Multiplicity.h" +#include "PWGLF/DataModel/mcCentrality.h" + #include "PWGHF/Core/HfHelper.h" #include "PWGHF/DataModel/CandidateReconstructionTables.h" #include "PWGHF/DataModel/CandidateSelectionTables.h" #include "PWGHF/DataModel/DerivedTables.h" #include "PWGHF/Utils/utilsDerivedData.h" -#include "PWGLF/DataModel/mcCentrality.h" using namespace o2; using namespace o2::framework; @@ -87,14 +88,13 @@ struct HfDerivedDataCreatorLcToPKPi { using CollisionsWCentMult = soa::Join; using CollisionsWMcCentMult = soa::Join; - using McCollisionsWCentMult = soa::Join; using TracksWPid = soa::Join; using SelectedCandidates = soa::Filtered>; using SelectedCandidatesMc = soa::Filtered>; using SelectedCandidatesMl = soa::Filtered>; using SelectedCandidatesMcMl = soa::Filtered>; using MatchedGenCandidatesMc = soa::Filtered>; - using TypeMcCollisions = McCollisionsWCentMult; + using TypeMcCollisions = soa::Join; Filter filterSelectCandidates = aod::hf_sel_candidate_lc::isSelLcToPKPi >= 1 || aod::hf_sel_candidate_lc::isSelLcToPiKP >= 1; Filter filterMcGenMatching = nabs(aod::hf_cand_3prong::flagMcMatchGen) == static_cast(BIT(aod::hf_cand_3prong::DecayType::LcToPKPi)); diff --git a/PWGJE/Core/JetHFUtilities.h b/PWGJE/Core/JetHFUtilities.h index 19cf612f8ee..772401737a2 100644 --- a/PWGJE/Core/JetHFUtilities.h +++ b/PWGJE/Core/JetHFUtilities.h @@ -35,6 +35,8 @@ #include "Common/DataModel/TrackSelectionTables.h" #include "PWGJE/DataModel/EMCALClusters.h" +#include "PWGLF/DataModel/mcCentrality.h" + #include "PWGHF/DataModel/CandidateReconstructionTables.h" #include "PWGHF/DataModel/CandidateSelectionTables.h" #include "PWGHF/DataModel/DerivedTables.h" @@ -44,7 +46,6 @@ #include "PWGJE/Core/JetFinder.h" #include "PWGJE/DataModel/Jet.h" -#include "PWGLF/DataModel/mcCentrality.h" namespace jethfutilities { From a5eaf60c6ac561fcc15e160458712d79a2f457b5 Mon Sep 17 00:00:00 2001 From: ALICE Action Bot Date: Thu, 21 Nov 2024 12:28:58 +0000 Subject: [PATCH 3/4] Please consider the following formatting changes --- PWGHF/TableProducer/derivedDataCreatorLcToPKPi.cxx | 1 - PWGJE/Core/JetHFUtilities.h | 1 - 2 files changed, 2 deletions(-) diff --git a/PWGHF/TableProducer/derivedDataCreatorLcToPKPi.cxx b/PWGHF/TableProducer/derivedDataCreatorLcToPKPi.cxx index 512d6f3af09..e16c498cd11 100644 --- a/PWGHF/TableProducer/derivedDataCreatorLcToPKPi.cxx +++ b/PWGHF/TableProducer/derivedDataCreatorLcToPKPi.cxx @@ -35,7 +35,6 @@ #include "PWGHF/DataModel/DerivedTables.h" #include "PWGHF/Utils/utilsDerivedData.h" - using namespace o2; using namespace o2::framework; using namespace o2::framework::expressions; diff --git a/PWGJE/Core/JetHFUtilities.h b/PWGJE/Core/JetHFUtilities.h index 772401737a2..f140d307a1d 100644 --- a/PWGJE/Core/JetHFUtilities.h +++ b/PWGJE/Core/JetHFUtilities.h @@ -46,7 +46,6 @@ #include "PWGJE/Core/JetFinder.h" #include "PWGJE/DataModel/Jet.h" - namespace jethfutilities { From d0ca9cdadf90fcf493ca6cd5f3a8a800dd38902a Mon Sep 17 00:00:00 2001 From: Luigi Dello Stritto Date: Thu, 21 Nov 2024 13:47:49 +0100 Subject: [PATCH 4/4] fix --- PWGJE/Core/JetHFUtilities.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/PWGJE/Core/JetHFUtilities.h b/PWGJE/Core/JetHFUtilities.h index f140d307a1d..d76c8d19121 100644 --- a/PWGJE/Core/JetHFUtilities.h +++ b/PWGJE/Core/JetHFUtilities.h @@ -35,8 +35,6 @@ #include "Common/DataModel/TrackSelectionTables.h" #include "PWGJE/DataModel/EMCALClusters.h" -#include "PWGLF/DataModel/mcCentrality.h" - #include "PWGHF/DataModel/CandidateReconstructionTables.h" #include "PWGHF/DataModel/CandidateSelectionTables.h" #include "PWGHF/DataModel/DerivedTables.h"