From 907598f4f7f30fe258c0be875d20fdbb82b83417 Mon Sep 17 00:00:00 2001 From: Victor Date: Mon, 8 Dec 2025 23:06:06 +0100 Subject: [PATCH] [PWGCF] DptDpt - Moving included file to --- ...f_20221115.cxx => skimmingconf_20221115.h} | 7 +++-- .../twoParticleCorrelationsFiltering.cxx | 21 ++++++++------ .../twoParticleCorrelationsFullSkimming.cxx | 4 ++- ...oParticleCorrelationsNotStoredSkimming.cxx | 6 ++-- ...woParticleCorrelationsRegisterSkimming.cxx | 11 +++---- .../Tasks/twoParticleCorrelations.cxx | 29 +++++++++++-------- 6 files changed, 46 insertions(+), 32 deletions(-) rename PWGCF/TwoParticleCorrelations/TableProducer/Productions/{skimmingconf_20221115.cxx => skimmingconf_20221115.h} (99%) diff --git a/PWGCF/TwoParticleCorrelations/TableProducer/Productions/skimmingconf_20221115.cxx b/PWGCF/TwoParticleCorrelations/TableProducer/Productions/skimmingconf_20221115.h similarity index 99% rename from PWGCF/TwoParticleCorrelations/TableProducer/Productions/skimmingconf_20221115.cxx rename to PWGCF/TwoParticleCorrelations/TableProducer/Productions/skimmingconf_20221115.h index cd174dc8d86..0299ca49dcf 100644 --- a/PWGCF/TwoParticleCorrelations/TableProducer/Productions/skimmingconf_20221115.cxx +++ b/PWGCF/TwoParticleCorrelations/TableProducer/Productions/skimmingconf_20221115.h @@ -9,10 +9,11 @@ // granted to it by virtue of its status as an Intergovernmental Organization // or submit itself to any jurisdiction. -#include -#include -#include "Framework/AnalysisTask.h" #include "Framework/ASoAHelpers.h" +#include "Framework/AnalysisTask.h" + +#include +#include struct : o2::framework::ConfigurableGroup { o2::framework::Configurable> bfield{"evtflt_bfield", {"positive-yes", "negative-yes"}, "B filed polarity cut: both 'yes' default, anything else alternative"}; diff --git a/PWGCF/TwoParticleCorrelations/TableProducer/twoParticleCorrelationsFiltering.cxx b/PWGCF/TwoParticleCorrelations/TableProducer/twoParticleCorrelationsFiltering.cxx index 7bdaddd053d..a13bc933961 100644 --- a/PWGCF/TwoParticleCorrelations/TableProducer/twoParticleCorrelationsFiltering.cxx +++ b/PWGCF/TwoParticleCorrelations/TableProducer/twoParticleCorrelationsFiltering.cxx @@ -9,23 +9,26 @@ // granted to it by virtue of its status as an Intergovernmental Organization // or submit itself to any jurisdiction. -#include - -#include "Framework/AnalysisTask.h" #include "PWGCF/TwoParticleCorrelations/Core/FilterAndAnalysisFramework.h" -#include "PWGCF/TwoParticleCorrelations/DataModel/TwoParticleCorrelationsSkimmed.h" #include "PWGCF/TwoParticleCorrelations/DataModel/TwoParticleCorrelationsFiltered.h" +#include "PWGCF/TwoParticleCorrelations/DataModel/TwoParticleCorrelationsSkimmed.h" + +#include "Framework/AnalysisTask.h" #include "Framework/runDataProcessing.h" -#include + #include -#include -#include #include #include #include #include #include +#include +#include #include +#include + +#include +#include using namespace o2; using namespace o2::framework; @@ -61,7 +64,7 @@ struct TwoParticleCorrelationsFilter { Produces acceptedgencollisions; Produces acceptedgentracks; -#include "PWGCF/TwoParticleCorrelations/TableProducer/Productions/skimmingconf_20221115.cxx" // NOLINT +#include "PWGCF/TwoParticleCorrelations/TableProducer/Productions/skimmingconf_20221115.h" // NOLINT int nReportedTracks; // HistogramRegistry historeg; @@ -102,7 +105,7 @@ struct TwoParticleCorrelationsFilter { LOGF(info, "TwoParticleCorrelationsFilter::init(), collision selection masks 0x%016lx, %s, and 0x%016lx and multiplicity index %d", collisionmask, fFilterFramework->printCollisionOptionalMasks().Data(), collisionmask_forced, fMultiplicityIndex); LOGF(info, "TwoParticleCorrelationsFilter::init(), track selection masks 0x%016lx, %s, and 0x%016lx ", trackmask, fFilterFramework->printTrackOptionalMasks().Data(), trackmask_forced); LOGF(info, "TwoParticleCorrelationsFilter::init(), PID selection masks 0x%016lx, %s, and 0x%016lx ", pidmask, fFilterFramework->printPIDOptionalMasks().Data(), pidmask_forced); - if (collisionmask == uint64_t(0) || trackmask == uint64_t(0)) { + if (collisionmask == static_cast(0) || trackmask == static_cast(0)) { LOGF(fatal, "TwoParticleCorrelationsFilter::init() null masks, selecting everything!!!"); } /* TODO: check the cuts signatures against the CCDB contents */ diff --git a/PWGCF/TwoParticleCorrelations/TableProducer/twoParticleCorrelationsFullSkimming.cxx b/PWGCF/TwoParticleCorrelations/TableProducer/twoParticleCorrelationsFullSkimming.cxx index 907a885f2b9..9c1f5ffe71c 100644 --- a/PWGCF/TwoParticleCorrelations/TableProducer/twoParticleCorrelationsFullSkimming.cxx +++ b/PWGCF/TwoParticleCorrelations/TableProducer/twoParticleCorrelationsFullSkimming.cxx @@ -25,6 +25,8 @@ #include "Framework/runDataProcessing.h" #include +#include + using namespace o2; using namespace o2::framework; using namespace o2::soa; @@ -103,7 +105,7 @@ struct TwoParticleCorrelationsSkimming { Service ccdb; -#include "PWGCF/TwoParticleCorrelations/TableProducer/Productions/skimmingconf_20221115.cxx" // NOLINT +#include "PWGCF/TwoParticleCorrelations/TableProducer/Productions/skimmingconf_20221115.h" // NOLINT int nReportedTracks; int runNumber = 0; diff --git a/PWGCF/TwoParticleCorrelations/TableProducer/twoParticleCorrelationsNotStoredSkimming.cxx b/PWGCF/TwoParticleCorrelations/TableProducer/twoParticleCorrelationsNotStoredSkimming.cxx index 274207c246c..544e48e2076 100644 --- a/PWGCF/TwoParticleCorrelations/TableProducer/twoParticleCorrelationsNotStoredSkimming.cxx +++ b/PWGCF/TwoParticleCorrelations/TableProducer/twoParticleCorrelationsNotStoredSkimming.cxx @@ -31,6 +31,8 @@ using namespace o2::soa; using namespace o2::framework::expressions; using namespace o2::analysis; +#include + namespace o2::analysis::cfskim { #define LOGTRACKCOLLISIONS debug @@ -100,7 +102,7 @@ struct TwoParticleCorrelationsCollisionSkimming { Service ccdb; -#include "PWGCF/TwoParticleCorrelations/TableProducer/Productions/skimmingconf_20221115.cxx" // NOLINT +#include "PWGCF/TwoParticleCorrelations/TableProducer/Productions/skimmingconf_20221115.h" // NOLINT int nReportedTracks; int runNumber = 0; @@ -232,7 +234,7 @@ struct TwoParticleCorrelationsTrackSkimming { Produces skimmtrackpid; Produces particlemask; -#include "PWGCF/TwoParticleCorrelations/TableProducer/Productions/skimmingconf_20221115.cxx" // NOLINT +#include "PWGCF/TwoParticleCorrelations/TableProducer/Productions/skimmingconf_20221115.h" // NOLINT void init(InitContext const&) { diff --git a/PWGCF/TwoParticleCorrelations/TableProducer/twoParticleCorrelationsRegisterSkimming.cxx b/PWGCF/TwoParticleCorrelations/TableProducer/twoParticleCorrelationsRegisterSkimming.cxx index 20bbd90efbc..0791f456a4c 100644 --- a/PWGCF/TwoParticleCorrelations/TableProducer/twoParticleCorrelationsRegisterSkimming.cxx +++ b/PWGCF/TwoParticleCorrelations/TableProducer/twoParticleCorrelationsRegisterSkimming.cxx @@ -9,12 +9,13 @@ // granted to it by virtue of its status as an Intergovernmental Organization // or submit itself to any jurisdiction. -#include -#include "Framework/AnalysisTask.h" -#include "Framework/AnalysisDataModel.h" -#include "Framework/ASoAHelpers.h" #include "PWGCF/TwoParticleCorrelations/Core/FilterAndAnalysisFramework.h" + +#include "Framework/ASoAHelpers.h" +#include "Framework/AnalysisDataModel.h" +#include "Framework/AnalysisTask.h" #include "Framework/runDataProcessing.h" +#include using namespace o2; using namespace o2::framework; @@ -31,7 +32,7 @@ struct TwoParticleCorrelationsRegisterSkimming { bool registered = false; PWGCF::FilterAndAnalysisFramework* fFilterFramework = nullptr; -#include "PWGCF/TwoParticleCorrelations/TableProducer/Productions/skimmingconf_20221115.cxx" // NOLINT +#include "PWGCF/TwoParticleCorrelations/TableProducer/Productions/skimmingconf_20221115.h" // NOLINT void init(InitContext const&) { diff --git a/PWGCF/TwoParticleCorrelations/Tasks/twoParticleCorrelations.cxx b/PWGCF/TwoParticleCorrelations/Tasks/twoParticleCorrelations.cxx index a7a05beb310..9ba279ad79d 100644 --- a/PWGCF/TwoParticleCorrelations/Tasks/twoParticleCorrelations.cxx +++ b/PWGCF/TwoParticleCorrelations/Tasks/twoParticleCorrelations.cxx @@ -9,25 +9,30 @@ // granted to it by virtue of its status as an Intergovernmental Organization // or submit itself to any jurisdiction. +#include "PWGCF/Core/AnalysisConfigurableCuts.h" +#include "PWGCF/Core/PairCuts.h" +#include "PWGCF/TwoParticleCorrelations/Core/FilterAndAnalysisFramework.h" +#include "PWGCF/TwoParticleCorrelations/DataModel/TwoParticleCorrelationsSkimmed.h" + +#include "Framework/AnalysisTask.h" +#include "Framework/runDataProcessing.h" #include -#include -#include + #include -#include -#include #include #include #include #include #include +#include +#include #include +#include -#include "Framework/AnalysisTask.h" -#include "Framework/runDataProcessing.h" -#include "PWGCF/Core/AnalysisConfigurableCuts.h" -#include "PWGCF/TwoParticleCorrelations/Core/FilterAndAnalysisFramework.h" -#include "PWGCF/TwoParticleCorrelations/DataModel/TwoParticleCorrelationsSkimmed.h" -#include "PWGCF/Core/PairCuts.h" +#include +#include +#include +#include using namespace o2; using namespace o2::framework; @@ -576,7 +581,7 @@ struct twoParticleCorrelations { }; // DataCollectingEngine /* the skimming configuration */ -#include "PWGCF/TwoParticleCorrelations/TableProducer/Productions/skimmingconf_20221115.cxx" // NOLINT +#include "PWGCF/TwoParticleCorrelations/TableProducer/Productions/skimmingconf_20221115.h" // NOLINT Service ccdb; @@ -754,7 +759,7 @@ struct twoParticleCorrelations { LOGF(info, "twoParticleCorrelationsFilter::init(), collision selection masks 0x%016lx, %s, and 0x%016lx and multiplicity index %d", collisionmask, fFilterFramework->printCollisionOptionalMasks().Data(), collisionmask_forced, fMultiplicityIndex); LOGF(info, "twoParticleCorrelationsFilter::init(), track selection masks 0x%016lx, %s, and 0x%016lx ", trackmask, fFilterFramework->printTrackOptionalMasks().Data(), trackmask_forced); LOGF(info, "twoParticleCorrelationsFilter::init(), PID selection masks 0x%016lx, %s, and 0x%016lx ", pidmask, fFilterFramework->printPIDOptionalMasks().Data(), pidmask_forced); - if (collisionmask == uint64_t(0) || trackmask == uint64_t(0)) { + if (collisionmask == static_cast(0) || trackmask == static_cast(0)) { LOGF(fatal, "twoParticleCorrelationsFilter::init() null masks, selecting everything!!!"); }