From 8f8f90a900040ac6cc779320bc6d66dc5b24e4f8 Mon Sep 17 00:00:00 2001 From: SCHOTTER Romain <47983209+romainschotter@users.noreply.github.com> Date: Fri, 5 Jun 2026 18:15:54 +0200 Subject: [PATCH 1/3] Add process function in straevselextrasconverter.cxx --- .../Converters/straevselextrasconverter.cxx | 47 ++++++++++++++++++- 1 file changed, 46 insertions(+), 1 deletion(-) diff --git a/PWGLF/TableProducer/Strangeness/Converters/straevselextrasconverter.cxx b/PWGLF/TableProducer/Strangeness/Converters/straevselextrasconverter.cxx index 27e7d930ebc..863a112a014 100644 --- a/PWGLF/TableProducer/Strangeness/Converters/straevselextrasconverter.cxx +++ b/PWGLF/TableProducer/Strangeness/Converters/straevselextrasconverter.cxx @@ -25,8 +25,17 @@ using namespace o2::aod::evsel; struct straevselextrasconverter { Produces straEvSelExtras_001; - void process(soa::Join const& straEvSels_005) + void init(InitContext&) { + LOGF(info, "Initializing now: cross-checking correctness..."); + if (doprocessAll + doprocessStraEvSelsOnly > 1) { + LOGF(fatal, "You have enabled more than one process function. Please check your configuration! Aborting now."); + } + } + + void processAll(soa::Join const& straEvSels_005) + { + straEvSelExtras_001.reserve(straEvSels_005.size()); for (auto& values : straEvSels_005) { straEvSelExtras_001(values.multZNA(), values.multZNC(), @@ -57,6 +66,42 @@ struct straevselextrasconverter { values.energyCommonZNC()); } } + + void processStraEvSelsOnly(aod::StraEvSels_005 const& straEvSels_005) + { + straEvSelExtras_001.reserve(straEvSels_005.size()); + for (auto& values : straEvSels_005) { + straEvSelExtras_001(values.multZNA(), + values.multZNC(), + values.multZEM1(), + values.multZEM2(), + values.multZPA(), + values.multZPC(), + values.multNTracksITSTPC(), + values.multAllTracksTPCOnly(), + values.multAllTracksITSTPC(), + values.trackOccupancyInTimeRange(), + values.ft0cOccupancyInTimeRange(), + -999., // dummy timeFDDA, + -999., // dummy timeFDDC, + -999., // dummy timeFV0A, + -999., // dummy timeFT0A, + -999., // dummy timeFT0C, + 0, // dummy triggerMaskFT0, + values.gapSide(), + values.totalFT0AmplitudeA(), + values.totalFT0AmplitudeC(), + values.totalFV0AmplitudeA(), + values.totalFDDAmplitudeA(), + values.totalFDDAmplitudeC(), + -999., // dummy timeZNA, + -999., // dummy timeZNC, + values.energyCommonZNA(), + values.energyCommonZNC()); + } + } + PROCESS_SWITCH(straevselextrasconverter, processAll, "Store StraEvSels005 and StraEvSelExtras000 into StraEvSelExtras001", true); + PROCESS_SWITCH(straevselextrasconverter, processStraEvSelsOnly, "Store only StraEvSels005 into StraEvSelExtras001. Other columns are set to dummy values", false); }; WorkflowSpec defineDataProcessing(ConfigContext const& cfgc) From 3c3f42d260eda670b0f51d9726ec7dbf2d37d512 Mon Sep 17 00:00:00 2001 From: SCHOTTER Romain <47983209+romainschotter@users.noreply.github.com> Date: Fri, 5 Jun 2026 18:17:52 +0200 Subject: [PATCH 2/3] Update task --- .../Converters/straevselextrasconverter.cxx | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/PWGLF/TableProducer/Strangeness/Converters/straevselextrasconverter.cxx b/PWGLF/TableProducer/Strangeness/Converters/straevselextrasconverter.cxx index 863a112a014..531a196d616 100644 --- a/PWGLF/TableProducer/Strangeness/Converters/straevselextrasconverter.cxx +++ b/PWGLF/TableProducer/Strangeness/Converters/straevselextrasconverter.cxx @@ -8,6 +8,15 @@ // In applying this license CERN does not waive the privileges and immunities // granted to it by virtue of its status as an Intergovernmental Organization // or submit itself to any jurisdiction. +// +/// \file straevselextrasconverter.cxx +/// \brief Converts straevselsextrasconverter1 converts StraEvSelExtras_000 into StraEvSelExtras_001 +/// +/// \author David Dobrigkeit Chinellato , Austrian Academy of Sciences & MBI +/// \author Romain Schotter , Austrian Academy of Sciences & MBI +// +//__________________________________________________ +// #include "PWGLF/DataModel/LFStrangenessTables.h" @@ -21,7 +30,7 @@ using namespace o2; using namespace o2::framework; using namespace o2::aod::evsel; -// Converts straevselsextrasconverter1 converts StraEvSelExtras_000 into StraEvSelExtras_001 + struct straevselextrasconverter { Produces straEvSelExtras_001; @@ -36,7 +45,7 @@ struct straevselextrasconverter { void processAll(soa::Join const& straEvSels_005) { straEvSelExtras_001.reserve(straEvSels_005.size()); - for (auto& values : straEvSels_005) { + for (const auto& values : straEvSels_005) { straEvSelExtras_001(values.multZNA(), values.multZNC(), values.multZEM1(), @@ -70,7 +79,7 @@ struct straevselextrasconverter { void processStraEvSelsOnly(aod::StraEvSels_005 const& straEvSels_005) { straEvSelExtras_001.reserve(straEvSels_005.size()); - for (auto& values : straEvSels_005) { + for (const auto& values : straEvSels_005) { straEvSelExtras_001(values.multZNA(), values.multZNC(), values.multZEM1(), From e2e218a4c42148d9396c7f2776ccece6fc350650 Mon Sep 17 00:00:00 2001 From: ALICE Builder Date: Fri, 5 Jun 2026 18:19:19 +0200 Subject: [PATCH 3/3] Please consider the following formatting changes to #16542 (#16543) --- .../Converters/straevselextrasconverter.cxx | 29 +++++++++---------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/PWGLF/TableProducer/Strangeness/Converters/straevselextrasconverter.cxx b/PWGLF/TableProducer/Strangeness/Converters/straevselextrasconverter.cxx index 531a196d616..d182e385506 100644 --- a/PWGLF/TableProducer/Strangeness/Converters/straevselextrasconverter.cxx +++ b/PWGLF/TableProducer/Strangeness/Converters/straevselextrasconverter.cxx @@ -20,24 +20,23 @@ #include "PWGLF/DataModel/LFStrangenessTables.h" -#include "CCDB/BasicCCDBManager.h" -#include "DataFormatsParameters/AggregatedRunInfo.h" -#include "Framework/AnalysisDataModel.h" -#include "Framework/AnalysisTask.h" -#include "Framework/runDataProcessing.h" +#include +#include +#include +#include +#include using namespace o2; using namespace o2::framework; using namespace o2::aod::evsel; - struct straevselextrasconverter { Produces straEvSelExtras_001; void init(InitContext&) { LOGF(info, "Initializing now: cross-checking correctness..."); - if (doprocessAll + doprocessStraEvSelsOnly > 1) { + if (doprocessAll + doprocessStraEvSelsOnly > 1) { LOGF(fatal, "You have enabled more than one process function. Please check your configuration! Aborting now."); } } @@ -91,20 +90,20 @@ struct straevselextrasconverter { values.multAllTracksITSTPC(), values.trackOccupancyInTimeRange(), values.ft0cOccupancyInTimeRange(), - -999., // dummy timeFDDA, - -999., // dummy timeFDDC, - -999., // dummy timeFV0A, - -999., // dummy timeFT0A, - -999., // dummy timeFT0C, - 0, // dummy triggerMaskFT0, + -999., // dummy timeFDDA, + -999., // dummy timeFDDC, + -999., // dummy timeFV0A, + -999., // dummy timeFT0A, + -999., // dummy timeFT0C, + 0, // dummy triggerMaskFT0, values.gapSide(), values.totalFT0AmplitudeA(), values.totalFT0AmplitudeC(), values.totalFV0AmplitudeA(), values.totalFDDAmplitudeA(), values.totalFDDAmplitudeC(), - -999., // dummy timeZNA, - -999., // dummy timeZNC, + -999., // dummy timeZNA, + -999., // dummy timeZNC, values.energyCommonZNA(), values.energyCommonZNC()); }