From 2e76908acbbe03e22aeff6e3f39f55d783da6143 Mon Sep 17 00:00:00 2001 From: ALICE Action Bot Date: Tue, 14 Jul 2026 20:37:26 +0000 Subject: [PATCH] Please consider the following formatting changes --- PWGLF/DataModel/LFStrangenessTables.h | 2 +- .../stradautrackstofpidconverter4.cxx | 6 ++-- .../Strangeness/strangederivedbuilder.cxx | 29 +++++++++---------- .../Strangeness/strangenesstofpid.cxx | 2 +- .../derivedlambdakzeroanalysis.cxx | 2 +- PWGLF/Utils/strangenessBuilderModule.h | 16 +++++----- 6 files changed, 28 insertions(+), 29 deletions(-) diff --git a/PWGLF/DataModel/LFStrangenessTables.h b/PWGLF/DataModel/LFStrangenessTables.h index 762cddc8eea..37fa6facf54 100644 --- a/PWGLF/DataModel/LFStrangenessTables.h +++ b/PWGLF/DataModel/LFStrangenessTables.h @@ -47,7 +47,7 @@ DECLARE_SOA_TABLE(StraOrigins, "AOD", "STRAORIGIN", //! Table which contains the // for keeping track of the number of selected collisions namespace straselections { -DECLARE_SOA_COLUMN(TotalNbrOfCollisions, totalNbrOfCollisions, int); //! total number of analysed collisions +DECLARE_SOA_COLUMN(TotalNbrOfCollisions, totalNbrOfCollisions, int); //! total number of analysed collisions DECLARE_SOA_COLUMN(TotalNbrOfSelCollisions, totalNbrOfSelCollisions, int); //! total number of selected collisions } // namespace straselections diff --git a/PWGLF/TableProducer/Strangeness/Converters/stradautrackstofpidconverter4.cxx b/PWGLF/TableProducer/Strangeness/Converters/stradautrackstofpidconverter4.cxx index 0d2bede238b..b94dd91714d 100644 --- a/PWGLF/TableProducer/Strangeness/Converters/stradautrackstofpidconverter4.cxx +++ b/PWGLF/TableProducer/Strangeness/Converters/stradautrackstofpidconverter4.cxx @@ -18,9 +18,9 @@ #include "PWGLF/DataModel/LFStrangenessPIDTables.h" #include "PWGLF/DataModel/LFStrangenessTables.h" -#include "Framework/AnalysisDataModel.h" -#include "Framework/AnalysisTask.h" -#include "Framework/runDataProcessing.h" +#include +#include +#include using namespace o2; using namespace o2::framework; diff --git a/PWGLF/TableProducer/Strangeness/strangederivedbuilder.cxx b/PWGLF/TableProducer/Strangeness/strangederivedbuilder.cxx index 16f3a406d30..e59dc55fbf8 100644 --- a/PWGLF/TableProducer/Strangeness/strangederivedbuilder.cxx +++ b/PWGLF/TableProducer/Strangeness/strangederivedbuilder.cxx @@ -25,6 +25,8 @@ #include "PWGLF/DataModel/SPCalibrationTables.h" #include "PWGUD/DataModel/UDTables.h" +#include "Common/CCDB/EventSelectionParams.h" +#include "Common/CCDB/RCTSelectionFlags.h" #include "Common/DataModel/Centrality.h" #include "Common/DataModel/EventSelection.h" #include "Common/DataModel/McCollisionExtra.h" @@ -33,8 +35,6 @@ #include "Common/DataModel/PIDResponseTPC.h" #include "Common/DataModel/Qvectors.h" #include "Common/DataModel/TrackSelectionTables.h" -#include "Common/CCDB/EventSelectionParams.h" -#include "Common/CCDB/RCTSelectionFlags.h" #include #include @@ -195,15 +195,15 @@ struct strangederivedbuilder { Configurable inheritEvtSelFromTask{"inheritEvtSelFromTask", "propagation-service", "Inherit event selection parameters from which task?"}; Configurable inheritEvtSelFromTaskCfgGroup{"inheritEvtSelFromTaskCfgGroup", "eventSelectOpts", "What is the configurable group prefix? If none, put nothing"}; Configurable inheritEvtSelFromTaskVerbose{"inheritEvtSelFromTaskVerbose", false, "Enable verbose mode on the getTaskOption utility"}; - bool fillOnlySelectedCollisions = false; // Fill only tables for selected collisions? - bool requireTriggerTVX = false; // require FT0 vertex (acceptable FT0C-FT0A time difference) at trigger level (Run 3 only) - bool rejectITSROFBorder = false; // reject events at ITS ROF border (Run 3 only) - bool rejectTFBorder = false; // reject events at TF border (Run 3 only) - bool rejectSameBunchPileup = false; // reject collisions in case of pileup with another collision in the same foundBC (Run 3 only) - float maxZVtxPosition = 10.; // max Z vtx position (cm) - bool cfgApplyRCTrequirement = false; // Apply RCT requirement? - std::string cfgRCTLabel = ""; // Which detector condition requirements? (CBT, CBT_hadronPID, CBT_electronPID, CBT_calo, CBT_muon, CBT_muon_glo) - bool cfgCheckZDC = false; // Include ZDC flags in the bit selection (for Pb-Pb only) + bool fillOnlySelectedCollisions = false; // Fill only tables for selected collisions? + bool requireTriggerTVX = false; // require FT0 vertex (acceptable FT0C-FT0A time difference) at trigger level (Run 3 only) + bool rejectITSROFBorder = false; // reject events at ITS ROF border (Run 3 only) + bool rejectTFBorder = false; // reject events at TF border (Run 3 only) + bool rejectSameBunchPileup = false; // reject collisions in case of pileup with another collision in the same foundBC (Run 3 only) + float maxZVtxPosition = 10.; // max Z vtx position (cm) + bool cfgApplyRCTrequirement = false; // Apply RCT requirement? + std::string cfgRCTLabel = ""; // Which detector condition requirements? (CBT, CBT_hadronPID, CBT_electronPID, CBT_calo, CBT_muon, CBT_muon_glo) + bool cfgCheckZDC = false; // Include ZDC flags in the bit selection (for Pb-Pb only) bool cfgTreatLimitedAcceptanceAsBad = false; // reject all events where the detectors relevant for the specified Runlist are flagged as LimitedAcceptance o2::aod::rctsel::RCTFlagsChecker rctFlagsChecker; @@ -461,7 +461,6 @@ struct strangederivedbuilder { eventSelectOptsPrefix += "."; } - getCfg(initContext, eventSelectOptsPrefix + "fillOnlySelectedCollisions", fillOnlySelectedCollisions, inheritEvtSelFromTask); getCfg(initContext, eventSelectOptsPrefix + "requireTriggerTVX", requireTriggerTVX, inheritEvtSelFromTask); getCfg(initContext, eventSelectOptsPrefix + "rejectITSROFBorder", rejectITSROFBorder, inheritEvtSelFromTask); @@ -481,8 +480,8 @@ struct strangederivedbuilder { LOG(info) << "Reject same bunch pile-up..........: " << (rejectSameBunchPileup ? "yes" : "no"); LOG(info) << "Apply RCT requirement..............: " << (cfgApplyRCTrequirement ? "yes" : "no"); LOG(info) << "RCT requirement....................: " << cfgRCTLabel; - LOG(info) << "Check ZDC in RCT requirement.......: " << (cfgCheckZDC? "yes" : "no"); - LOG(info) << "Treat limited acceptance as bad....: " << (cfgCheckZDC? "yes" : "no"); + LOG(info) << "Check ZDC in RCT requirement.......: " << (cfgCheckZDC ? "yes" : "no"); + LOG(info) << "Treat limited acceptance as bad....: " << (cfgCheckZDC ? "yes" : "no"); LOG(info) << "================================================================="; // setup map for fast checking if enabled @@ -552,7 +551,7 @@ struct strangederivedbuilder { KFCascadeCollIndices.clear(); TraCascadeCollIndices.clear(); - TrackCollIndices.resize(Tracks.size(), 0); // index -1: no collision + TrackCollIndices.resize(Tracks.size(), 0); // index -1: no collision V0CollIndices.resize(V0s.size(), -1); // index -1: no collision CascadeCollIndices.resize(Cascades.size(), -1); // index -1: no collision KFCascadeCollIndices.resize(KFCascades.size(), -1); // index -1: no collision diff --git a/PWGLF/TableProducer/Strangeness/strangenesstofpid.cxx b/PWGLF/TableProducer/Strangeness/strangenesstofpid.cxx index 4adbab37572..fe7750010d9 100644 --- a/PWGLF/TableProducer/Strangeness/strangenesstofpid.cxx +++ b/PWGLF/TableProducer/Strangeness/strangenesstofpid.cxx @@ -2084,7 +2084,7 @@ struct strangenesstofpid { const double deltaTimeBc = o2::constants::lhc::LHCBunchSpacingNS * deltaBc * 1000.0f; histos.fill(HIST("hCascadePositiveBCShift"), deltaTimeBc); histos.fill(HIST("h2dTOFSignalCascadePositive"), pTof.tofSignal, deltaTimeBc); - + pTof.tofExpMom = pTofExt.tofExpMom(); pTof.tofEvTime = reassociateTracks.value ? collision.eventTime() : pTofExt.tofEvTime(); pTof.tofEvTimeErr = reassociateTracks.value ? collision.eventTimeErr() : pTofExt.tofEvTimeErr(); diff --git a/PWGLF/Tasks/Strangeness/derivedlambdakzeroanalysis.cxx b/PWGLF/Tasks/Strangeness/derivedlambdakzeroanalysis.cxx index bf716b92d1e..5f0b744fd3b 100644 --- a/PWGLF/Tasks/Strangeness/derivedlambdakzeroanalysis.cxx +++ b/PWGLF/Tasks/Strangeness/derivedlambdakzeroanalysis.cxx @@ -671,7 +671,7 @@ struct derivedlambdakzeroanalysis { // Initialise the RCTFlagsChecker rctFlagsChecker.init(rctConfigurations.cfgRCTLabel.value, rctConfigurations.cfgCheckZDC, rctConfigurations.cfgTreatLimitedAcceptanceAsBad); - // + // if (doprocessAnalysedCollisions) { histos.add("hEventPreSelection", "hEventPreSelection", kTH1D, {{2, -0.5f, +1.5f}}); histos.get(HIST("hEventPreSelection"))->GetXaxis()->SetBinLabel(1, "All collisions"); diff --git a/PWGLF/Utils/strangenessBuilderModule.h b/PWGLF/Utils/strangenessBuilderModule.h index 8b3897d29a6..efabc1dd452 100644 --- a/PWGLF/Utils/strangenessBuilderModule.h +++ b/PWGLF/Utils/strangenessBuilderModule.h @@ -19,6 +19,8 @@ #include "PWGLF/DataModel/LFStrangenessTables.h" // IWYU pragma: keep #include "PWGLF/Utils/strangenessBuilderHelper.h" +#include "Common/CCDB/EventSelectionParams.h" +#include "Common/CCDB/RCTSelectionFlags.h" #include "Common/Core/TPCVDriftManager.h" #include @@ -32,8 +34,6 @@ #include #include #include -#include "Common/CCDB/EventSelectionParams.h" -#include "Common/CCDB/RCTSelectionFlags.h" #include #include @@ -216,19 +216,19 @@ enum preselectParticleIndex { kGamma = 0, kXiPlus, kOmegaMinus, kOmegaPlus, - nPartTypes}; + nPartTypes }; enum V0PreSelection : uint8_t { selGamma = 0, selK0Short, selLambda, selAntiLambda, - nSelV0Types}; + nSelV0Types }; enum CascPreSelection : uint8_t { selXiMinus = 0, selXiPlus, selOmegaMinus, selOmegaPlus, - nSelCascTypes}; + nSelCascTypes }; static constexpr float defaultK0MassWindowParameters[1][4] = {{2.81882e-03, 1.14057e-03, 1.72138e-03, 5.00262e-01}}; static constexpr float defaultLambdaWindowParameters[1][4] = {{1.17518e-03, 1.24099e-04, 5.47937e-03, 3.08009e-01}}; @@ -396,10 +396,10 @@ struct cascadeConfigurables : o2::framework::ConfigurableGroup { struct preSelectOpts : o2::framework::ConfigurableGroup { std::string prefix = "preSelectOpts"; o2::framework::Configurable> preselectedSpecies{"preselectedSpecies", - {defaultPreselectParameters[0], nPreselectParticles, nPreselectParameters, preselectParticleNames, parameterNames}, - "Preselect this species with compatible TPC PID and mass info: 0/1 is false/true"}; + {defaultPreselectParameters[0], nPreselectParticles, nPreselectParameters, preselectParticleNames, parameterNames}, + "Preselect this species with compatible TPC PID and mass info: 0/1 is false/true"}; - std::vector mEnabledPreselectedSpecies; // Vector of enabled preselected particle species + std::vector mEnabledPreselectedSpecies; // Vector of enabled preselected particle species // lifetime preselection options // apply lifetime cuts to V0 and cascade candidates // unit of measurement: centimeters