Skip to content

[PWGCF] DptDpt - Moving .cxx included file to .h #14130

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
victor-gonzalez merged 1 commit into from
Dec 9, 2025
Merged

[PWGCF] DptDpt - Moving .cxx included file to .h #14130

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions ...cer/Productions/skimmingconf_20221115.cxx → ...ducer/Productions/skimmingconf_20221115.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,25 +9,26 @@
// granted to it by virtue of its status as an Intergovernmental Organization
// or submit itself to any jurisdiction.

#include <vector>
#include <string>
#include "Framework/AnalysisTask.h"
#include "Framework/ASoAHelpers.h"
#include "Framework/AnalysisTask.h"

#include <string>
#include <vector>

struct : o2::framework::ConfigurableGroup {
o2::framework::Configurable<std::vector<std::string>> bfield{"evtflt_bfield", {"positive-yes", "negative-yes"}, "B filed polarity cut: both 'yes' default, anything else alternative"};

Check failure on line 19 in PWGCF/TwoParticleCorrelations/TableProducer/Productions/skimmingconf_20221115.h

View workflow job for this annotation

GitHub Actions / O2 linter

[name/configurable] 

Use lowerCamelCase for names of configurables and use the same name for the struct member as for the JSON string. (Declare the type and names on the same line.)
o2::framework::Configurable<std::vector<std::string>> zvtxsel{"evtflt_zvtx", {"rg{-7.0,7.0}-yes", "rg{-10.0,10.0}-no", "rg{-3.0,3.0}-no"}, "Z vertex cut: first, default value, next, alternatives"};

Check failure on line 20 in PWGCF/TwoParticleCorrelations/TableProducer/Productions/skimmingconf_20221115.h

View workflow job for this annotation

GitHub Actions / O2 linter

[name/configurable] 

Use lowerCamelCase for names of configurables and use the same name for the struct member as for the JSON string. (Declare the type and names on the same line.)
o2::framework::Configurable<std::vector<std::string>> centmultsel{"evtflt_centmult", {"mrg{V0M,0,5,10,20,30,40,50,60,70,80}-yes", "mrg{CL1,0,5,10,20,30,40,50,60,70,80}-no"}, "Centrality/Multiplicity cut: first, default, next, alternatives"};

Check failure on line 21 in PWGCF/TwoParticleCorrelations/TableProducer/Productions/skimmingconf_20221115.h

View workflow job for this annotation

GitHub Actions / O2 linter

[name/configurable] 

Use lowerCamelCase for names of configurables and use the same name for the struct member as for the JSON string. (Declare the type and names on the same line.)
o2::framework::Configurable<std::vector<std::string>> pileuprej{"evtflt_pileuprej", {"fnrg{V0M_TPCOUT=-0.5+3.7*x-0.14*x*x,0.5-3.7*x+0.14*x*x}-yes", "fnrg{V0M_TRKLETS=-0.5+3.7*x-0.14*x*x,0.5-3.7*x+0.14*x*x}-no"}, "Advanced pile-up rejection cut: first, default, next, alternatives"};

Check failure on line 22 in PWGCF/TwoParticleCorrelations/TableProducer/Productions/skimmingconf_20221115.h

View workflow job for this annotation

GitHub Actions / O2 linter

[name/configurable] 

Use lowerCamelCase for names of configurables and use the same name for the struct member as for the JSON string. (Declare the type and names on the same line.)
} eventfilter;

struct : o2::framework::ConfigurableGroup {
o2::framework::Configurable<std::vector<std::string>> ttype{"trkflt_ttype", {"FB1-no", "FB32-yes", "FB64-yes"}, "Track types to filter"};

Check failure on line 26 in PWGCF/TwoParticleCorrelations/TableProducer/Productions/skimmingconf_20221115.h

View workflow job for this annotation

GitHub Actions / O2 linter

[name/configurable] 

Use lowerCamelCase for names of configurables and use the same name for the struct member as for the JSON string. (Declare the type and names on the same line.)
o2::framework::Configurable<std::vector<std::string>> nclstpc{"trkflt_nclstpc", {"th{70}-yes", "th{80}-no", "th{90}-no"}, "Min no of TPC clusters: first, default value, next, alternatives"};

Check failure on line 27 in PWGCF/TwoParticleCorrelations/TableProducer/Productions/skimmingconf_20221115.h

View workflow job for this annotation

GitHub Actions / O2 linter

[name/configurable] 

Use lowerCamelCase for names of configurables and use the same name for the struct member as for the JSON string. (Declare the type and names on the same line.)
o2::framework::Configurable<std::vector<std::string>> nxrtpc{"trkflt_nxrtpc", {""}, "Min no of TPC crossed rows: first, default value, next, alternatives"};

Check failure on line 28 in PWGCF/TwoParticleCorrelations/TableProducer/Productions/skimmingconf_20221115.h

View workflow job for this annotation

GitHub Actions / O2 linter

[name/configurable] 

Use lowerCamelCase for names of configurables and use the same name for the struct member as for the JSON string. (Declare the type and names on the same line.)
o2::framework::Configurable<std::vector<std::string>> nclsits{"trkflt_nclsits", {""}, "Min no of ITS clusters: first, default value, next, alternatives"};

Check failure on line 29 in PWGCF/TwoParticleCorrelations/TableProducer/Productions/skimmingconf_20221115.h

View workflow job for this annotation

GitHub Actions / O2 linter

[name/configurable] 

Use lowerCamelCase for names of configurables and use the same name for the struct member as for the JSON string. (Declare the type and names on the same line.)
o2::framework::Configurable<std::vector<std::string>> chi2clustpc{"trkflt_chi2clustpc", {"lim{4}-yes", "lim{3}-no", "lim{90}-no"}, "Max Chi^2 per TPC cluster: first, default value, next, alternatives"};

Check failure on line 30 in PWGCF/TwoParticleCorrelations/TableProducer/Productions/skimmingconf_20221115.h

View workflow job for this annotation

GitHub Actions / O2 linter

[name/configurable] 

Use lowerCamelCase for names of configurables and use the same name for the struct member as for the JSON string. (Declare the type and names on the same line.)
o2::framework::Configurable<std::vector<std::string>> chi2clusits{"trkflt_chi2clusits", {""}, "Max Chi^2 per ITS cluster: first, default value, next, alternatives"};

Check failure on line 31 in PWGCF/TwoParticleCorrelations/TableProducer/Productions/skimmingconf_20221115.h

View workflow job for this annotation

GitHub Actions / O2 linter

[name/configurable] 

Use lowerCamelCase for names of configurables and use the same name for the struct member as for the JSON string. (Declare the type and names on the same line.)
o2::framework::Configurable<std::vector<std::string>> xrofctpc{"trkflt_xrofctpc", {""}, "Min no of TPC crossed rows over findable clusters: first, default value, next, alternatives"};
o2::framework::Configurable<std::vector<std::string>> dcaxy{"trkflt_dcaxy", {""}, "Max DCAxy: first, default value, next, alternatives"};
o2::framework::Configurable<std::vector<std::string>> dcaz{"trkflt_dcaz", {""}, "Max DCAz: first, default value, next, alternatives"};
Expand Down
21 changes: 12 additions & 9 deletions PWGCF/TwoParticleCorrelations/TableProducer/twoParticleCorrelationsFiltering.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,23 +9,26 @@
// granted to it by virtue of its status as an Intergovernmental Organization
// or submit itself to any jurisdiction.

#include <cmath>

#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 <TROOT.h>

#include <TDatabasePDG.h>
#include <TParameter.h>
#include <TList.h>
#include <TDirectory.h>
#include <TFolder.h>
#include <TH1.h>
#include <TH2.h>
#include <TH3.h>
#include <TList.h>
#include <TParameter.h>
#include <TProfile3D.h>
#include <TROOT.h>

#include <cmath>
#include <vector>

using namespace o2;
using namespace o2::framework;
Expand Down Expand Up @@ -61,7 +64,7 @@ struct TwoParticleCorrelationsFilter {
Produces<aod::TwoPAcceptedGenCollisions> acceptedgencollisions;
Produces<aod::TwoPFilteredParticles> acceptedgentracks;

#include "PWGCF/TwoParticleCorrelations/TableProducer/Productions/skimmingconf_20221115.cxx" // NOLINT
#include "PWGCF/TwoParticleCorrelations/TableProducer/Productions/skimmingconf_20221115.h" // NOLINT

int nReportedTracks;
// HistogramRegistry historeg;
Expand Down Expand Up @@ -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<uint64_t>(0) || trackmask == static_cast<uint64_t>(0)) {
LOGF(fatal, "TwoParticleCorrelationsFilter::init() null masks, selecting everything!!!");
}
/* TODO: check the cuts signatures against the CCDB contents */
Expand Down
4 changes: 3 additions & 1 deletion PWGCF/TwoParticleCorrelations/TableProducer/twoParticleCorrelationsFullSkimming.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@
#include "Framework/runDataProcessing.h"
#include <CCDB/BasicCCDBManager.h>

#include <string>

using namespace o2;
using namespace o2::framework;
using namespace o2::soa;
Expand Down Expand Up @@ -103,7 +105,7 @@ struct TwoParticleCorrelationsSkimming {

Service<o2::ccdb::BasicCCDBManager> ccdb;

#include "PWGCF/TwoParticleCorrelations/TableProducer/Productions/skimmingconf_20221115.cxx" // NOLINT
#include "PWGCF/TwoParticleCorrelations/TableProducer/Productions/skimmingconf_20221115.h" // NOLINT

int nReportedTracks;
int runNumber = 0;
Expand Down
6 changes: 4 additions & 2 deletions PWGCF/TwoParticleCorrelations/TableProducer/twoParticleCorrelationsNotStoredSkimming.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ using namespace o2::soa;
using namespace o2::framework::expressions;
using namespace o2::analysis;

#include <string>

namespace o2::analysis::cfskim
{
#define LOGTRACKCOLLISIONS debug
Expand Down Expand Up @@ -100,7 +102,7 @@ struct TwoParticleCorrelationsCollisionSkimming {

Service<o2::ccdb::BasicCCDBManager> ccdb;

#include "PWGCF/TwoParticleCorrelations/TableProducer/Productions/skimmingconf_20221115.cxx" // NOLINT
#include "PWGCF/TwoParticleCorrelations/TableProducer/Productions/skimmingconf_20221115.h" // NOLINT

int nReportedTracks;
int runNumber = 0;
Expand Down Expand Up @@ -232,7 +234,7 @@ struct TwoParticleCorrelationsTrackSkimming {
Produces<aod::CFTrackPIDs> skimmtrackpid;
Produces<aod::CFMCPartMask> particlemask;

#include "PWGCF/TwoParticleCorrelations/TableProducer/Productions/skimmingconf_20221115.cxx" // NOLINT
#include "PWGCF/TwoParticleCorrelations/TableProducer/Productions/skimmingconf_20221115.h" // NOLINT

void init(InitContext const&)
{
Expand Down
11 changes: 6 additions & 5 deletions PWGCF/TwoParticleCorrelations/TableProducer/twoParticleCorrelationsRegisterSkimming.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,13 @@
// granted to it by virtue of its status as an Intergovernmental Organization
// or submit itself to any jurisdiction.

#include <CCDB/BasicCCDBManager.h>
#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 <CCDB/BasicCCDBManager.h>

using namespace o2;
using namespace o2::framework;
Expand All @@ -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&)
{
Expand Down
29 changes: 17 additions & 12 deletions PWGCF/TwoParticleCorrelations/Tasks/twoParticleCorrelations.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 <DataFormatsParameters/GRPObject.h>
#include <cmath>
#include <TROOT.h>

#include <TDatabasePDG.h>
#include <TParameter.h>
#include <TList.h>
#include <TDirectory.h>
#include <TFolder.h>
#include <TH1.h>
#include <TH2.h>
#include <TH3.h>
#include <TList.h>
#include <TParameter.h>
#include <TProfile3D.h>
#include <TROOT.h>

#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 <cmath>
#include <cstdio>
#include <string>
#include <vector>

using namespace o2;
using namespace o2::framework;
Expand Down Expand Up @@ -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<o2::ccdb::BasicCCDBManager> ccdb;

Expand Down Expand Up @@ -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<uint64_t>(0) || trackmask == static_cast<uint64_t>(0)) {
LOGF(fatal, "twoParticleCorrelationsFilter::init() null masks, selecting everything!!!");
}

Expand Down
Loading