Skip to content

Commit c89d2c7

Browse files
gvolpe79gvolpe79
committed
Applying clang
1 parent 823cb00 commit c89d2c7

File tree

8 files changed

+1210
-1615
lines changed

8 files changed

+1210
-1615
lines changed

‎DPG/Tasks/AOTTrack/PID/HMPID/analysisHMPID.cxx‎

Lines changed: 27 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -10,24 +10,25 @@
1010
// or submit itself to any jurisdiction.
1111

1212
// O2 includes
13-
#include "ReconstructionDataFormats/Track.h"
14-
#include "Framework/runDataProcessing.h"
15-
#include "Framework/AnalysisTask.h"
16-
#include "Framework/AnalysisDataModel.h"
17-
#include "Framework/HistogramRegistry.h"
18-
#include "Framework/RunningWorkflowInfo.h"
19-
#include "ReconstructionDataFormats/TrackParametrization.h"
20-
#include "Common/DataModel/PIDResponse.h"
2113
#include "Common/Core/PID/PIDTOF.h"
22-
#include "Common/TableProducer/PID/pidTOFBase.h"
23-
#include "ReconstructionDataFormats/PID.h"
2414
#include "Common/Core/trackUtilities.h"
25-
#include "ReconstructionDataFormats/DCA.h"
26-
#include "Framework/ASoAHelpers.h"
27-
#include "Framework/ASoA.h"
2815
#include "Common/DataModel/EventSelection.h"
16+
#include "Common/DataModel/PIDResponse.h"
2917
#include "Common/DataModel/TrackSelectionTables.h"
30-
//#include "ReconstructionDataFormats/MatchInfoHMP.h"
18+
#include "Common/TableProducer/PID/pidTOFBase.h"
19+
20+
#include "Framework/ASoA.h"
21+
#include "Framework/ASoAHelpers.h"
22+
#include "Framework/AnalysisDataModel.h"
23+
#include "Framework/AnalysisTask.h"
24+
#include "Framework/HistogramRegistry.h"
25+
#include "Framework/RunningWorkflowInfo.h"
26+
#include "Framework/runDataProcessing.h"
27+
#include "ReconstructionDataFormats/DCA.h"
28+
#include "ReconstructionDataFormats/PID.h"
29+
#include "ReconstructionDataFormats/Track.h"
30+
#include "ReconstructionDataFormats/TrackParametrization.h"
31+
// #include "ReconstructionDataFormats/MatchInfoHMP.h"
3132

3233
#include "tableHMPID.h"
3334

@@ -41,21 +42,18 @@ using namespace o2::framework;
4142
using namespace o2::framework::expressions;
4243
using namespace o2::constants::physics;
4344

44-
4545
struct pidHmpidAnalysis {
4646

4747
HistogramRegistry histos{"histos", {}, OutputObjHandlingPolicy::AnalysisObject};
4848

4949
const AxisSpec axisEvtCounter{1, 0, +1, ""};
5050

51-
5251
// CCDB configurable
5352
Service<o2::ccdb::BasicCCDBManager> ccdb;
5453
struct : ConfigurableGroup {
5554
Configurable<std::string> ccdburl{"ccdb-url", "http://alice-ccdb.cern.ch", "url of the ccdb repository"};
5655
} ccdbConfig;
5756

58-
5957
Produces<aod::HMPID_analysis> HMPID_analysis;
6058

6159
// using TrackCandidates = soa::Join<aod::Tracks, aod::TracksExtra, aod::TracksDCA, aod::TrackSelection>;
@@ -66,7 +64,6 @@ struct pidHmpidAnalysis {
6664
aod::pidTPCFullPi, aod::pidTPCFullKa, aod::pidTPCFullPr, aod::pidTPCFullDe,
6765
aod::pidTOFFullPi, aod::pidTOFFullKa, aod::pidTOFFullPr, aod::pidTOFFullDe>;
6866

69-
7067
void init(o2::framework::InitContext&)
7168
{
7269
// Configure CCDB
@@ -77,7 +74,7 @@ struct pidHmpidAnalysis {
7774
histos.add("eventCounter", "eventCounter", kTH1F, {axisEvtCounter});
7875
}
7976

80-
//function to manage ccdb
77+
// function to manage ccdb
8178
int mCCDBRunNumber = 0;
8279
void initCCDB(aod::BCsWithTimestamps::iterator const& bc)
8380
{
@@ -92,18 +89,19 @@ struct pidHmpidAnalysis {
9289
TrackCandidates const&,
9390
aod::BCsWithTimestamps const&)
9491
{
95-
//counter for all events processed (move into tracks loop if good event counter is needed)
92+
// counter for all events processed (move into tracks loop if good event counter is needed)
9693
histos.fill(HIST("eventCounter"), 0.5);
9794

9895
initCCDB(event.bc_as<aod::BCsWithTimestamps>());
99-
100-
//loop sulle tracce hmpid
101-
for (const auto& t : hmpids)
102-
{
103-
//global tracks associated to hmpid tracks
96+
97+
// loop sulle tracce hmpid
98+
for (const auto& t : hmpids) {
99+
// global tracks associated to hmpid tracks
104100
const auto& global_track = t.track_as<TrackCandidates>();
105-
if (!global_track.isGlobalTrack()) continue;
106-
if (!global_track.hasITS() || !global_track.hasTPC() || !global_track.hasTOF()) continue;
101+
if (!global_track.isGlobalTrack())
102+
continue;
103+
if (!global_track.hasITS() || !global_track.hasTPC() || !global_track.hasTOF())
104+
continue;
107105

108106
float hmpidPhotsCharge2[10];
109107

@@ -116,10 +114,10 @@ struct pidHmpidAnalysis {
116114
global_track.p(), t.hmpidXTrack(), t.hmpidYTrack(), t.hmpidXMip(),
117115
t.hmpidYMip(), t.hmpidNPhotons(), t.hmpidQMip(), (t.hmpidClusSize() % 1000000) / 1000, t.hmpidClusSize() / 1000000,
118116
hmpidPhotsCharge2, global_track.eta(), global_track.phi(), global_track.px(), global_track.py(), global_track.pz(),
119-
global_track.itsNCls(), global_track.tpcNClsFound(), global_track.tpcNClsCrossedRows(),global_track.tpcChi2NCl(), global_track.itsChi2NCl(),
117+
global_track.itsNCls(), global_track.tpcNClsFound(), global_track.tpcNClsCrossedRows(), global_track.tpcChi2NCl(), global_track.itsChi2NCl(),
120118
global_track.dcaXY(), global_track.dcaZ(), global_track.tpcNSigmaPi(), global_track.tofNSigmaPi(), global_track.tpcNSigmaKa(), global_track.tofNSigmaKa(),
121119
global_track.tpcNSigmaPr(), global_track.tofNSigmaPr(), global_track.tpcNSigmaDe(), global_track.tofNSigmaDe());
122-
} //end hmpid tracks loop
120+
} // end hmpid tracks loop
123121
}
124122
};
125123

‎DPG/Tasks/AOTTrack/PID/HMPID/analysisHMPID_pb.cxx‎

Lines changed: 37 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -10,35 +10,34 @@
1010
// or submit itself to any jurisdiction.
1111

1212
// O2 includes
13-
#include "ReconstructionDataFormats/Track.h"
14-
#include "Framework/runDataProcessing.h"
15-
#include "Framework/AnalysisTask.h"
16-
#include "Framework/AnalysisDataModel.h"
17-
#include "Framework/HistogramRegistry.h"
18-
#include "Framework/RunningWorkflowInfo.h"
19-
#include "ReconstructionDataFormats/TrackParametrization.h"
20-
#include "Common/DataModel/PIDResponse.h"
13+
#include "tableHMPIDPb.h"
14+
2115
#include "Common/Core/PID/PIDTOF.h"
22-
#include "Common/TableProducer/PID/pidTOFBase.h"
23-
#include "ReconstructionDataFormats/PID.h"
2416
#include "Common/Core/trackUtilities.h"
25-
#include "ReconstructionDataFormats/DCA.h"
26-
#include "Framework/ASoAHelpers.h"
27-
#include "Framework/ASoA.h"
17+
#include "Common/DataModel/Centrality.h"
2818
#include "Common/DataModel/EventSelection.h"
29-
#include "Common/DataModel/TrackSelectionTables.h"
30-
3119
#include "Common/DataModel/Multiplicity.h"
32-
#include "Common/DataModel/Centrality.h"
20+
#include "Common/DataModel/PIDResponse.h"
21+
#include "Common/DataModel/TrackSelectionTables.h"
22+
#include "Common/TableProducer/PID/pidTOFBase.h"
3323

34-
#include "tableHMPIDPb.h"
3524
#include "CCDB/BasicCCDBManager.h"
3625
#include "CCDB/CcdbApi.h"
26+
#include "Framework/ASoA.h"
27+
#include "Framework/ASoAHelpers.h"
28+
#include "Framework/AnalysisDataModel.h"
29+
#include "Framework/AnalysisTask.h"
30+
#include "Framework/HistogramRegistry.h"
31+
#include "Framework/RunningWorkflowInfo.h"
32+
#include "Framework/runDataProcessing.h"
33+
#include "ReconstructionDataFormats/DCA.h"
34+
#include "ReconstructionDataFormats/PID.h"
35+
#include "ReconstructionDataFormats/Track.h"
36+
#include "ReconstructionDataFormats/TrackParametrization.h"
3737

3838
#include <TTree.h>
3939

40-
41-
//CREATE AND FILL TABLE FOR PBPB COLLISIONS
40+
// CREATE AND FILL TABLE FOR PBPB COLLISIONS
4241

4342
using namespace o2;
4443
using namespace o2::framework;
@@ -50,15 +49,12 @@ struct pidHmpidAnalysisPb {
5049

5150
const AxisSpec axisEvtCounter{1, 0, +1, ""};
5251

53-
5452
// CCDB configurable
5553
Service<o2::ccdb::BasicCCDBManager> ccdb;
5654
struct : ConfigurableGroup {
5755
Configurable<std::string> ccdburl{"ccdb-url", "http://alice-ccdb.cern.ch", "url of the ccdb repository"};
5856
} ccdbConfig;
5957

60-
61-
6258
Produces<aod::HMPID_analysisPb> HMPID_analysisPb;
6359

6460
// using TrackCandidates = soa::Join<aod::Tracks, aod::TracksExtra, aod::TracksDCA, aod::TrackSelection>;
@@ -69,8 +65,7 @@ struct pidHmpidAnalysisPb {
6965
aod::pidTPCFullPi, aod::pidTPCFullKa, aod::pidTPCFullPr, aod::pidTPCFullDe,
7066
aod::pidTOFFullPi, aod::pidTOFFullKa, aod::pidTOFFullPr, aod::pidTOFFullDe>;
7167

72-
//using CentralityClass = o2::soa::Join<aod::Collisions, aod::EvSels, aod::Mults, aod::CentFV0As>;
73-
68+
// using CentralityClass = o2::soa::Join<aod::Collisions, aod::EvSels, aod::Mults, aod::CentFV0As>;
7469

7570
void init(o2::framework::InitContext&)
7671
{
@@ -82,7 +77,7 @@ struct pidHmpidAnalysisPb {
8277
histos.add("eventCounter", "eventCounter", kTH1F, {axisEvtCounter});
8378
}
8479

85-
//function to manage ccdb
80+
// function to manage ccdb
8681
int mCCDBRunNumber = 0;
8782
void initCCDB(aod::BCsWithTimestamps::iterator const& bc)
8883
{
@@ -92,25 +87,23 @@ struct pidHmpidAnalysisPb {
9287
mCCDBRunNumber = bc.runNumber();
9388
}
9489

95-
96-
97-
void process(soa::Join<aod::Collisions, aod::EvSels, aod::Mults, aod::CentFV0As>::iterator const& col,
98-
const aod::HMPIDs& hmpids,
99-
TrackCandidates const&,
100-
aod::BCsWithTimestamps const&)
90+
void process(soa::Join<aod::Collisions, aod::EvSels, aod::Mults, aod::CentFV0As>::iterator const& col,
91+
const aod::HMPIDs& hmpids,
92+
TrackCandidates const&,
93+
aod::BCsWithTimestamps const&)
10194
{
102-
histos.fill(HIST("eventCounter"), 0.5);
95+
histos.fill(HIST("eventCounter"), 0.5);
10396

10497
initCCDB(col.bc_as<aod::BCsWithTimestamps>());
10598

106-
10799
for (const auto& t : hmpids) {
108100

109-
//global tracks associated to hmpid tracks
101+
// global tracks associated to hmpid tracks
110102
const auto& global_track = t.track_as<TrackCandidates>();
111-
if (!global_track.isGlobalTrack()) continue;
112-
if (!global_track.hasITS() || !global_track.hasTPC() || !global_track.hasTOF()) continue;
113-
103+
if (!global_track.isGlobalTrack())
104+
continue;
105+
if (!global_track.hasITS() || !global_track.hasTPC() || !global_track.hasTOF())
106+
continue;
114107

115108
// Verifica se la collisione è accessibile
116109
if (!global_track.has_collision()) {
@@ -122,17 +115,17 @@ struct pidHmpidAnalysisPb {
122115
for (int i = 0; i < 10; i++) {
123116
hmpidPhotsCharge2[i] = t.hmpidPhotsCharge()[i];
124117
}
125-
118+
126119
float centrality = col.centFV0A();
127120

128121
/////FILL TABLE
129122
HMPID_analysisPb(t.hmpidSignal(), global_track.phi(), global_track.eta(), t.hmpidMom(),
130-
global_track.p(), t.hmpidXTrack(), t.hmpidYTrack(), t.hmpidXMip(),
131-
t.hmpidYMip(), t.hmpidNPhotons(), t.hmpidQMip(), (t.hmpidClusSize() % 1000000) / 1000, t.hmpidClusSize() / 1000000,
132-
hmpidPhotsCharge2, global_track.eta(), global_track.phi(), global_track.px(), global_track.py(), global_track.pz(),
133-
global_track.itsNCls(), global_track.tpcNClsFound(), global_track.tpcNClsCrossedRows(),global_track.tpcChi2NCl(), global_track.itsChi2NCl(),
134-
global_track.dcaXY(), global_track.dcaZ(), global_track.tpcNSigmaPi(), global_track.tofNSigmaPi(), global_track.tpcNSigmaKa(), global_track.tofNSigmaKa(),
135-
global_track.tpcNSigmaPr(), global_track.tofNSigmaPr(), global_track.tpcNSigmaDe(), global_track.tofNSigmaDe(),centrality);
123+
global_track.p(), t.hmpidXTrack(), t.hmpidYTrack(), t.hmpidXMip(),
124+
t.hmpidYMip(), t.hmpidNPhotons(), t.hmpidQMip(), (t.hmpidClusSize() % 1000000) / 1000, t.hmpidClusSize() / 1000000,
125+
hmpidPhotsCharge2, global_track.eta(), global_track.phi(), global_track.px(), global_track.py(), global_track.pz(),
126+
global_track.itsNCls(), global_track.tpcNClsFound(), global_track.tpcNClsCrossedRows(), global_track.tpcChi2NCl(), global_track.itsChi2NCl(),
127+
global_track.dcaXY(), global_track.dcaZ(), global_track.tpcNSigmaPi(), global_track.tofNSigmaPi(), global_track.tpcNSigmaKa(), global_track.tofNSigmaKa(),
128+
global_track.tpcNSigmaPr(), global_track.tofNSigmaPr(), global_track.tpcNSigmaDe(), global_track.tofNSigmaDe(), centrality);
136129
}
137130
}
138131
};

0 commit comments

Comments
 (0)