From 0a959e920f769a32e03f32bfb0c2f37034832c00 Mon Sep 17 00:00:00 2001 From: ddobrigk Date: Sat, 4 Oct 2025 20:17:40 +0200 Subject: [PATCH 1/3] [PWGLF] Fix autodetection of old format in strangeness tof pid --- PWGLF/TableProducer/Strangeness/strangenesstofpid.cxx | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/PWGLF/TableProducer/Strangeness/strangenesstofpid.cxx b/PWGLF/TableProducer/Strangeness/strangenesstofpid.cxx index 3848c92ddaa..a8cb92aeb4f 100644 --- a/PWGLF/TableProducer/Strangeness/strangenesstofpid.cxx +++ b/PWGLF/TableProducer/Strangeness/strangenesstofpid.cxx @@ -1360,12 +1360,13 @@ struct strangenesstofpid { void processDerivedData(soa::Join const& collisions, V0DerivedDatas const& V0s, CascDerivedDatas const& cascades, dauTracks const& dauTrackTable, aod::DauTrackTOFPIDs const& dauTrackTOFPIDs) { - // auto-determine if current or old generation of dauTrackTOFPIDs - if (dauTrackTOFPIDs.size() == 0) { - return; + bool isNewTOFFormat = true; // can only happen for new format + + // auto-determine if using old format + if (dauTrackTOFPIDs.size() != 0) + auto firstTOFPID = dauTrackTOFPIDs.rawIteratorAt(0); + isNewTOFFormat = firstTOFPID.straCollisionId() < 0 ? false : true; } - auto firstTOFPID = dauTrackTOFPIDs.rawIteratorAt(0); - bool isNewTOFFormat = firstTOFPID.straCollisionId() < 0 ? false : true; if (!isNewTOFFormat && calculationMethod.value > 0) { LOGF(fatal, "Using the old derived data format with the new calculation method is not viable due to lack of needed info! Crashing."); From 4d9dc9c283b8a5cb7778d579565dad7c80ec3907 Mon Sep 17 00:00:00 2001 From: ALICE Builder Date: Sat, 4 Oct 2025 20:19:58 +0200 Subject: [PATCH 2/3] Please consider the following formatting changes (#485) --- PWGLF/TableProducer/Strangeness/strangenesstofpid.cxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/PWGLF/TableProducer/Strangeness/strangenesstofpid.cxx b/PWGLF/TableProducer/Strangeness/strangenesstofpid.cxx index a8cb92aeb4f..c5809a73c44 100644 --- a/PWGLF/TableProducer/Strangeness/strangenesstofpid.cxx +++ b/PWGLF/TableProducer/Strangeness/strangenesstofpid.cxx @@ -1361,12 +1361,12 @@ struct strangenesstofpid { void processDerivedData(soa::Join const& collisions, V0DerivedDatas const& V0s, CascDerivedDatas const& cascades, dauTracks const& dauTrackTable, aod::DauTrackTOFPIDs const& dauTrackTOFPIDs) { bool isNewTOFFormat = true; // can only happen for new format - + // auto-determine if using old format if (dauTrackTOFPIDs.size() != 0) auto firstTOFPID = dauTrackTOFPIDs.rawIteratorAt(0); - isNewTOFFormat = firstTOFPID.straCollisionId() < 0 ? false : true; - } + isNewTOFFormat = firstTOFPID.straCollisionId() < 0 ? false : true; + } if (!isNewTOFFormat && calculationMethod.value > 0) { LOGF(fatal, "Using the old derived data format with the new calculation method is not viable due to lack of needed info! Crashing."); From 44d67f0f056dedeec2d046abfdc00f5fc46e4365 Mon Sep 17 00:00:00 2001 From: SCHOTTER Romain <47983209+romainschotter@users.noreply.github.com> Date: Sun, 5 Oct 2025 00:33:31 +0200 Subject: [PATCH 3/3] Fix compilation errors --- PWGLF/TableProducer/Strangeness/strangenesstofpid.cxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/PWGLF/TableProducer/Strangeness/strangenesstofpid.cxx b/PWGLF/TableProducer/Strangeness/strangenesstofpid.cxx index c5809a73c44..5d6c360bf09 100644 --- a/PWGLF/TableProducer/Strangeness/strangenesstofpid.cxx +++ b/PWGLF/TableProducer/Strangeness/strangenesstofpid.cxx @@ -1363,10 +1363,10 @@ struct strangenesstofpid { bool isNewTOFFormat = true; // can only happen for new format // auto-determine if using old format - if (dauTrackTOFPIDs.size() != 0) + if (dauTrackTOFPIDs.size() != 0) { auto firstTOFPID = dauTrackTOFPIDs.rawIteratorAt(0); - isNewTOFFormat = firstTOFPID.straCollisionId() < 0 ? false : true; - } + isNewTOFFormat = firstTOFPID.straCollisionId() < 0 ? false : true; + } if (!isNewTOFFormat && calculationMethod.value > 0) { LOGF(fatal, "Using the old derived data format with the new calculation method is not viable due to lack of needed info! Crashing.");