Skip to content

Commit 52c528e

Browse files
hkoleyhkoley
authored
fixed unneccesary casts and linter issue
1 parent 2fb0bc3 commit 52c528e

File tree

1 file changed

+33
-35
lines changed

1 file changed

+33
-35
lines changed

‎PWGLF/Tasks/Resonances/lambda1520analysisinpp.cxx‎

Lines changed: 33 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ struct Lambda1520analysisinpp {
8888
o2::analysis::CollisonCuts colCuts;
8989

9090
struct : ConfigurableGroup {
91-
Configurable<float> cfgEvtZvtx{"cfgEvtZvtx", 10.f, "Evt sel: Max. z-Vertex (cm)"};
91+
Configurable<float> cfgEvtZvtx{"cfgEvtZvtx", 10.0, "Evt sel: Max. z-Vertex (cm)"};
9292
Configurable<int> cfgEvtOccupancyInTimeRangeMax{"cfgEvtOccupancyInTimeRangeMax", -1, "Evt sel: maximum track occupancy"};
9393
Configurable<int> cfgEvtOccupancyInTimeRangeMin{"cfgEvtOccupancyInTimeRangeMin", -1, "Evt sel: minimum track occupancy"};
9494
Configurable<bool> cfgEvtTriggerCheck{"cfgEvtTriggerCheck", false, "Evt sel: check for trigger"};
@@ -105,17 +105,17 @@ struct Lambda1520analysisinpp {
105105
struct : ConfigurableGroup {
106106
// Pre-selection Track cuts
107107
Configurable<int> trackSelection{"trackSelection", 0, "Track selection: 0 -> No Cut, 1 -> kGlobalTrack, 2 -> kGlobalTrackWoPtEta, 3 -> kGlobalTrackWoDCA, 4 -> kQualityTracks, 5 -> kInAcceptanceTracks"};
108-
Configurable<float> cMinPtcut{"cMinPtcut", 0.15f, "Minimal pT for tracks"};
108+
Configurable<float> cMinPtcut{"cMinPtcut", 0.15, "Minimal pT for tracks"};
109109
Configurable<float> cMinTPCNClsFound{"cMinTPCNClsFound", 120, "minimum TPCNClsFound value for good track"};
110110
Configurable<float> cfgCutEta{"cfgCutEta", 0.8, "Eta range for tracks"};
111111
Configurable<float> cfgCutRapidity{"cfgCutRapidity", 0.5, "rapidity range for particles"};
112112
Configurable<int> cfgMinCrossedRows{"cfgMinCrossedRows", 70, "min crossed rows for good track"};
113113

114114
// DCA Selections
115115
// DCAr to PV
116-
Configurable<float> cMaxDCArToPVcut{"cMaxDCArToPVcut", 0.1f, "Track DCAr cut to PV Maximum"};
116+
Configurable<float> cMaxDCArToPVcut{"cMaxDCArToPVcut", 0.1, "Track DCAr cut to PV Maximum"};
117117
// DCAz to PV
118-
Configurable<float> cMaxDCAzToPVcut{"cMaxDCAzToPVcut", 0.1f, "Track DCAz cut to PV Maximum"};
118+
Configurable<float> cMaxDCAzToPVcut{"cMaxDCAzToPVcut", 0.1, "Track DCAz cut to PV Maximum"};
119119

120120
// Track selections
121121
Configurable<bool> cfgPrimaryTrack{"cfgPrimaryTrack", true, "Primary track selection"}; // kGoldenChi2 | kDCAxy | kDCAz
@@ -131,7 +131,7 @@ struct Lambda1520analysisinpp {
131131

132132
struct : ConfigurableGroup {
133133
/// PID Selections
134-
Configurable<float> pidnSigmaPreSelectionCut{"pidnSigmaPreSelectionCut", 4.0f, "pidnSigma Cut for pre-selection of tracks"};
134+
Configurable<float> pidnSigmaPreSelectionCut{"pidnSigmaPreSelectionCut", 4.0, "pidnSigma Cut for pre-selection of tracks"};
135135
Configurable<bool> cByPassTOF{"cByPassTOF", false, "By pass TOF PID selection"}; // By pass TOF PID selection
136136
Configurable<int> cPIDcutType{"cPIDcutType", 2, "cPIDcutType = 1 for square cut, 2 for circular cut"}; // By pass TOF PID selection
137137

@@ -155,8 +155,8 @@ struct Lambda1520analysisinpp {
155155
struct : ConfigurableGroup {
156156
/// Event Mixing
157157
Configurable<int> nEvtMixing{"nEvtMixing", 10, "Number of events to mix"};
158-
ConfigurableAxis cfgVtxBins{"cfgVtxBins", {VARIABLE_WIDTH, -10.0f, -8.f, -6.f, -4.f, -2.f, 0.f, 2.f, 4.f, 6.f, 8.f, 10.f}, "Mixing bins - z-vertex"};
159-
ConfigurableAxis cfgMultBins{"cfgMultBins", {VARIABLE_WIDTH, 0.0f, 5.0f, 10.0f, 20.0f, 30.0f, 40.0f, 50.0f, 60.0f, 70.0f, 80.0f, 90.0f, 100.0f, 110.0f}, "Mixing bins - multiplicity"};
158+
ConfigurableAxis cfgVtxBins{"cfgVtxBins", {VARIABLE_WIDTH, -10.0, -8.0, -6.0, -4.0, -2.0, 0.0, 2.0, 4.0, 6.0, 8.0, 10.0}, "Mixing bins - z-vertex"};
159+
ConfigurableAxis cfgMultBins{"cfgMultBins", {VARIABLE_WIDTH, 0.0, 5.0, 10.0, 20.0, 30.0, 40.0, 50.0, 60.0, 70.0, 80.0, 90.0, 100.0, 110.0}, "Mixing bins - multiplicity"};
160160

161161
// Rotational background
162162
Configurable<int> rotationalcut{"rotationalcut", 10, "Cut value (Rotation angle pi - pi/cut and pi + pi/cut)"};
@@ -201,7 +201,7 @@ struct Lambda1520analysisinpp {
201201
// Filter centralityFilter = nabs(aod::cent::centFT0C) <= cfg_Event_CentralityMax;
202202
// Filter triggerFilter = (o2::aod::evsel::sel8 == true);
203203

204-
Filter tofPIDFilter = aod::track::tofExpMom < 0.f || ((aod::track::tofExpMom > 0.f) && (/* (nabs(aod::pidtof::tofNSigmaPi) < configPID.pidnSigmaPreSelectionCut) || */ (nabs(aod::pidtof::tofNSigmaKa) < configPID.pidnSigmaPreSelectionCut) || (nabs(aod::pidtof::tofNSigmaPr) < configPID.pidnSigmaPreSelectionCut))); // TOF
204+
Filter tofPIDFilter = aod::track::tofExpMom < 0.0 || ((aod::track::tofExpMom > 0.0) && (/* (nabs(aod::pidtof::tofNSigmaPi) < configPID.pidnSigmaPreSelectionCut) || */ (nabs(aod::pidtof::tofNSigmaKa) < configPID.pidnSigmaPreSelectionCut) || (nabs(aod::pidtof::tofNSigmaPr) < configPID.pidnSigmaPreSelectionCut))); // TOF
205205
Filter tpcPIDFilter = /* nabs(aod::pidtpc::tpcNSigmaPi) < configPID.pidnSigmaPreSelectionCut || */ nabs(aod::pidtpc::tpcNSigmaKa) < configPID.pidnSigmaPreSelectionCut || nabs(aod::pidtpc::tpcNSigmaPr) < configPID.pidnSigmaPreSelectionCut; // TPC
206206
Filter trackFilter = (configTracks.trackSelection == AllTracks) ||
207207
((configTracks.trackSelection == GlobalTracks) && requireGlobalTrackInFilter()) ||
@@ -269,8 +269,8 @@ struct Lambda1520analysisinpp {
269269
if (cFilladditionalQAeventPlots) {
270270
// event histograms
271271
if (doprocessData) {
272-
histos.add("QAevent/hPairsCounterSameE", "total valid no. of pairs sameE", HistType::kTH1F, {{1, 0.5f, 1.5f}});
273-
histos.add("QAevent/hnTrksSameE", "n tracks per event SameE", HistType::kTH1F, {{1000, 0.0f, 1000.0f}});
272+
histos.add("QAevent/hPairsCounterSameE", "total valid no. of pairs sameE", HistType::kTH1F, {{1, 0.5, 1.5}});
273+
histos.add("QAevent/hnTrksSameE", "n tracks per event SameE", HistType::kTH1F, {{1000, 0.0, 1000.0}});
274274
}
275275
// Test on Mixed event
276276
if (doprocessME) {
@@ -280,10 +280,10 @@ struct Lambda1520analysisinpp {
280280
histos.add("QAevent/hMixPool_Multiplicity", "Mixed Event Pool: Multiplicity;Multiplicity;Counts", HistType::kTH1F, {axisMultMix});
281281
histos.add("QAevent/hMixPool_VtxZ_vs_Multiplicity", "Mixed Event Pool: Vertex Z vs Multiplicity;Counts", HistType::kTH2F, {axisVtxMix, axisMultMix});
282282

283-
histos.add("QAevent/hPairsCounterMixedE", "total valid no. of pairs mixedE", HistType::kTH1F, {{1, 0.5f, 1.5f}});
283+
histos.add("QAevent/hPairsCounterMixedE", "total valid no. of pairs mixedE", HistType::kTH1F, {{1, 0.5, 1.5}});
284284
histos.add("QAevent/hVertexZMixedE", "Collision Vertex Z position", HistType::kTH1F, {{100, -15., 15.}});
285-
histos.add("QAevent/hMultiplicityPercentMixedE", "Multiplicity percentile of collision", HistType::kTH1F, {{120, 0.0f, 120.0f}});
286-
histos.add("QAevent/hnTrksMixedE", "n tracks per event MixedE", HistType::kTH1F, {{1000, 0.0f, 1000.0f}});
285+
histos.add("QAevent/hMultiplicityPercentMixedE", "Multiplicity percentile of collision", HistType::kTH1F, {{120, 0.0, 120.0}});
286+
histos.add("QAevent/hnTrksMixedE", "n tracks per event MixedE", HistType::kTH1F, {{1000, 0.0, 1000.0}});
287287
}
288288
}
289289

@@ -428,8 +428,6 @@ struct Lambda1520analysisinpp {
428428
float massKa = MassKaonCharged;
429429
float massPr = MassProton;
430430

431-
auto static constexpr Lambda1520PDG = 102134; // PDG code for Lambda(1520)
432-
433431
// Centralicity estimator selection
434432
template <typename Coll>
435433
float centEst(Coll collisions)
@@ -452,7 +450,7 @@ struct Lambda1520analysisinpp {
452450
return returnValue;
453451
}
454452

455-
auto static constexpr TripleCharge = 3.f;
453+
auto static constexpr TripleCharge = 3.0;
456454

457455
// Check if the collision is INEL>0
458456
template <typename MCColl, typename MCPart>
@@ -479,7 +477,7 @@ struct Lambda1520analysisinpp {
479477
if (std::abs(track.pt()) < configTracks.cMinPtcut)
480478
return false;
481479
if (configTracks.cDCAr7SigCut) {
482-
if (std::abs(track.dcaXY()) > (0.004f + 0.0130f / (track.pt()))) // 7 - Sigma cut
480+
if (std::abs(track.dcaXY()) > (0.004 + 0.0130 / (track.pt()))) // 7 - Sigma cut
483481
return false;
484482
} else {
485483
if (std::abs(track.dcaXY()) > configTracks.cMaxDCArToPVcut)
@@ -515,13 +513,13 @@ struct Lambda1520analysisinpp {
515513
template <typename T>
516514
bool ptDependentPidProton(const T& candidate)
517515
{
518-
auto vProtonTPCPIDpTintv = std::vector<float>(configPID.protonTPCPIDpTintv);
516+
auto vProtonTPCPIDpTintv = configPID.protonTPCPIDpTintv.value;
519517
vProtonTPCPIDpTintv.insert(vProtonTPCPIDpTintv.begin(), configTracks.cMinPtcut);
520-
auto vProtonTPCPIDcuts = std::vector<float>(configPID.protonTPCPIDcuts);
521-
auto vProtonTOFPIDpTintv = std::vector<float>(configPID.protonTOFPIDpTintv);
522-
auto vProtonTPCTOFCombinedpTintv = std::vector<float>(configPID.protonTPCTOFCombinedpTintv);
523-
auto vProtonTPCTOFCombinedPIDcuts = std::vector<float>(configPID.protonTPCTOFCombinedPIDcuts);
524-
auto vProtonTOFPIDcuts = std::vector<float>(configPID.protonTOFPIDcuts);
518+
auto vProtonTPCPIDcuts = configPID.protonTPCPIDcuts.value;
519+
auto vProtonTOFPIDpTintv = configPID.protonTOFPIDpTintv.value;
520+
auto vProtonTPCTOFCombinedpTintv = configPID.protonTPCTOFCombinedpTintv.value;
521+
auto vProtonTPCTOFCombinedPIDcuts = configPID.protonTPCTOFCombinedPIDcuts.value;
522+
auto vProtonTOFPIDcuts = configPID.protonTOFPIDcuts.value;
525523

526524
float pt = candidate.pt();
527525
float ptSwitchToTOF = vProtonTPCPIDpTintv.back();
@@ -584,13 +582,13 @@ struct Lambda1520analysisinpp {
584582
template <typename T>
585583
bool ptDependentPidKaon(const T& candidate)
586584
{
587-
auto vKaonTPCPIDpTintv = std::vector<float>(configPID.kaonTPCPIDpTintv);
585+
auto vKaonTPCPIDpTintv = configPID.kaonTPCPIDpTintv.value;
588586
vKaonTPCPIDpTintv.insert(vKaonTPCPIDpTintv.begin(), configTracks.cMinPtcut);
589-
auto vKaonTPCPIDcuts = std::vector<float>(configPID.kaonTPCPIDcuts);
590-
auto vKaonTOFPIDpTintv = std::vector<float>(configPID.kaonTOFPIDpTintv);
591-
auto vKaonTPCTOFCombinedpTintv = std::vector<float>(configPID.kaonTPCTOFCombinedpTintv);
592-
auto vKaonTPCTOFCombinedPIDcuts = std::vector<float>(configPID.kaonTPCTOFCombinedPIDcuts);
593-
auto vKaonTOFPIDcuts = std::vector<float>(configPID.kaonTOFPIDcuts);
587+
auto vKaonTPCPIDcuts = configPID.kaonTPCPIDcuts.value;
588+
auto vKaonTOFPIDpTintv = configPID.kaonTOFPIDpTintv.value;
589+
auto vKaonTPCTOFCombinedpTintv = configPID.kaonTPCTOFCombinedpTintv.value;
590+
auto vKaonTPCTOFCombinedPIDcuts = configPID.kaonTPCTOFCombinedPIDcuts.value;
591+
auto vKaonTOFPIDcuts = configPID.kaonTOFPIDcuts.value;
594592

595593
float pt = candidate.pt();
596594
float ptSwitchToTOF = vKaonTPCPIDpTintv.back();
@@ -653,9 +651,9 @@ struct Lambda1520analysisinpp {
653651
return false;
654652
}
655653

656-
auto static constexpr MinPtforPionRejection = 1.f;
657-
auto static constexpr MaxPtforPionRejection = 2.f;
658-
auto static constexpr MaxnSigmaforPionRejection = 2.f;
654+
auto static constexpr MinPtforPionRejection = 1.0;
655+
auto static constexpr MaxPtforPionRejection = 2.0;
656+
auto static constexpr MaxnSigmaforPionRejection = 2.0;
659657

660658
template <typename T>
661659
bool rejectPion(const T& candidate)
@@ -973,7 +971,7 @@ struct Lambda1520analysisinpp {
973971
if (motherstrk1[0] != motherstrk2[0]) // Same mother
974972
continue;
975973

976-
if (std::abs(mothersPDGtrk1[0]) != Lambda1520PDG)
974+
if (std::abs(mothersPDGtrk1[0]) != kLambda1520_Py)
977975
continue;
978976

979977
// LOGF(info, "mother trk1 id: %d, mother trk1: %d, trk1 id: %d, trk1 pdgcode: %d, mother trk2 id: %d, mother trk2: %d, trk2 id: %d, trk2 pdgcode: %d", motherstrk1[0], mothersPDGtrk1[0], trk1.globalIndex(), mctrk1.pdgCode(), motherstrk2[0], mothersPDGtrk2[0], trk2.globalIndex(), mctrk2.pdgCode());
@@ -1077,7 +1075,7 @@ struct Lambda1520analysisinpp {
10771075
}
10781076
PROCESS_SWITCH(Lambda1520analysisinpp, processMC, "Process Event for MC Light without partition", false);
10791077

1080-
Partition<aod::McParticles> selectedMCParticles = (nabs(aod::mcparticle::pdgCode) == Lambda1520PDG); // Lambda(1520)
1078+
Partition<aod::McParticles> selectedMCParticles = (nabs(aod::mcparticle::pdgCode) == kLambda1520_Py); // Lambda(1520)
10811079

10821080
void processMCTrue(MCEventCandidates::iterator const& collision, aod::McCollisions const&, aod::McParticles const& mcParticles)
10831081
{
@@ -1093,7 +1091,7 @@ struct Lambda1520analysisinpp {
10931091
// Not related to the real collisions
10941092
for (const auto& part : mcParts) { // loop over all MC particles
10951093

1096-
if (std::abs(part.pdgCode()) != Lambda1520PDG) // Lambda1520(0)
1094+
if (std::abs(part.pdgCode()) != kLambda1520_Py) // Lambda1520(0)
10971095
continue;
10981096

10991097
std::vector<int> daughterPDGs;

0 commit comments

Comments
 (0)