Skip to content

Commit d7545a8

Browse files
victor-gonzalezVictor
andauthored
[PWGCF] DptDpt - Moving .cxx included file to .h (#14130)
Co-authored-by: Victor <victor@cern.ch>
1 parent d05bda3 commit d7545a8

File tree

6 files changed

+46
-32
lines changed

6 files changed

+46
-32
lines changed

PWGCF/TwoParticleCorrelations/TableProducer/Productions/skimmingconf_20221115.cxx renamed to PWGCF/TwoParticleCorrelations/TableProducer/Productions/skimmingconf_20221115.h

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,11 @@
99
// granted to it by virtue of its status as an Intergovernmental Organization
1010
// or submit itself to any jurisdiction.
1111

12-
#include <vector>
13-
#include <string>
14-
#include "Framework/AnalysisTask.h"
1512
#include "Framework/ASoAHelpers.h"
13+
#include "Framework/AnalysisTask.h"
14+
15+
#include <string>
16+
#include <vector>
1617

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

PWGCF/TwoParticleCorrelations/TableProducer/twoParticleCorrelationsFiltering.cxx

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,23 +9,26 @@
99
// granted to it by virtue of its status as an Intergovernmental Organization
1010
// or submit itself to any jurisdiction.
1111

12-
#include <cmath>
13-
14-
#include "Framework/AnalysisTask.h"
1512
#include "PWGCF/TwoParticleCorrelations/Core/FilterAndAnalysisFramework.h"
16-
#include "PWGCF/TwoParticleCorrelations/DataModel/TwoParticleCorrelationsSkimmed.h"
1713
#include "PWGCF/TwoParticleCorrelations/DataModel/TwoParticleCorrelationsFiltered.h"
14+
#include "PWGCF/TwoParticleCorrelations/DataModel/TwoParticleCorrelationsSkimmed.h"
15+
16+
#include "Framework/AnalysisTask.h"
1817
#include "Framework/runDataProcessing.h"
19-
#include <TROOT.h>
18+
2019
#include <TDatabasePDG.h>
21-
#include <TParameter.h>
22-
#include <TList.h>
2320
#include <TDirectory.h>
2421
#include <TFolder.h>
2522
#include <TH1.h>
2623
#include <TH2.h>
2724
#include <TH3.h>
25+
#include <TList.h>
26+
#include <TParameter.h>
2827
#include <TProfile3D.h>
28+
#include <TROOT.h>
29+
30+
#include <cmath>
31+
#include <vector>
2932

3033
using namespace o2;
3134
using namespace o2::framework;
@@ -61,7 +64,7 @@ struct TwoParticleCorrelationsFilter {
6164
Produces<aod::TwoPAcceptedGenCollisions> acceptedgencollisions;
6265
Produces<aod::TwoPFilteredParticles> acceptedgentracks;
6366

64-
#include "PWGCF/TwoParticleCorrelations/TableProducer/Productions/skimmingconf_20221115.cxx" // NOLINT
67+
#include "PWGCF/TwoParticleCorrelations/TableProducer/Productions/skimmingconf_20221115.h" // NOLINT
6568

6669
int nReportedTracks;
6770
// HistogramRegistry historeg;
@@ -102,7 +105,7 @@ struct TwoParticleCorrelationsFilter {
102105
LOGF(info, "TwoParticleCorrelationsFilter::init(), collision selection masks 0x%016lx, %s, and 0x%016lx and multiplicity index %d", collisionmask, fFilterFramework->printCollisionOptionalMasks().Data(), collisionmask_forced, fMultiplicityIndex);
103106
LOGF(info, "TwoParticleCorrelationsFilter::init(), track selection masks 0x%016lx, %s, and 0x%016lx ", trackmask, fFilterFramework->printTrackOptionalMasks().Data(), trackmask_forced);
104107
LOGF(info, "TwoParticleCorrelationsFilter::init(), PID selection masks 0x%016lx, %s, and 0x%016lx ", pidmask, fFilterFramework->printPIDOptionalMasks().Data(), pidmask_forced);
105-
if (collisionmask == uint64_t(0) || trackmask == uint64_t(0)) {
108+
if (collisionmask == static_cast<uint64_t>(0) || trackmask == static_cast<uint64_t>(0)) {
106109
LOGF(fatal, "TwoParticleCorrelationsFilter::init() null masks, selecting everything!!!");
107110
}
108111
/* TODO: check the cuts signatures against the CCDB contents */

PWGCF/TwoParticleCorrelations/TableProducer/twoParticleCorrelationsFullSkimming.cxx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@
2525
#include "Framework/runDataProcessing.h"
2626
#include <CCDB/BasicCCDBManager.h>
2727

28+
#include <string>
29+
2830
using namespace o2;
2931
using namespace o2::framework;
3032
using namespace o2::soa;
@@ -103,7 +105,7 @@ struct TwoParticleCorrelationsSkimming {
103105

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

106-
#include "PWGCF/TwoParticleCorrelations/TableProducer/Productions/skimmingconf_20221115.cxx" // NOLINT
108+
#include "PWGCF/TwoParticleCorrelations/TableProducer/Productions/skimmingconf_20221115.h" // NOLINT
107109

108110
int nReportedTracks;
109111
int runNumber = 0;

PWGCF/TwoParticleCorrelations/TableProducer/twoParticleCorrelationsNotStoredSkimming.cxx

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ using namespace o2::soa;
3131
using namespace o2::framework::expressions;
3232
using namespace o2::analysis;
3333

34+
#include <string>
35+
3436
namespace o2::analysis::cfskim
3537
{
3638
#define LOGTRACKCOLLISIONS debug
@@ -100,7 +102,7 @@ struct TwoParticleCorrelationsCollisionSkimming {
100102

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

103-
#include "PWGCF/TwoParticleCorrelations/TableProducer/Productions/skimmingconf_20221115.cxx" // NOLINT
105+
#include "PWGCF/TwoParticleCorrelations/TableProducer/Productions/skimmingconf_20221115.h" // NOLINT
104106

105107
int nReportedTracks;
106108
int runNumber = 0;
@@ -232,7 +234,7 @@ struct TwoParticleCorrelationsTrackSkimming {
232234
Produces<aod::CFTrackPIDs> skimmtrackpid;
233235
Produces<aod::CFMCPartMask> particlemask;
234236

235-
#include "PWGCF/TwoParticleCorrelations/TableProducer/Productions/skimmingconf_20221115.cxx" // NOLINT
237+
#include "PWGCF/TwoParticleCorrelations/TableProducer/Productions/skimmingconf_20221115.h" // NOLINT
236238

237239
void init(InitContext const&)
238240
{

PWGCF/TwoParticleCorrelations/TableProducer/twoParticleCorrelationsRegisterSkimming.cxx

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,13 @@
99
// granted to it by virtue of its status as an Intergovernmental Organization
1010
// or submit itself to any jurisdiction.
1111

12-
#include <CCDB/BasicCCDBManager.h>
13-
#include "Framework/AnalysisTask.h"
14-
#include "Framework/AnalysisDataModel.h"
15-
#include "Framework/ASoAHelpers.h"
1612
#include "PWGCF/TwoParticleCorrelations/Core/FilterAndAnalysisFramework.h"
13+
14+
#include "Framework/ASoAHelpers.h"
15+
#include "Framework/AnalysisDataModel.h"
16+
#include "Framework/AnalysisTask.h"
1717
#include "Framework/runDataProcessing.h"
18+
#include <CCDB/BasicCCDBManager.h>
1819

1920
using namespace o2;
2021
using namespace o2::framework;
@@ -31,7 +32,7 @@ struct TwoParticleCorrelationsRegisterSkimming {
3132
bool registered = false;
3233
PWGCF::FilterAndAnalysisFramework* fFilterFramework = nullptr;
3334

34-
#include "PWGCF/TwoParticleCorrelations/TableProducer/Productions/skimmingconf_20221115.cxx" // NOLINT
35+
#include "PWGCF/TwoParticleCorrelations/TableProducer/Productions/skimmingconf_20221115.h" // NOLINT
3536

3637
void init(InitContext const&)
3738
{

PWGCF/TwoParticleCorrelations/Tasks/twoParticleCorrelations.cxx

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,25 +9,30 @@
99
// granted to it by virtue of its status as an Intergovernmental Organization
1010
// or submit itself to any jurisdiction.
1111

12+
#include "PWGCF/Core/AnalysisConfigurableCuts.h"
13+
#include "PWGCF/Core/PairCuts.h"
14+
#include "PWGCF/TwoParticleCorrelations/Core/FilterAndAnalysisFramework.h"
15+
#include "PWGCF/TwoParticleCorrelations/DataModel/TwoParticleCorrelationsSkimmed.h"
16+
17+
#include "Framework/AnalysisTask.h"
18+
#include "Framework/runDataProcessing.h"
1219
#include <DataFormatsParameters/GRPObject.h>
13-
#include <cmath>
14-
#include <TROOT.h>
20+
1521
#include <TDatabasePDG.h>
16-
#include <TParameter.h>
17-
#include <TList.h>
1822
#include <TDirectory.h>
1923
#include <TFolder.h>
2024
#include <TH1.h>
2125
#include <TH2.h>
2226
#include <TH3.h>
27+
#include <TList.h>
28+
#include <TParameter.h>
2329
#include <TProfile3D.h>
30+
#include <TROOT.h>
2431

25-
#include "Framework/AnalysisTask.h"
26-
#include "Framework/runDataProcessing.h"
27-
#include "PWGCF/Core/AnalysisConfigurableCuts.h"
28-
#include "PWGCF/TwoParticleCorrelations/Core/FilterAndAnalysisFramework.h"
29-
#include "PWGCF/TwoParticleCorrelations/DataModel/TwoParticleCorrelationsSkimmed.h"
30-
#include "PWGCF/Core/PairCuts.h"
32+
#include <cmath>
33+
#include <cstdio>
34+
#include <string>
35+
#include <vector>
3136

3237
using namespace o2;
3338
using namespace o2::framework;
@@ -576,7 +581,7 @@ struct twoParticleCorrelations {
576581
}; // DataCollectingEngine
577582

578583
/* the skimming configuration */
579-
#include "PWGCF/TwoParticleCorrelations/TableProducer/Productions/skimmingconf_20221115.cxx" // NOLINT
584+
#include "PWGCF/TwoParticleCorrelations/TableProducer/Productions/skimmingconf_20221115.h" // NOLINT
580585

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

@@ -754,7 +759,7 @@ struct twoParticleCorrelations {
754759
LOGF(info, "twoParticleCorrelationsFilter::init(), collision selection masks 0x%016lx, %s, and 0x%016lx and multiplicity index %d", collisionmask, fFilterFramework->printCollisionOptionalMasks().Data(), collisionmask_forced, fMultiplicityIndex);
755760
LOGF(info, "twoParticleCorrelationsFilter::init(), track selection masks 0x%016lx, %s, and 0x%016lx ", trackmask, fFilterFramework->printTrackOptionalMasks().Data(), trackmask_forced);
756761
LOGF(info, "twoParticleCorrelationsFilter::init(), PID selection masks 0x%016lx, %s, and 0x%016lx ", pidmask, fFilterFramework->printPIDOptionalMasks().Data(), pidmask_forced);
757-
if (collisionmask == uint64_t(0) || trackmask == uint64_t(0)) {
762+
if (collisionmask == static_cast<uint64_t>(0) || trackmask == static_cast<uint64_t>(0)) {
758763
LOGF(fatal, "twoParticleCorrelationsFilter::init() null masks, selecting everything!!!");
759764
}
760765

0 commit comments

Comments
 (0)