From 260d89f71efaaa0fdea6b523ca11b7dc42b9021b Mon Sep 17 00:00:00 2001 From: romainschotter Date: Wed, 30 Jul 2025 12:06:28 +0200 Subject: [PATCH 1/3] Switch return calls to continue calls when moving TPC only tracks --- PWGLF/TableProducer/Strangeness/strangenessbuilder.cxx | 10 ++++++---- PWGLF/Utils/strangenessBuilderModule.h | 10 ++++++---- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/PWGLF/TableProducer/Strangeness/strangenessbuilder.cxx b/PWGLF/TableProducer/Strangeness/strangenessbuilder.cxx index bca1b08b07f..c7a47e53517 100644 --- a/PWGLF/TableProducer/Strangeness/strangenessbuilder.cxx +++ b/PWGLF/TableProducer/Strangeness/strangenessbuilder.cxx @@ -905,7 +905,7 @@ struct StrangenessBuilder { posTrackPar.setPID(o2::track::PID::Electron); negTrackPar.setPID(o2::track::PID::Electron); if (!mVDriftMgr.moveTPCTrack(collision, pTrack, posTrackPar)) { - continue; + continue; } } if (isNegTPCOnly) { @@ -913,7 +913,7 @@ struct StrangenessBuilder { posTrackPar.setPID(o2::track::PID::Electron); negTrackPar.setPID(o2::track::PID::Electron); if (!mVDriftMgr.moveTPCTrack(collision, nTrack, negTrackPar)) { - continue; + continue; } } } // end TPC drift treatment @@ -1648,7 +1648,8 @@ struct StrangenessBuilder { auto const& collision = collisions.rawIteratorAt(v0.collisionId); if (!mVDriftMgr.moveTPCTrack(collision, posTrack, posTrackPar)) { - return; + products.v0dataLink(-1, -1); + continue; } } @@ -1660,7 +1661,8 @@ struct StrangenessBuilder { auto const& collision = collisions.rawIteratorAt(v0.collisionId); if (!mVDriftMgr.moveTPCTrack(collision, negTrack, negTrackPar)) { - return; + products.v0dataLink(-1, -1); + continue; } } } diff --git a/PWGLF/Utils/strangenessBuilderModule.h b/PWGLF/Utils/strangenessBuilderModule.h index 41d995fbb44..cad37cfc44e 100644 --- a/PWGLF/Utils/strangenessBuilderModule.h +++ b/PWGLF/Utils/strangenessBuilderModule.h @@ -894,7 +894,7 @@ class BuilderModule posTrackPar.setPID(o2::track::PID::Electron); negTrackPar.setPID(o2::track::PID::Electron); if (!mVDriftMgr.moveTPCTrack(collision, pTrack, posTrackPar)) { - return; + continue; } } if (isNegTPCOnly) { @@ -902,7 +902,7 @@ class BuilderModule posTrackPar.setPID(o2::track::PID::Electron); negTrackPar.setPID(o2::track::PID::Electron); if (!mVDriftMgr.moveTPCTrack(collision, nTrack, negTrackPar)) { - return; + continue; } } } // end TPC drift treatment @@ -1370,7 +1370,8 @@ class BuilderModule auto const& collision = collisions.rawIteratorAt(v0.collisionId); if (!mVDriftMgr.moveTPCTrack(collision, posTrack, posTrackPar)) { - return; + products.v0dataLink(-1, -1); + continue; } } @@ -1382,7 +1383,8 @@ class BuilderModule auto const& collision = collisions.rawIteratorAt(v0.collisionId); if (!mVDriftMgr.moveTPCTrack(collision, negTrack, negTrackPar)) { - return; + products.v0dataLink(-1, -1); + continue; } } } From da2f20ca8047beb83073a5ceaf0ef48371d652a2 Mon Sep 17 00:00:00 2001 From: romainschotter Date: Wed, 30 Jul 2025 12:09:16 +0200 Subject: [PATCH 2/3] Fix V0DataLink filling --- PWGLF/TableProducer/Strangeness/strangenessbuilder.cxx | 2 ++ PWGLF/Utils/strangenessBuilderModule.h | 2 ++ 2 files changed, 4 insertions(+) diff --git a/PWGLF/TableProducer/Strangeness/strangenessbuilder.cxx b/PWGLF/TableProducer/Strangeness/strangenessbuilder.cxx index c7a47e53517..2f25840dedd 100644 --- a/PWGLF/TableProducer/Strangeness/strangenessbuilder.cxx +++ b/PWGLF/TableProducer/Strangeness/strangenessbuilder.cxx @@ -1927,6 +1927,8 @@ struct StrangenessBuilder { } } // enabled tables check } // constexpr requires check + } else { + products.v0dataLink(-1, -1); } } diff --git a/PWGLF/Utils/strangenessBuilderModule.h b/PWGLF/Utils/strangenessBuilderModule.h index cad37cfc44e..870a4d753c9 100644 --- a/PWGLF/Utils/strangenessBuilderModule.h +++ b/PWGLF/Utils/strangenessBuilderModule.h @@ -1649,6 +1649,8 @@ class BuilderModule } } // enabled tables check } // constexpr requires check + } else { + products.v0dataLink(-1, -1); } } From bc02a87c24a72d06239de83ec9647352d3ef5de0 Mon Sep 17 00:00:00 2001 From: ALICE Action Bot Date: Wed, 30 Jul 2025 10:14:48 +0000 Subject: [PATCH 3/3] Please consider the following formatting changes --- PWGLF/TableProducer/Strangeness/strangenessbuilder.cxx | 8 ++++---- PWGLF/Utils/strangenessBuilderModule.h | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/PWGLF/TableProducer/Strangeness/strangenessbuilder.cxx b/PWGLF/TableProducer/Strangeness/strangenessbuilder.cxx index 2f25840dedd..d7012626b4f 100644 --- a/PWGLF/TableProducer/Strangeness/strangenessbuilder.cxx +++ b/PWGLF/TableProducer/Strangeness/strangenessbuilder.cxx @@ -905,7 +905,7 @@ struct StrangenessBuilder { posTrackPar.setPID(o2::track::PID::Electron); negTrackPar.setPID(o2::track::PID::Electron); if (!mVDriftMgr.moveTPCTrack(collision, pTrack, posTrackPar)) { - continue; + continue; } } if (isNegTPCOnly) { @@ -913,7 +913,7 @@ struct StrangenessBuilder { posTrackPar.setPID(o2::track::PID::Electron); negTrackPar.setPID(o2::track::PID::Electron); if (!mVDriftMgr.moveTPCTrack(collision, nTrack, negTrackPar)) { - continue; + continue; } } } // end TPC drift treatment @@ -1648,7 +1648,7 @@ struct StrangenessBuilder { auto const& collision = collisions.rawIteratorAt(v0.collisionId); if (!mVDriftMgr.moveTPCTrack(collision, posTrack, posTrackPar)) { - products.v0dataLink(-1, -1); + products.v0dataLink(-1, -1); continue; } } @@ -1661,7 +1661,7 @@ struct StrangenessBuilder { auto const& collision = collisions.rawIteratorAt(v0.collisionId); if (!mVDriftMgr.moveTPCTrack(collision, negTrack, negTrackPar)) { - products.v0dataLink(-1, -1); + products.v0dataLink(-1, -1); continue; } } diff --git a/PWGLF/Utils/strangenessBuilderModule.h b/PWGLF/Utils/strangenessBuilderModule.h index 870a4d753c9..4673be69592 100644 --- a/PWGLF/Utils/strangenessBuilderModule.h +++ b/PWGLF/Utils/strangenessBuilderModule.h @@ -1370,7 +1370,7 @@ class BuilderModule auto const& collision = collisions.rawIteratorAt(v0.collisionId); if (!mVDriftMgr.moveTPCTrack(collision, posTrack, posTrackPar)) { - products.v0dataLink(-1, -1); + products.v0dataLink(-1, -1); continue; } } @@ -1383,7 +1383,7 @@ class BuilderModule auto const& collision = collisions.rawIteratorAt(v0.collisionId); if (!mVDriftMgr.moveTPCTrack(collision, negTrack, negTrackPar)) { - products.v0dataLink(-1, -1); + products.v0dataLink(-1, -1); continue; } }