Skip to content

Commit 84f0fe8

Browse files
victor-gonzalezVictor
victor-gonzalez
and
Victor
authored
[PWGCF] DptDpt -- Implementing linter recommendations (#9067)
Co-authored-by: Victor <victor@cern.ch>
1 parent 620a93b commit 84f0fe8

File tree

3 files changed

+108
-103
lines changed

3 files changed

+108
-103
lines changed

‎PWGCF/Tasks/CMakeLists.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@ o2physics_add_dpl_workflow(dptdptcorrelations
1414
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore O2Physics::PWGCFCore
1515
COMPONENT_NAME Analysis)
1616

17-
o2physics_add_dpl_workflow(dptdpt-filter-qa
18-
SOURCES dptdptfilterqa.cxx
17+
o2physics_add_dpl_workflow(dpt-dpt-filter-qa
18+
SOURCES dptDptFilterQa.cxx
1919
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore O2Physics::PWGCFCore
2020
COMPONENT_NAME Analysis)
2121

2222
o2physics_add_dpl_workflow(match-reco-gen
23-
SOURCES match-reco-gen.cxx
23+
SOURCES matchRecoGen.cxx
2424
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore O2Physics::PWGCFCore
2525
COMPONENT_NAME Analysis)
2626

PWGCF/Tasks/dptdptfilterqa.cxx renamed to PWGCF/Tasks/dptDptFilterQa.cxx

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

12+
/// \file dptDptFilterQa.cxx
13+
/// \brief basic checks for the behavior of the filter task
14+
/// \author victor.gonzalez.sebastian@gmail.com
15+
1216
#include <cmath>
17+
#include <string>
1318

1419
#include "Framework/ASoAHelpers.h"
1520
#include "Framework/AnalysisDataModel.h"
@@ -30,12 +35,12 @@ namespace o2::analysis::dptdptfilterqa
3035
{
3136
typedef enum { kRECO = 0,
3237
kGEN } innerdatatype;
33-
static constexpr std::string_view dirname[] = {"reconstructed/", "generated/"};
38+
static constexpr std::string_view Dirname[] = {"reconstructed/", "generated/"};
3439
} // namespace o2::analysis::dptdptfilterqa
3540

3641
// Checking the filtered tables
37-
struct DptDptFilterQA {
38-
Configurable<std::string> cfgDataType{"datatype", "data", "Data type: data, MC, FastMC, OnTheFlyMC. Default data"};
42+
struct DptDptFilterQa {
43+
Configurable<std::string> cfgDataType{"cfgDataType", "data", "Data type: data, MC, FastMC, OnTheFlyMC. Default data"};
3944
HistogramRegistry histos{"DptDptFilterQA", {}, OutputObjHandlingPolicy::AnalysisObject, true, true};
4045
o2::analysis::dptdptfilter::DataType datatype;
4146

@@ -45,17 +50,17 @@ struct DptDptFilterQA {
4550

4651
using namespace o2::analysis::dptdptfilterqa;
4752

48-
histos.add(TString::Format("%s%s", dirname[dir].data(), "TracksOne").Data(), "Tracks as track one", kTH1F, {{1500, 0.0, 1500.0, "number of tracks"}});
49-
histos.add(TString::Format("%s%s", dirname[dir].data(), "TracksTwo").Data(), "Tracks as track two", kTH1F, {{1500, 0.0, 1500.0, "number of tracks"}});
50-
histos.add(TString::Format("%s%s", dirname[dir].data(), "TracksOneAndTwo").Data(), "Tracks as track one and as track two", kTH1F, {{1500, 0.0, 1500.0, "number of tracks"}});
51-
histos.add(TString::Format("%s%s", dirname[dir].data(), "TracksNone").Data(), "Not selected tracks", kTH1F, {{1500, 0.0, 1500.0, "number of tracks"}});
52-
histos.add(TString::Format("%s%s", dirname[dir].data(), "TracksOneUnsel").Data(), "Tracks as track one", kTH1F, {{1500, 0.0, 1500.0, "number of tracks"}});
53-
histos.add(TString::Format("%s%s", dirname[dir].data(), "TracksTwoUnsel").Data(), "Tracks as track two", kTH1F, {{1500, 0.0, 1500.0, "number of tracks"}});
54-
histos.add(TString::Format("%s%s", dirname[dir].data(), "TracksOneAndTwoUnsel").Data(), "Tracks as track one and as track two", kTH1F, {{1500, 0.0, 1500.0, "number of tracks"}});
55-
histos.add(TString::Format("%s%s", dirname[dir].data(), "TracksNoneUnsel").Data(), "Not selected tracks", kTH1F, {{1500, 0.0, 1500.0}});
56-
histos.add(TString::Format("%s%s", dirname[dir].data(), "SelectedEvents").Data(), "Selected events", kTH1F, {{2, 0.0, 2.0}});
57-
histos.get<TH1>(HIST(dirname[dir]) + HIST("SelectedEvents"))->GetXaxis()->SetBinLabel(1, "Not selected events");
58-
histos.get<TH1>(HIST(dirname[dir]) + HIST("SelectedEvents"))->GetXaxis()->SetBinLabel(2, "Selected events");
53+
histos.add(TString::Format("%s%s", Dirname[dir].data(), "TracksOne").Data(), "Tracks as track one", kTH1F, {{1500, 0.0, 1500.0, "number of tracks"}});
54+
histos.add(TString::Format("%s%s", Dirname[dir].data(), "TracksTwo").Data(), "Tracks as track two", kTH1F, {{1500, 0.0, 1500.0, "number of tracks"}});
55+
histos.add(TString::Format("%s%s", Dirname[dir].data(), "TracksOneAndTwo").Data(), "Tracks as track one and as track two", kTH1F, {{1500, 0.0, 1500.0, "number of tracks"}});
56+
histos.add(TString::Format("%s%s", Dirname[dir].data(), "TracksNone").Data(), "Not selected tracks", kTH1F, {{1500, 0.0, 1500.0, "number of tracks"}});
57+
histos.add(TString::Format("%s%s", Dirname[dir].data(), "TracksOneUnsel").Data(), "Tracks as track one", kTH1F, {{1500, 0.0, 1500.0, "number of tracks"}});
58+
histos.add(TString::Format("%s%s", Dirname[dir].data(), "TracksTwoUnsel").Data(), "Tracks as track two", kTH1F, {{1500, 0.0, 1500.0, "number of tracks"}});
59+
histos.add(TString::Format("%s%s", Dirname[dir].data(), "TracksOneAndTwoUnsel").Data(), "Tracks as track one and as track two", kTH1F, {{1500, 0.0, 1500.0, "number of tracks"}});
60+
histos.add(TString::Format("%s%s", Dirname[dir].data(), "TracksNoneUnsel").Data(), "Not selected tracks", kTH1F, {{1500, 0.0, 1500.0}});
61+
histos.add(TString::Format("%s%s", Dirname[dir].data(), "SelectedEvents").Data(), "Selected events", kTH1F, {{2, 0.0, 2.0}});
62+
histos.get<TH1>(HIST(Dirname[dir]) + HIST("SelectedEvents"))->GetXaxis()->SetBinLabel(1, "Not selected events");
63+
histos.get<TH1>(HIST(Dirname[dir]) + HIST("SelectedEvents"))->GetXaxis()->SetBinLabel(2, "Selected events");
5964
};
6065

6166
void init(InitContext const&)
@@ -88,40 +93,40 @@ struct DptDptFilterQA {
8893
using namespace o2::analysis::dptdptfilterqa;
8994

9095
if (collision.collisionaccepted() != uint8_t(true)) {
91-
histos.fill(HIST(dirname[dir]) + HIST("SelectedEvents"), 0.5);
96+
histos.fill(HIST(Dirname[dir]) + HIST("SelectedEvents"), 0.5);
9297
} else {
93-
histos.fill(HIST(dirname[dir]) + HIST("SelectedEvents"), 1.5);
98+
histos.fill(HIST(Dirname[dir]) + HIST("SelectedEvents"), 1.5);
9499
}
95100

96-
int ntracks_one = 0;
97-
int ntracks_two = 0;
98-
int ntracks_one_and_two = 0;
99-
int ntracks_none = 0;
100-
for (auto& track : tracks) {
101+
int nTracksOne = 0;
102+
int nTracksTwo = 0;
103+
int nTracksOneAndTwo = 0;
104+
int nTracksNone = 0;
105+
for (auto const& track : tracks) {
101106
if (!(track.trackacceptedid() < 0) && !(track.trackacceptedid() < 2)) {
102107
LOGF(fatal, "Task not prepared for identified particles");
103108
}
104109
if (track.trackacceptedid() != 0 && track.trackacceptedid() != 1) {
105-
ntracks_none++;
110+
nTracksNone++;
106111
}
107112
if (track.trackacceptedid() == 0) {
108-
ntracks_one++;
113+
nTracksOne++;
109114
}
110115
if (track.trackacceptedid() == 1) {
111-
ntracks_two++;
116+
nTracksTwo++;
112117
}
113118
}
114119
if (collision.collisionaccepted() != uint8_t(true)) {
115120
/* control for non selected events */
116-
histos.fill(HIST(dirname[dir]) + HIST("TracksOneUnsel"), ntracks_one);
117-
histos.fill(HIST(dirname[dir]) + HIST("TracksTwoUnsel"), ntracks_two);
118-
histos.fill(HIST(dirname[dir]) + HIST("TracksNoneUnsel"), ntracks_none);
119-
histos.fill(HIST(dirname[dir]) + HIST("TracksOneAndTwoUnsel"), ntracks_one_and_two);
121+
histos.fill(HIST(Dirname[dir]) + HIST("TracksOneUnsel"), nTracksOne);
122+
histos.fill(HIST(Dirname[dir]) + HIST("TracksTwoUnsel"), nTracksTwo);
123+
histos.fill(HIST(Dirname[dir]) + HIST("TracksNoneUnsel"), nTracksNone);
124+
histos.fill(HIST(Dirname[dir]) + HIST("TracksOneAndTwoUnsel"), nTracksOneAndTwo);
120125
} else {
121-
histos.fill(HIST(dirname[dir]) + HIST("TracksOne"), ntracks_one);
122-
histos.fill(HIST(dirname[dir]) + HIST("TracksTwo"), ntracks_two);
123-
histos.fill(HIST(dirname[dir]) + HIST("TracksNone"), ntracks_none);
124-
histos.fill(HIST(dirname[dir]) + HIST("TracksOneAndTwo"), ntracks_one_and_two);
126+
histos.fill(HIST(Dirname[dir]) + HIST("TracksOne"), nTracksOne);
127+
histos.fill(HIST(Dirname[dir]) + HIST("TracksTwo"), nTracksTwo);
128+
histos.fill(HIST(Dirname[dir]) + HIST("TracksNone"), nTracksNone);
129+
histos.fill(HIST(Dirname[dir]) + HIST("TracksOneAndTwo"), nTracksOneAndTwo);
125130
}
126131
}
127132

@@ -134,19 +139,19 @@ struct DptDptFilterQA {
134139
LOGF(DPTDPTFILTERLOGCOLLISIONS, "New filtered generated collision with BC id %d and with %d accepted tracks", collision.bcId(), tracks.size());
135140
processQATask<kGEN>(collision, tracks);
136141
}
137-
PROCESS_SWITCH(DptDptFilterQA, processGeneratorLevel, "Process generator level filter task QA", true);
142+
PROCESS_SWITCH(DptDptFilterQa, processGeneratorLevel, "Process generator level filter task QA", true);
138143

139144
void processDetectorLevel(soa::Filtered<aod::DptDptCFAcceptedCollisions>::iterator const& collision, soa::Filtered<aod::ScannedTracks> const& tracks)
140145
{
141146
using namespace o2::analysis::dptdptfilterqa;
142147
LOGF(DPTDPTFILTERLOGCOLLISIONS, "New filtered collision with BC id %d and with %d accepted tracks", collision.bcId(), tracks.size());
143148
processQATask<kRECO>(collision, tracks);
144149
}
145-
PROCESS_SWITCH(DptDptFilterQA, processDetectorLevel, "Process detector level filter task QA", true);
150+
PROCESS_SWITCH(DptDptFilterQa, processDetectorLevel, "Process detector level filter task QA", true);
146151
};
147152

148153
WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
149154
{
150-
WorkflowSpec workflow{adaptAnalysisTask<DptDptFilterQA>(cfgc)};
155+
WorkflowSpec workflow{adaptAnalysisTask<DptDptFilterQa>(cfgc)};
151156
return workflow;
152157
}

0 commit comments

Comments
 (0)