From bc828ffc04c9ed2ca0aeb9fb0452a4921bcef7c4 Mon Sep 17 00:00:00 2001 From: ddobrigk Date: Wed, 11 Sep 2024 20:57:38 +0200 Subject: [PATCH 1/3] Common: switch debug interlinks to foundBC --- Common/TableProducer/multiplicityExtraTable.cxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Common/TableProducer/multiplicityExtraTable.cxx b/Common/TableProducer/multiplicityExtraTable.cxx index 075b0d108ee..5015d8d9c1b 100644 --- a/Common/TableProducer/multiplicityExtraTable.cxx +++ b/Common/TableProducer/multiplicityExtraTable.cxx @@ -62,7 +62,7 @@ struct MultiplicityExtraTable { using BCsWithRun3Matchings = soa::Join; - void processBCs(BCsWithRun3Matchings const& bcs, aod::FV0As const&, aod::FT0s const&, aod::FDDs const&, aod::Zdcs const&, aod::Collisions const& collisions) + void processBCs(BCsWithRun3Matchings const& bcs, aod::FV0As const&, aod::FT0s const&, aod::FDDs const&, aod::Zdcs const&, soa::Join const& collisions) { //+-<*>-+-<*>-+-<*>-+-<*>-+-<*>-+-<*>-+-<*>-+-<*>-+-<*>-+-<*>-+ // determine saved BCs and corresponding new BC table index @@ -98,8 +98,8 @@ struct MultiplicityExtraTable { //+-<*>-+-<*>-+-<*>-+-<*>-+-<*>-+-<*>-+-<*>-+-<*>-+-<*>-+-<*>-+ // interlink: collision -> valid BC, BC -> collision for (const auto& collision : collisions) { - mult2bc(newBCindex[collision.bcId()]); - bc2multArray[collision.bcId()] = collision.globalIndex(); + mult2bc(newBCindex[collision.foundBCId()]); + bc2multArray[collision.foundBCId()] = collision.globalIndex(); } //+-<*>-+-<*>-+-<*>-+-<*>-+-<*>-+-<*>-+-<*>-+-<*>-+-<*>-+-<*>-+ From 594b5e1d220c3db29ec8e3dab1613a98d7a65a7d Mon Sep 17 00:00:00 2001 From: ddobrigk Date: Wed, 11 Sep 2024 21:11:41 +0200 Subject: [PATCH 2/3] Add flags --- Common/DataModel/Multiplicity.h | 6 ++++-- Common/TableProducer/multiplicityExtraTable.cxx | 9 +++++++-- Common/TableProducer/multiplicityTable.cxx | 2 +- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/Common/DataModel/Multiplicity.h b/Common/DataModel/Multiplicity.h index 512d08feb0b..52afad9a6a1 100644 --- a/Common/DataModel/Multiplicity.h +++ b/Common/DataModel/Multiplicity.h @@ -115,7 +115,8 @@ DECLARE_SOA_TABLE(MultsExtra, "AOD", "MULTEXTRA", //! mult::MultNTracksHasITS, mult::MultNTracksHasTPC, mult::MultNTracksHasTOF, mult::MultNTracksHasTRD, mult::MultNTracksITSOnly, mult::MultNTracksTPCOnly, mult::MultNTracksITSTPC, mult::MultAllTracksTPCOnly, mult::MultAllTracksITSTPC, - evsel::NumTracksInTimeRange); + evsel::NumTracksInTimeRange, + collision::Flags); DECLARE_SOA_TABLE(MultNeighs, "AOD", "MULTNEIGH", //! mult::TimeToPrePrevious, mult::TimeToPrevious, @@ -221,7 +222,8 @@ DECLARE_SOA_TABLE(MultBCs, "AOD", "MULTBC", //! multBC::MultBCT0triggerBits, multBC::MultBCFDDtriggerBits, multBC::MultBCTriggerMask, - multBC::MultBCColliding); + multBC::MultBCColliding, + bc::Flags); using MultBC = MultBCs::iterator; // crosslinks diff --git a/Common/TableProducer/multiplicityExtraTable.cxx b/Common/TableProducer/multiplicityExtraTable.cxx index 5015d8d9c1b..983c5eed323 100644 --- a/Common/TableProducer/multiplicityExtraTable.cxx +++ b/Common/TableProducer/multiplicityExtraTable.cxx @@ -62,7 +62,7 @@ struct MultiplicityExtraTable { using BCsWithRun3Matchings = soa::Join; - void processBCs(BCsWithRun3Matchings const& bcs, aod::FV0As const&, aod::FT0s const&, aod::FDDs const&, aod::Zdcs const&, soa::Join const& collisions) + void processBCs(soa::Join const& bcs, aod::FV0As const&, aod::FT0s const&, aod::FDDs const&, aod::Zdcs const&, soa::Join const& collisions) { //+-<*>-+-<*>-+-<*>-+-<*>-+-<*>-+-<*>-+-<*>-+-<*>-+-<*>-+-<*>-+ // determine saved BCs and corresponding new BC table index @@ -213,7 +213,12 @@ struct MultiplicityExtraTable { } bc2mult(bc2multArray[bc.globalIndex()]); - multBC(multFT0A, multFT0C, posZFT0, posZFT0valid, multFV0A, multFDDA, multFDDC, multZNA, multZNC, multZEM1, multZEM2, multZPA, multZPC, Tvx, isFV0OrA, multFV0TriggerBits, multFT0TriggerBits, multFDDTriggerBits, multBCTriggerMask, collidingBC); + multBC( + multFT0A, multFT0C, posZFT0, posZFT0valid, multFV0A, + multFDDA, multFDDC, multZNA, multZNC, multZEM1, + multZEM2, multZPA, multZPC, Tvx, isFV0OrA, + multFV0TriggerBits, multFT0TriggerBits, multFDDTriggerBits, multBCTriggerMask, collidingBC, + bc.flags()); } } diff --git a/Common/TableProducer/multiplicityTable.cxx b/Common/TableProducer/multiplicityTable.cxx index e16fee97298..6ce9f52cfd2 100644 --- a/Common/TableProducer/multiplicityTable.cxx +++ b/Common/TableProducer/multiplicityTable.cxx @@ -569,7 +569,7 @@ struct MultiplicityTable { tableExtra(collision.numContrib(), collision.chi2(), collision.collisionTimeRes(), mRunNumber, collision.posZ(), collision.sel8(), nHasITS, nHasTPC, nHasTOF, nHasTRD, nITSonly, nTPConly, nITSTPC, - nAllTracksTPCOnly, nAllTracksITSTPC, collision.trackOccupancyInTimeRange()); + nAllTracksTPCOnly, nAllTracksITSTPC, collision.trackOccupancyInTimeRange(), collision.flags()); } break; case kMultSelections: // Multiplicity selections { From 45d06767e149d82cc61088e5cbd07a3ff4fdff15 Mon Sep 17 00:00:00 2001 From: ALICE Builder Date: Wed, 11 Sep 2024 21:13:58 +0200 Subject: [PATCH 3/3] Please consider the following formatting changes (#343) --- Common/DataModel/Multiplicity.h | 6 +++--- Common/TableProducer/multiplicityExtraTable.cxx | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Common/DataModel/Multiplicity.h b/Common/DataModel/Multiplicity.h index 52afad9a6a1..ee56ebfedcb 100644 --- a/Common/DataModel/Multiplicity.h +++ b/Common/DataModel/Multiplicity.h @@ -115,7 +115,7 @@ DECLARE_SOA_TABLE(MultsExtra, "AOD", "MULTEXTRA", //! mult::MultNTracksHasITS, mult::MultNTracksHasTPC, mult::MultNTracksHasTOF, mult::MultNTracksHasTRD, mult::MultNTracksITSOnly, mult::MultNTracksTPCOnly, mult::MultNTracksITSTPC, mult::MultAllTracksTPCOnly, mult::MultAllTracksITSTPC, - evsel::NumTracksInTimeRange, + evsel::NumTracksInTimeRange, collision::Flags); DECLARE_SOA_TABLE(MultNeighs, "AOD", "MULTNEIGH", //! @@ -222,8 +222,8 @@ DECLARE_SOA_TABLE(MultBCs, "AOD", "MULTBC", //! multBC::MultBCT0triggerBits, multBC::MultBCFDDtriggerBits, multBC::MultBCTriggerMask, - multBC::MultBCColliding, - bc::Flags); + multBC::MultBCColliding, + bc::Flags); using MultBC = MultBCs::iterator; // crosslinks diff --git a/Common/TableProducer/multiplicityExtraTable.cxx b/Common/TableProducer/multiplicityExtraTable.cxx index 983c5eed323..7a77faa6784 100644 --- a/Common/TableProducer/multiplicityExtraTable.cxx +++ b/Common/TableProducer/multiplicityExtraTable.cxx @@ -214,10 +214,10 @@ struct MultiplicityExtraTable { bc2mult(bc2multArray[bc.globalIndex()]); multBC( - multFT0A, multFT0C, posZFT0, posZFT0valid, multFV0A, - multFDDA, multFDDC, multZNA, multZNC, multZEM1, - multZEM2, multZPA, multZPC, Tvx, isFV0OrA, - multFV0TriggerBits, multFT0TriggerBits, multFDDTriggerBits, multBCTriggerMask, collidingBC, + multFT0A, multFT0C, posZFT0, posZFT0valid, multFV0A, + multFDDA, multFDDC, multZNA, multZNC, multZEM1, + multZEM2, multZPA, multZPC, Tvx, isFV0OrA, + multFV0TriggerBits, multFT0TriggerBits, multFDDTriggerBits, multBCTriggerMask, collidingBC, bc.flags()); } }