Skip to content

Commit b9ada60

Browse files
author
Mattia Faggin
committed
Fix some O2 Linter issues.
1 parent 9d25433 commit b9ada60

File tree

1 file changed

+52
-56
lines changed

1 file changed

+52
-56
lines changed

‎DPG/Tasks/AOTTrack/qaImpPar.cxx‎

Lines changed: 52 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,6 @@
99
// granted to it by virtue of its status as an Intergovernmental Organization
1010
// or submit itself to any jurisdiction.
1111
/// \author Mattia Faggin <mattia.faggin@cern.ch>, Padova University and INFN
12-
///
13-
/// Event selection: o2-analysis-timestamp --aod-file AO2D.root -b | o2-analysis-event-selection -b | ---> not working with Run2 converted data/MC
14-
/// Track selection: o2-analysis-trackextension | o2-analysis-trackselection | ---> add --isRun3 1 with Run 3 data/MC (then global track selection works)
15-
/// PID: o2-analysis-pid-tpc-full | o2-analysis-pid-tof-full
16-
/// Working configuration (2021 Oct 20th): o2-analysis-trackextension -b --aod-file ./AO2D.root | o2-analysis-trackselection -b --isRun3 1 | o2-analysis-pid-tpc-full -b | o2-analysis-pid-tof-full -b | o2-analysis-pp-qa-impact-parameter -b
1712

1813
#include <string>
1914

@@ -64,7 +59,7 @@ struct QaImpactPar {
6459
ConfigurableAxis binningPulls{"binningPulls", {200, -10.f, 10.f}, "Pulls binning"};
6560
ConfigurableAxis binningPt{"binningPt", {100, 0.f, 10.f}, "Pt binning"};
6661
ConfigurableAxis binningEta{"binningEta", {40, -2.f, 2.f}, "Eta binning"};
67-
ConfigurableAxis binningPhi{"binningPhi", {24, 0.f, TMath::TwoPi()}, "Phi binning"};
62+
ConfigurableAxis binningPhi{"binningPhi", {24, 0.f, o2::constants::math::TwoPI}, "Phi binning"};
6863
ConfigurableAxis binningPDG{"binningPDG", {5, -1.5f, 3.5f}, "PDG species binning (-1: not matched, 0: unknown, 1: pi, 2: K, 3: p)"};
6964
ConfigurableAxis binningCharge{"binningCharge", {2, -2.f, 2.f}, "charge binning (-1: negative; +1: positive)"};
7065
ConfigurableAxis binningIuPosX{"binningIuPosX", {100, -10.f, 10.f}, "Track IU x position"};
@@ -96,28 +91,28 @@ struct QaImpactPar {
9691
Configurable<float> nSigmaTOFProtonMax{"nSigmaTOFProtonMax", 99999.f, "Maximum nSigma value in TOF, proton hypothesis"};
9792
// PV refit
9893
Configurable<std::string> ccdburl{"ccdburl", "http://alice-ccdb.cern.ch", "url of the ccdb repository"};
99-
Configurable<std::string> ccdbpath_lut{"ccdbpath_lut", "GLO/Param/MatLUT", "Path for LUT parametrization"};
94+
Configurable<std::string> ccdbPathLut{"ccdbpath_lut", "GLO/Param/MatLUT", "Path for LUT parametrization"};
10095
// Configurable<std::string> ccdbpath_geo{"ccdbpath_geo", "GLO/Config/GeometryAligned", "Path of the geometry file"};
101-
Configurable<std::string> ccdbpath_grp{"ccdbpath_grp", "GLO/Config/GRPMagField", "CCDB path of the GRPMagField object"};
96+
Configurable<std::string> ccdbPathGrp{"ccdbpath_grp", "GLO/Config/GRPMagField", "CCDB path of the GRPMagField object"};
10297
Configurable<bool> doPVrefit{"doPVrefit", true, "Do PV refit"};
103-
Configurable<int> nBins_DeltaX_PVrefit{"nBins_DeltaX_PVrefit", 1000, "Number of bins of DeltaX for PV refit"};
104-
Configurable<int> nBins_DeltaY_PVrefit{"nBins_DeltaY_PVrefit", 1000, "Number of bins of DeltaY for PV refit"};
105-
Configurable<int> nBins_DeltaZ_PVrefit{"nBins_DeltaZ_PVrefit", 1000, "Number of bins of DeltaZ for PV refit"};
106-
Configurable<float> minDeltaX_PVrefit{"minDeltaX_PVrefit", -0.5, "Min. DeltaX value for PV refit (cm)"};
107-
Configurable<float> maxDeltaX_PVrefit{"maxDeltaX_PVrefit", 0.5, "Max. DeltaX value for PV refit (cm)"};
108-
Configurable<float> minDeltaY_PVrefit{"minDeltaY_PVrefit", -0.5, "Min. DeltaY value for PV refit (cm)"};
109-
Configurable<float> maxDeltaY_PVrefit{"maxDeltaY_PVrefit", 0.5, "Max. DeltaY value for PV refit (cm)"};
110-
Configurable<float> minDeltaZ_PVrefit{"minDeltaZ_PVrefit", -0.5, "Min. DeltaZ value for PV refit (cm)"};
111-
Configurable<float> maxDeltaZ_PVrefit{"maxDeltaZ_PVrefit", 0.5, "Max. DeltaZ value for PV refit (cm)"};
98+
Configurable<int> nBinsDeltaXPVrefit{"nBins_DeltaX_PVrefit", 1000, "Number of bins of DeltaX for PV refit"};
99+
Configurable<int> nBinsDeltaYPVrefit{"nBins_DeltaY_PVrefit", 1000, "Number of bins of DeltaY for PV refit"};
100+
Configurable<int> nBinsDeltaZPVrefit{"nBins_DeltaZ_PVrefit", 1000, "Number of bins of DeltaZ for PV refit"};
101+
Configurable<float> minDeltaXPVrefit{"minDeltaX_PVrefit", -0.5, "Min. DeltaX value for PV refit (cm)"};
102+
Configurable<float> maxDeltaXPVrefit{"maxDeltaX_PVrefit", 0.5, "Max. DeltaX value for PV refit (cm)"};
103+
Configurable<float> minDeltaYPVrefit{"minDeltaY_PVrefit", -0.5, "Min. DeltaY value for PV refit (cm)"};
104+
Configurable<float> maxDeltaYPVrefit{"maxDeltaY_PVrefit", 0.5, "Max. DeltaY value for PV refit (cm)"};
105+
Configurable<float> minDeltaZPVrefit{"minDeltaZ_PVrefit", -0.5, "Min. DeltaZ value for PV refit (cm)"};
106+
Configurable<float> maxDeltaZPVrefit{"maxDeltaZ_PVrefit", 0.5, "Max. DeltaZ value for PV refit (cm)"};
112107
Configurable<uint16_t> minPVcontrib{"minPVcontrib", 0, "Minimum number of PV contributors"};
113108
Configurable<uint16_t> maxPVcontrib{"maxPVcontrib", 10000, "Maximum number of PV contributors"};
114109
Configurable<bool> removeDiamondConstraint{"removeDiamondConstraint", true, "Remove the diamond constraint for the PV refit"};
115110
Configurable<bool> keepAllTracksPVrefit{"keepAllTracksPVrefit", false, "Keep all tracks for PV refit (for debug)"};
116-
Configurable<bool> use_customITSHitMap{"use_customITSHitMap", false, "Use custom ITS hitmap selection"};
111+
Configurable<bool> useCustomITSHitMap{"use_customITSHitMap", false, "Use custom ITS hitmap selection"};
117112
Configurable<int> customITShitmap{"customITShitmap", 0, "Custom ITS hitmap (consider the binary representation)"};
118113
Configurable<int> customITShitmap_exclude{"customITShitmap_exclude", 0, "Custom ITS hitmap of layers to be excluded (consider the binary representation)"};
119-
Configurable<int> n_customMinITShits{"n_customMinITShits", 0, "Minimum number of layers crossed by a track among those in \"customITShitmap\""};
120-
Configurable<bool> custom_forceITSTPCmatching{"custom_forceITSTPCmatching", false, "Consider or not only ITS-TPC macthed tracks when using custom ITS hitmap"};
114+
Configurable<int> nCustomMinITShits{"n_customMinITShits", 0, "Minimum number of layers crossed by a track among those in \"customITShitmap\""};
115+
Configurable<bool> customForceITSTPCmatching{"custom_forceITSTPCmatching", false, "Consider or not only ITS-TPC macthed tracks when using custom ITS hitmap"};
121116
Configurable<float> downsamplingFraction{"downsamplingFraction", 1.1, "Fraction of tracks to be used to fill the output objects"};
122117

123118
/// Custom cut selection objects
@@ -156,16 +151,16 @@ struct QaImpactPar {
156151
/////////////////////////////////////////////////////////////
157152

158153
/// Data
159-
using collisionRecoTable = o2::soa::Join<o2::aod::Collisions, o2::aod::EvSels>;
160-
using trackTable = o2::soa::Join<o2::aod::Tracks, o2::aod::TracksCov, o2::aod::TracksExtra>;
161-
using trackFullTable = o2::soa::Join<o2::aod::Tracks, o2::aod::TrackSelection, o2::aod::TracksCov, o2::aod::TracksExtra, o2::aod::TracksDCA, o2::aod::TracksDCACov,
154+
using CollisionRecoTable = o2::soa::Join<o2::aod::Collisions, o2::aod::EvSels>;
155+
using TrackTable = o2::soa::Join<o2::aod::Tracks, o2::aod::TracksCov, o2::aod::TracksExtra>;
156+
using TrackFullTable = o2::soa::Join<o2::aod::Tracks, o2::aod::TrackSelection, o2::aod::TracksCov, o2::aod::TracksExtra, o2::aod::TracksDCA, o2::aod::TracksDCACov,
162157
o2::aod::pidTPCFullPi, o2::aod::pidTPCFullKa, o2::aod::pidTPCFullPr,
163158
o2::aod::pidTOFFullPi, o2::aod::pidTOFFullKa, o2::aod::pidTOFFullPr>;
164-
using trackTableIU = o2::soa::Join<o2::aod::TracksIU, o2::aod::TracksCovIU, o2::aod::TracksExtra>;
165-
void processData(o2::soa::Filtered<collisionRecoTable>::iterator& collision,
166-
const trackTable& tracksUnfiltered,
167-
const o2::soa::Filtered<trackFullTable>& tracks,
168-
const trackTableIU& tracksIU,
159+
using TrackTableIU = o2::soa::Join<o2::aod::TracksIU, o2::aod::TracksCovIU, o2::aod::TracksExtra>;
160+
void processData(o2::soa::Filtered<CollisionRecoTable>::iterator const& collision,
161+
const TrackTable& tracksUnfiltered,
162+
const o2::soa::Filtered<TrackFullTable>& tracks,
163+
const TrackTableIU& tracksIU,
169164
o2::aod::BCsWithTimestamps const&)
170165
{
171166
/// here call the template processReco function
@@ -175,12 +170,12 @@ struct QaImpactPar {
175170
PROCESS_SWITCH(QaImpactPar, processData, "process data", true);
176171

177172
/// MC
178-
using collisionMCRecoTable = o2::soa::Join<collisionRecoTable, o2::aod::McCollisionLabels>;
179-
using trackMCFullTable = o2::soa::Join<trackFullTable, o2::aod::McTrackLabels>;
180-
void processMC(o2::soa::Filtered<collisionMCRecoTable>::iterator& collision,
181-
trackTable const& tracksUnfiltered,
182-
o2::soa::Filtered<trackMCFullTable> const& tracks,
183-
const trackTableIU& tracksIU,
173+
using CollisionMCRecoTable = o2::soa::Join<CollisionRecoTable, o2::aod::McCollisionLabels>;
174+
using TrackMCFullTable = o2::soa::Join<TrackFullTable, o2::aod::McTrackLabels>;
175+
void processMC(o2::soa::Filtered<CollisionMCRecoTable>::iterator const& collision,
176+
TrackTable const& tracksUnfiltered,
177+
o2::soa::Filtered<TrackMCFullTable> const& tracks,
178+
const TrackTableIU& tracksIU,
184179
const o2::aod::McParticles& mcParticles,
185180
const o2::aod::McCollisions&,
186181
o2::aod::BCsWithTimestamps const&)
@@ -193,7 +188,7 @@ struct QaImpactPar {
193188

194189
/// core template process function
195190
/// template<bool IS_MC, typename C, typename T, typename T_MC>
196-
/// void processReco(const C& collision, const trackTable& unfilteredTracks, const T& tracks,
191+
/// void processReco(const C& collision, const TrackTable& unfilteredTracks, const T& tracks,
197192
/// const T_MC& mcParticles,
198193
/// o2::aod::BCsWithTimestamps const& bcs);
199194

@@ -210,9 +205,9 @@ struct QaImpactPar {
210205
const AxisSpec collisionYOrigAxis{1000, -20.f, 20.f, "Y original PV (cm)"};
211206
const AxisSpec collisionZOrigAxis{1000, -20.f, 20.f, "Z original PV (cm)"};
212207
const AxisSpec collisionNumberContributorAxis{1000, 0, 1000, "Number of contributors"};
213-
const AxisSpec collisionDeltaX_PVrefit{nBins_DeltaX_PVrefit, minDeltaX_PVrefit, maxDeltaX_PVrefit, "#Delta x_{PV} (cm)"};
214-
const AxisSpec collisionDeltaY_PVrefit{nBins_DeltaY_PVrefit, minDeltaY_PVrefit, maxDeltaY_PVrefit, "#Delta y_{PV} (cm)"};
215-
const AxisSpec collisionDeltaZ_PVrefit{nBins_DeltaZ_PVrefit, minDeltaZ_PVrefit, maxDeltaZ_PVrefit, "#Delta z_{PV} (cm)"};
208+
const AxisSpec collisionDeltaX_PVrefit{nBinsDeltaXPVrefit, minDeltaXPVrefit, maxDeltaXPVrefit, "#Delta x_{PV} (cm)"};
209+
const AxisSpec collisionDeltaY_PVrefit{nBinsDeltaYPVrefit, minDeltaYPVrefit, maxDeltaYPVrefit, "#Delta y_{PV} (cm)"};
210+
const AxisSpec collisionDeltaZ_PVrefit{nBinsDeltaZPVrefit, minDeltaZPVrefit, maxDeltaZPVrefit, "#Delta z_{PV} (cm)"};
216211

217212
histograms.add("Reco/vertices", "", kTH1D, {{2, 0.5f, 2.5f, ""}});
218213
histograms.get<TH1>(HIST("Reco/vertices"))->GetXaxis()->SetBinLabel(1, "All PV");
@@ -239,37 +234,38 @@ struct QaImpactPar {
239234
ccdb->setURL(ccdburl);
240235
ccdb->setCaching(true);
241236
ccdb->setLocalObjectValidityChecking();
242-
lut = o2::base::MatLayerCylSet::rectifyPtrFromFile(ccdb->get<o2::base::MatLayerCylSet>(ccdbpath_lut));
237+
lut = o2::base::MatLayerCylSet::rectifyPtrFromFile(ccdb->get<o2::base::MatLayerCylSet>(ccdbPathLut));
243238
// if (!o2::base::GeometryManager::isGeometryLoaded()) {
244239
// ccdb->get<TGeoManager>(ccdbpath_geo);
245240
// }
246241
mRunNumber = -1;
247242

248243
/// Custom cut selection objects - ITS layers that must be present
249244
std::set<uint8_t> set_customITShitmap; // = {};
250-
if (use_customITSHitMap) {
251-
for (int index_ITSlayer = 0; index_ITSlayer < 7; index_ITSlayer++) {
252-
if ((customITShitmap & (1 << index_ITSlayer)) > 0) {
253-
set_customITShitmap.insert(static_cast<uint8_t>(index_ITSlayer));
245+
constexpr std::size_t NLayersIts = 7;
246+
if (useCustomITSHitMap) {
247+
for (std::size_t indexItsLayer = 0; indexItsLayer < NLayersIts; indexItsLayer++) {
248+
if ((customITShitmap & (1 << indexItsLayer)) > 0) {
249+
set_customITShitmap.insert(static_cast<uint8_t>(indexItsLayer));
254250
}
255251
}
256252
LOG(info) << "### customITShitmap: " << customITShitmap;
257-
LOG(info) << "### n_customMinITShits: " << n_customMinITShits;
253+
LOG(info) << "### nCustomMinITShits: " << nCustomMinITShits;
258254
LOG(info) << "### set_customITShitmap.size(): " << set_customITShitmap.size();
259255
LOG(info) << "### Custom ITS hitmap checked: ";
260256
for (std::set<uint8_t>::iterator it = set_customITShitmap.begin(); it != set_customITShitmap.end(); it++) {
261257
LOG(info) << "Layer " << static_cast<int>(*it) << " ";
262258
}
263259
LOG(info) << "############";
264260

265-
selector_ITShitmap.SetRequireHitsInITSLayers(n_customMinITShits, set_customITShitmap);
261+
selector_ITShitmap.SetRequireHitsInITSLayers(nCustomMinITShits, set_customITShitmap);
266262
}
267263
/// Custom cut selection objects - ITS layers that must be absent
268264
std::set<uint8_t> set_customITShitmap_exclude; // = {};
269-
if (use_customITSHitMap) {
270-
for (int index_ITSlayer = 0; index_ITSlayer < 7; index_ITSlayer++) {
271-
if ((customITShitmap_exclude & (1 << index_ITSlayer)) > 0) {
272-
set_customITShitmap_exclude.insert(static_cast<uint8_t>(index_ITSlayer));
265+
if (useCustomITSHitMap) {
266+
for (std::size_t indexItsLayer = 0; indexItsLayer < NLayersIts; indexItsLayer++) {
267+
if ((customITShitmap_exclude & (1 << indexItsLayer)) > 0) {
268+
set_customITShitmap_exclude.insert(static_cast<uint8_t>(indexItsLayer));
273269
}
274270
}
275271
LOG(info) << "### customITShitmap_exclude: " << customITShitmap_exclude;
@@ -372,8 +368,8 @@ struct QaImpactPar {
372368

373369
/// core template process function
374370
template <bool IS_MC, typename C, typename T, typename T_MC>
375-
void processReco(const C& collision, const trackTable& unfilteredTracks, const T& tracks,
376-
const trackTableIU& tracksIU, const T_MC& /*mcParticles*/,
371+
void processReco(const C& collision, const TrackTable& unfilteredTracks, const T& tracks,
372+
const TrackTableIU& tracksIU, const T_MC& /*mcParticles*/,
377373
o2::aod::BCsWithTimestamps::iterator const& bc)
378374
{
379375
constexpr float toMicrometers = 10000.f; // Conversion from [cm] to [mum]
@@ -454,7 +450,7 @@ struct QaImpactPar {
454450
o2::base::Propagator::MatCorrType matCorr = o2::base::Propagator::MatCorrType::USEMatCorrLUT;
455451
// auto bc = collision.bc_as<o2::aod::BCsWithTimestamps>();
456452
if (mRunNumber != bc.runNumber()) {
457-
o2::parameters::GRPMagField* grpo = ccdb->getForTimeStamp<o2::parameters::GRPMagField>(ccdbpath_grp, bc.timestamp());
453+
o2::parameters::GRPMagField* grpo = ccdb->getForTimeStamp<o2::parameters::GRPMagField>(ccdbPathGrp, bc.timestamp());
458454
if (grpo != nullptr) {
459455
o2::base::Propagator::initFieldFromGRP(grpo);
460456
o2::base::Propagator::Instance()->setMatLUT(lut);
@@ -556,12 +552,12 @@ struct QaImpactPar {
556552
///}
557553

558554
/// apply custom ITS hitmap selections, if asked
559-
if (use_customITSHitMap && !selector_ITShitmap.IsSelected(track, TrackSelection::TrackCuts::kITSHits)) {
555+
if (useCustomITSHitMap && !selector_ITShitmap.IsSelected(track, TrackSelection::TrackCuts::kITSHits)) {
560556
/// skip this track and go on, because it does not satisfy the ITS hit requirements
561557
continue;
562558
}
563-
if (use_customITSHitMap && custom_forceITSTPCmatching && (!track.hasITS() || !track.hasTPC())) {
564-
// if (use_customITSHitMap && custom_forceITSTPCmatching && track.hasITS()) { ///ATTEMPT: REMOVE TRACKS WITH ITS
559+
if (useCustomITSHitMap && customForceITSTPCmatching && (!track.hasITS() || !track.hasTPC())) {
560+
// if (useCustomITSHitMap && customForceITSTPCmatching && track.hasITS()) { ///ATTEMPT: REMOVE TRACKS WITH ITS
565561
/// skip this track because it is not global (no matching ITS-TPC)
566562
continue;
567563
}
@@ -776,6 +772,6 @@ struct QaImpactPar {
776772
WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
777773
{
778774
WorkflowSpec w{
779-
adaptAnalysisTask<QaImpactPar>(cfgc, TaskName{"qa-impact-par"})};
775+
adaptAnalysisTask<QaImpactPar>(cfgc)};
780776
return w;
781777
}

0 commit comments

Comments
 (0)