Skip to content

Commit 7f7a9b9

Browse files
committed
Fixing linter
1 parent 34fb7ae commit 7f7a9b9

File tree

8 files changed

+19
-15
lines changed

8 files changed

+19
-15
lines changed

DPG/Tasks/AOTTrack/PID/HMPID/CMakeLists.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,26 +11,26 @@
1111

1212
# HMPID
1313
o2physics_add_dpl_workflow(pid-hmpid-qa-pp
14-
SOURCES qaHMPID_pp.cxx
14+
SOURCES pidHmpidQaPp.cxx
1515
PUBLIC_LINK_LIBRARIES O2::HMPIDBase O2Physics::AnalysisCore
1616
COMPONENT_NAME Analysis)
1717

1818
o2physics_add_dpl_workflow(pid-hmpid-qa-pb
19-
SOURCES qaHMPID_pb.cxx
19+
SOURCES pidHmpidQaPb.cxx
2020
PUBLIC_LINK_LIBRARIES O2::HMPIDBase O2Physics::AnalysisCore
2121
COMPONENT_NAME Analysis)
2222

2323
o2physics_add_dpl_workflow(pid-hmpid
24-
SOURCES analysisHMPID.cxx
24+
SOURCES pidHmpid.cxx
2525
PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore
2626
COMPONENT_NAME Analysis)
2727

2828
o2physics_add_dpl_workflow(pid-hmpid-pbpb
29-
SOURCES analysisHMPID_pb.cxx
29+
SOURCES pidHmpidPbpb.cxx
3030
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore O2::DetectorsBase
3131
COMPONENT_NAME Analysis)
3232

3333
o2physics_add_dpl_workflow(pid-hmpid-deuteron
34-
SOURCES deuteronCS_HMPID.cxx
34+
SOURCES pidHmpidDeuteron.cxx
3535
PUBLIC_LINK_LIBRARIES O2::Framework O2::DetectorsBase O2::ReconstructionDataFormats O2Physics::AnalysisCore
3636
COMPONENT_NAME Analysis)

DPG/Tasks/AOTTrack/PID/HMPID/analysisHMPID.cxx renamed to DPG/Tasks/AOTTrack/PID/HMPID/pidHmpid.cxx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ struct pidHmpidAnalysis {
5151
// CCDB configurable
5252
Service<o2::ccdb::BasicCCDBManager> ccdb;
5353
struct : ConfigurableGroup {
54-
Configurable<std::string> ccdburl{"ccdb-url", "http://alice-ccdb.cern.ch", "url of the ccdb repository"};
54+
Configurable<std::string> ccdbUrl{"ccdbUrl", "http://alice-ccdb.cern.ch", "URL of the CCDB repository"};
5555
} ccdbConfig;
5656

5757
Produces<aod::HMPID_analysis> HMPID_analysis;
@@ -67,7 +67,7 @@ struct pidHmpidAnalysis {
6767
void init(o2::framework::InitContext&)
6868
{
6969
// Configure CCDB
70-
ccdb->setURL(ccdbConfig.ccdburl);
70+
ccdb->setURL(ccdbConfig.ccdbUrl);
7171
ccdb->setCaching(true);
7272
ccdb->setLocalObjectValidityChecking();
7373

@@ -103,9 +103,9 @@ struct pidHmpidAnalysis {
103103
if (!global_track.hasITS() || !global_track.hasTPC() || !global_track.hasTOF())
104104
continue;
105105

106-
float hmpidPhotsCharge2[10];
106+
float hmpidPhotsCharge2[DIM_PHOTSCHARGE];
107107

108-
for (int i = 0; i < 10; i++) {
108+
for (int i = 0; i < DIM_PHOTSCHARGE; i++) {
109109
hmpidPhotsCharge2[i] = t.hmpidPhotsCharge()[i];
110110
}
111111

File renamed without changes.

DPG/Tasks/AOTTrack/PID/HMPID/analysisHMPID_pb.cxx renamed to DPG/Tasks/AOTTrack/PID/HMPID/pidHmpidPbpb.cxx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ struct pidHmpidAnalysisPb {
5555
// CCDB configurable
5656
Service<o2::ccdb::BasicCCDBManager> ccdb;
5757
struct : ConfigurableGroup {
58-
Configurable<std::string> ccdburl{"ccdb-url", "http://alice-ccdb.cern.ch", "url of the ccdb repository"};
58+
Configurable<std::string> ccdbUrl{"ccdbUrl", "http://alice-ccdb.cern.ch", "URL of the CCDB repository"};
5959
} ccdbConfig;
6060

6161
Produces<aod::HMPID_analysisPb> HMPID_analysisPb;
@@ -73,7 +73,7 @@ struct pidHmpidAnalysisPb {
7373
void init(o2::framework::InitContext&)
7474
{
7575
// Configure CCDB
76-
ccdb->setURL(ccdbConfig.ccdburl);
76+
ccdb->setURL(ccdbConfig.ccdbUrl);
7777
ccdb->setCaching(true);
7878
ccdb->setLocalObjectValidityChecking();
7979

@@ -113,9 +113,9 @@ struct pidHmpidAnalysisPb {
113113
continue;
114114
}
115115

116-
float hmpidPhotsCharge2[10];
116+
float hmpidPhotsCharge2[DIM_PHOTSCHARGE];
117117

118-
for (int i = 0; i < 10; i++) {
118+
for (int i = 0; i < DIM_PHOTSCHARGE; i++) {
119119
hmpidPhotsCharge2[i] = t.hmpidPhotsCharge()[i];
120120
}
121121

File renamed without changes.
File renamed without changes.

DPG/Tasks/AOTTrack/PID/HMPID/tableHMPID.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ using namespace o2::framework;
2020
using namespace o2::framework::expressions;
2121
using namespace o2::constants::physics;
2222

23+
#define DIM_PHOTSCHARGE 10
24+
2325
namespace o2::aod
2426
{
2527

@@ -38,7 +40,7 @@ DECLARE_SOA_COLUMN(Nphotons, nphotons, float);
3840
DECLARE_SOA_COLUMN(ChargeMIP, chargeMIP, float);
3941
DECLARE_SOA_COLUMN(ClusterSize, clustersize, float);
4042
DECLARE_SOA_COLUMN(Chamber, chamber, float);
41-
DECLARE_SOA_COLUMN(Photons_charge, photons_charge, float[10]);
43+
DECLARE_SOA_COLUMN(Photons_charge, photons_charge, float[DIM_PHOTSCHARGE]);
4244

4345
DECLARE_SOA_COLUMN(EtaTrack, etatrack, float);
4446
DECLARE_SOA_COLUMN(PhiTrack, phitrack, float);
@@ -78,4 +80,4 @@ DECLARE_SOA_TABLE(HMPID_analysis, "AOD", "HMPIDANALYSIS",
7880
variables_table::TPCNSigmaPr, variables_table::TOFNSigmaPr, variables_table::TPCNSigmaDe, variables_table::TOFNSigmaDe);
7981
} // namespace o2::aod
8082

81-
#endif //DPG_TASKS_AOTTRACK_PID_HMPID_TABLEHMPID_H_
83+
#endif // DPG_TASKS_AOTTRACK_PID_HMPID_TABLEHMPID_H_

DPG/Tasks/AOTTrack/PID/HMPID/tableHMPIDPb.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ using namespace o2::framework;
2020
using namespace o2::framework::expressions;
2121
using namespace o2::constants::physics;
2222

23+
#define DIM_PHOTSCHARGE 10
24+
2325
namespace o2::aod
2426
{
2527

0 commit comments

Comments
 (0)