Skip to content

Commit 7a0ca2b

Browse files
vkuceravkucera
committed
Replace calls
1 parent 1d09935 commit 7a0ca2b

113 files changed

Lines changed: 1122 additions & 1127 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎PWGHF/ALICE3/TableProducer/candidateCreatorChic.cxx‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -15,21 +15,21 @@
1515
///
1616
/// \author Alessandro De Falco <alessandro.de.falco@ca.infn.it>, Cagliari University
1717

18-
#include <utility>
19-
#include <vector>
18+
#include "PWGHF/Core/HfHelper.h"
19+
#include "PWGHF/DataModel/CandidateReconstructionTables.h"
20+
#include "PWGHF/DataModel/CandidateSelectionTables.h"
21+
22+
#include "ALICE3/DataModel/ECAL.h"
23+
#include "Common/Core/trackUtilities.h"
2024

2125
#include "CommonConstants/PhysicsConstants.h"
2226
#include "DCAFitter/DCAFitterN.h"
2327
#include "Framework/AnalysisTask.h"
2428
#include "ReconstructionDataFormats/DCA.h"
2529
#include "ReconstructionDataFormats/V0.h"
2630

27-
#include "ALICE3/DataModel/ECAL.h"
28-
#include "Common/Core/trackUtilities.h"
29-
30-
#include "PWGHF/Core/HfHelper.h"
31-
#include "PWGHF/DataModel/CandidateReconstructionTables.h"
32-
#include "PWGHF/DataModel/CandidateSelectionTables.h"
31+
#include <utility>
32+
#include <vector>
3333

3434
using namespace o2;
3535
using namespace o2::analysis;
@@ -109,14 +109,14 @@ struct HfCandidateCreatorChic {
109109
if (!(jpsiCand.hfflag() & 1 << hf_cand_2prong::DecayType::JpsiToEE) && !(jpsiCand.hfflag() & 1 << hf_cand_2prong::DecayType::JpsiToMuMu)) {
110110
continue;
111111
}
112-
if (yCandMax >= 0. && std::abs(hfHelper.yJpsi(jpsiCand)) > yCandMax) {
112+
if (yCandMax >= 0. && std::abs(HfHelper::yJpsi(jpsiCand)) > yCandMax) {
113113
continue;
114114
}
115115
if (jpsiCand.isSelJpsiToEE() > 0) {
116-
hMassJpsiToEE->Fill(hfHelper.invMassJpsiToEE(jpsiCand));
116+
hMassJpsiToEE->Fill(HfHelper::invMassJpsiToEE(jpsiCand));
117117
}
118118
if (jpsiCand.isSelJpsiToMuMu() > 0) {
119-
hMassJpsiToMuMu->Fill(hfHelper.invMassJpsiToMuMu(jpsiCand));
119+
hMassJpsiToMuMu->Fill(HfHelper::invMassJpsiToMuMu(jpsiCand));
120120
}
121121
hPtJpsi->Fill(jpsiCand.pt());
122122
hCPAJpsi->Fill(jpsiCand.cpa());
@@ -189,7 +189,7 @@ struct HfCandidateCreatorChic {
189189
impactParameter0.getY(), 0.f, // impactParameter1.getY(),
190190
std::sqrt(impactParameter0.getSigmaY2()), 0.f, // std::sqrt(impactParameter1.getSigmaY2()),
191191
jpsiCand.globalIndex(), ecal.globalIndex(),
192-
hfFlag, hfHelper.invMassJpsiToMuMu(jpsiCand));
192+
hfFlag, HfHelper::invMassJpsiToMuMu(jpsiCand));
193193

194194
// calculate invariant mass
195195
auto arrayMomenta = std::array{pvecJpsi, pvecGamma};
@@ -201,9 +201,9 @@ struct HfCandidateCreatorChic {
201201
hMassChicToJpsiToMuMuGamma->Fill(massJpsiGamma);
202202
}
203203
} // ecal loop
204-
} // Jpsi loop
205-
} // process
206-
}; // struct
204+
} // Jpsi loop
205+
} // process
206+
}; // struct
207207

208208
/// Extends the base table with expression columns.
209209
struct HfCandidateCreatorChicExpressions {
@@ -249,7 +249,7 @@ struct HfCandidateCreatorChicMc {
249249
// chi_c → J/ψ gamma
250250
indexRec = RecoDecay::getMatchedMCRec(mcParticles, arrayJpsiDaughters, Pdg::kJPsi, std::array{+kMuonPlus, -kMuonPlus}, true);
251251
if (indexRec > -1) {
252-
hMassJpsiToMuMuMatched->Fill(hfHelper.invMassJpsiToMuMu(candidate.prong0()));
252+
hMassJpsiToMuMuMatched->Fill(HfHelper::invMassJpsiToMuMu(candidate.prong0()));
253253

254254
int indexMother = RecoDecay::getMother(mcParticles, mcParticles.rawIteratorAt(indexRec), Pdg::kChiC1);
255255
int indexMotherGamma = RecoDecay::getMother(mcParticles, mcParticles.rawIteratorAt(candidate.prong1().mcparticleId()), Pdg::kChiC1);
@@ -262,7 +262,7 @@ struct HfCandidateCreatorChicMc {
262262
RecoDecay::getDaughters(particleMother, &arrAllDaughtersIndex, std::array{static_cast<int>(kGamma), static_cast<int>(Pdg::kJPsi)}, 1);
263263
if (arrAllDaughtersIndex.size() == 2) {
264264
flag = 1 << hf_cand_chic::DecayType::ChicToJpsiToMuMuGamma;
265-
hMassChicToJpsiToMuMuGammaMatched->Fill(hfHelper.invMassChicToJpsiGamma(candidate));
265+
hMassChicToJpsiToMuMuGammaMatched->Fill(HfHelper::invMassChicToJpsiGamma(candidate));
266266
}
267267
}
268268
}
@@ -299,8 +299,8 @@ struct HfCandidateCreatorChicMc {
299299

300300
rowMcMatchGen(flag, origin, channel);
301301
} // candidate loop
302-
} // process
303-
}; // struct
302+
} // process
303+
}; // struct
304304

305305
WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
306306
{

‎PWGHF/ALICE3/TableProducer/candidateCreatorX.cxx‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -16,20 +16,20 @@
1616
/// \author Rik Spijkers <r.spijkers@students.uu.nl>, Utrecht University
1717
/// \author Luca Micheletti <luca.micheletti@to.infn.it>, INFN
1818

19-
#include <utility>
20-
#include <vector>
19+
#include "PWGHF/Core/HfHelper.h"
20+
#include "PWGHF/DataModel/CandidateReconstructionTables.h"
21+
#include "PWGHF/DataModel/CandidateSelectionTables.h"
22+
23+
#include "Common/Core/trackUtilities.h"
2124

2225
#include "CommonConstants/PhysicsConstants.h"
2326
#include "DCAFitter/DCAFitterN.h"
2427
#include "Framework/AnalysisTask.h"
2528
#include "ReconstructionDataFormats/DCA.h"
2629
#include "ReconstructionDataFormats/V0.h"
2730

28-
#include "Common/Core/trackUtilities.h"
29-
30-
#include "PWGHF/Core/HfHelper.h"
31-
#include "PWGHF/DataModel/CandidateReconstructionTables.h"
32-
#include "PWGHF/DataModel/CandidateSelectionTables.h"
31+
#include <utility>
32+
#include <vector>
3333

3434
using namespace o2;
3535
using namespace o2::analysis;
@@ -119,20 +119,20 @@ struct HfCandidateCreatorX {
119119
if (!(jpsiCand.hfflag() & 1 << hf_cand_2prong::DecayType::JpsiToEE) && !(jpsiCand.hfflag() & 1 << hf_cand_2prong::DecayType::JpsiToMuMu)) {
120120
continue;
121121
}
122-
if (yCandMax >= 0. && std::abs(hfHelper.yJpsi(jpsiCand)) > yCandMax) {
122+
if (yCandMax >= 0. && std::abs(HfHelper::yJpsi(jpsiCand)) > yCandMax) {
123123
continue;
124124
}
125125
if (jpsiCand.isSelJpsiToEE() > 0) {
126-
if (std::abs(hfHelper.invMassJpsiToEE(jpsiCand) - massJpsi) > diffMassJpsiMax) {
126+
if (std::abs(HfHelper::invMassJpsiToEE(jpsiCand) - massJpsi) > diffMassJpsiMax) {
127127
continue;
128128
}
129-
hMassJpsiToEE->Fill(hfHelper.invMassJpsiToEE(jpsiCand));
129+
hMassJpsiToEE->Fill(HfHelper::invMassJpsiToEE(jpsiCand));
130130
}
131131
if (jpsiCand.isSelJpsiToMuMu() > 0) {
132-
if (std::abs(hfHelper.invMassJpsiToMuMu(jpsiCand) - massJpsi) > diffMassJpsiMax) {
132+
if (std::abs(HfHelper::invMassJpsiToMuMu(jpsiCand) - massJpsi) > diffMassJpsiMax) {
133133
continue;
134134
}
135-
hMassJpsiToMuMu->Fill(hfHelper.invMassJpsiToMuMu(jpsiCand));
135+
hMassJpsiToMuMu->Fill(HfHelper::invMassJpsiToMuMu(jpsiCand));
136136
}
137137

138138
hPtJpsi->Fill(jpsiCand.pt());
@@ -255,10 +255,10 @@ struct HfCandidateCreatorX {
255255
hMassXToJpsiToMuMuPiPi->Fill(massJpsiPiPi);
256256
}
257257
} // pi- loop
258-
} // pi+ loop
259-
} // Jpsi loop
260-
} // process
261-
}; // struct
258+
} // pi+ loop
259+
} // Jpsi loop
260+
} // process
261+
}; // struct
262262

263263
/// Extends the base table with expression columns.
264264
struct HfCandidateCreatorXExpressions {
@@ -363,8 +363,8 @@ struct HfCandidateCreatorXMc {
363363

364364
rowMcMatchGen(flag, origin, channel);
365365
} // candidate loop
366-
} // process
367-
}; // struct
366+
} // process
367+
}; // struct
368368

369369
WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
370370
{

‎PWGHF/ALICE3/TableProducer/candidateSelectorChicToJpsiGamma.cxx‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,16 @@
1515
///
1616
/// \author Alessandro De Falco <alessandro.de.falco@ca.infn.it>, Università/INFN Cagliari
1717

18-
#include <vector>
18+
#include "PWGHF/Core/HfHelper.h"
19+
#include "PWGHF/Core/SelectorCuts.h"
20+
#include "PWGHF/DataModel/CandidateReconstructionTables.h"
21+
#include "PWGHF/DataModel/CandidateSelectionTables.h"
1922

2023
#include "CommonConstants/PhysicsConstants.h"
2124
#include "Framework/AnalysisTask.h"
2225
#include "Framework/runDataProcessing.h"
2326

24-
#include "PWGHF/Core/HfHelper.h"
25-
#include "PWGHF/Core/SelectorCuts.h"
26-
#include "PWGHF/DataModel/CandidateReconstructionTables.h"
27-
#include "PWGHF/DataModel/CandidateSelectionTables.h"
27+
#include <vector>
2828

2929
using namespace o2;
3030
using namespace o2::aod;
@@ -80,7 +80,7 @@ struct HfCandidateSelectorChicToJpsiGamma {
8080
}
8181

8282
auto mchic = o2::constants::physics::MassChiC1; // chi_c1(1p)
83-
if (std::abs(hfHelper.invMassChicToJpsiGamma(hfCandChic) - mchic) > cuts->get(pTBin, "m")) {
83+
if (std::abs(HfHelper::invMassChicToJpsiGamma(hfCandChic) - mchic) > cuts->get(pTBin, "m")) {
8484
// LOGF(debug, "Chic topol selection failed at mass diff check");
8585
return false; // check that mass difference is within bounds
8686
}

‎PWGHF/ALICE3/TableProducer/candidateSelectorD0Alice3Barrel.cxx‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,18 @@
1515
/// \author Nima Zardoshti <nima.zardoshti@cern.ch>, CERN
1616
/// \author Vít Kučera <vit.kucera@cern.ch>, CERN
1717

18-
#include <vector>
19-
#include <algorithm>
18+
#include "PWGHF/Core/HfHelper.h"
19+
#include "PWGHF/DataModel/CandidateReconstructionTables.h"
20+
#include "PWGHF/DataModel/CandidateSelectionTables.h"
21+
22+
#include "ALICE3/DataModel/RICH.h"
2023

2124
#include "CommonConstants/PhysicsConstants.h"
2225
#include "Framework/AnalysisTask.h"
2326
#include "Framework/runDataProcessing.h"
2427

25-
#include "ALICE3/DataModel/RICH.h"
26-
27-
#include "PWGHF/Core/HfHelper.h"
28-
#include "PWGHF/DataModel/CandidateReconstructionTables.h"
29-
#include "PWGHF/DataModel/CandidateSelectionTables.h"
28+
#include <algorithm>
29+
#include <vector>
3030

3131
using namespace o2;
3232
using namespace o2::analysis;
@@ -147,11 +147,11 @@ struct HfCandidateSelectorD0Alice3Barrel {
147147

148148
// invariant-mass cut
149149
if (trackPion.sign() > 0) {
150-
if (std::abs(hfHelper.invMassD0ToPiK(candidate) - o2::constants::physics::MassD0) > cuts->get(pTBin, "m")) {
150+
if (std::abs(HfHelper::invMassD0ToPiK(candidate) - o2::constants::physics::MassD0) > cuts->get(pTBin, "m")) {
151151
return false;
152152
}
153153
} else {
154-
if (std::abs(hfHelper.invMassD0barToKPi(candidate) - o2::constants::physics::MassD0) > cuts->get(pTBin, "m")) {
154+
if (std::abs(HfHelper::invMassD0barToKPi(candidate) - o2::constants::physics::MassD0) > cuts->get(pTBin, "m")) {
155155
return false;
156156
}
157157
}
@@ -168,11 +168,11 @@ struct HfCandidateSelectorD0Alice3Barrel {
168168

169169
// cut on cos(theta*)
170170
if (trackPion.sign() > 0) {
171-
if (std::abs(hfHelper.cosThetaStarD0(candidate)) > cuts->get(pTBin, "cos theta*")) {
171+
if (std::abs(HfHelper::cosThetaStarD0(candidate)) > cuts->get(pTBin, "cos theta*")) {
172172
return false;
173173
}
174174
} else {
175-
if (std::abs(hfHelper.cosThetaStarD0bar(candidate)) > cuts->get(pTBin, "cos theta*")) {
175+
if (std::abs(HfHelper::cosThetaStarD0bar(candidate)) > cuts->get(pTBin, "cos theta*")) {
176176
return false;
177177
}
178178
}

‎PWGHF/ALICE3/TableProducer/candidateSelectorD0Alice3Forward.cxx‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,18 @@
1515
/// \author Nima Zardoshti <nima.zardoshti@cern.ch>, CERN
1616
/// \author Vít Kučera <vit.kucera@cern.ch>, CERN
1717

18-
#include <vector>
19-
#include <algorithm>
18+
#include "PWGHF/Core/HfHelper.h"
19+
#include "PWGHF/DataModel/CandidateReconstructionTables.h"
20+
#include "PWGHF/DataModel/CandidateSelectionTables.h"
21+
22+
#include "ALICE3/DataModel/RICH.h"
2023

2124
#include "CommonConstants/PhysicsConstants.h"
2225
#include "Framework/AnalysisTask.h"
2326
#include "Framework/runDataProcessing.h"
2427

25-
#include "ALICE3/DataModel/RICH.h"
26-
27-
#include "PWGHF/Core/HfHelper.h"
28-
#include "PWGHF/DataModel/CandidateReconstructionTables.h"
29-
#include "PWGHF/DataModel/CandidateSelectionTables.h"
28+
#include <algorithm>
29+
#include <vector>
3030

3131
using namespace o2;
3232
using namespace o2::analysis;
@@ -147,11 +147,11 @@ struct HfCandidateSelectorD0Alice3Forward {
147147

148148
// invariant-mass cut
149149
if (trackPion.sign() > 0) {
150-
if (std::abs(hfHelper.invMassD0ToPiK(candidate) - o2::constants::physics::MassD0) > cuts->get(pTBin, "m")) {
150+
if (std::abs(HfHelper::invMassD0ToPiK(candidate) - o2::constants::physics::MassD0) > cuts->get(pTBin, "m")) {
151151
return false;
152152
}
153153
} else {
154-
if (std::abs(hfHelper.invMassD0barToKPi(candidate) - o2::constants::physics::MassD0) > cuts->get(pTBin, "m")) {
154+
if (std::abs(HfHelper::invMassD0barToKPi(candidate) - o2::constants::physics::MassD0) > cuts->get(pTBin, "m")) {
155155
return false;
156156
}
157157
}
@@ -168,11 +168,11 @@ struct HfCandidateSelectorD0Alice3Forward {
168168

169169
// cut on cos(theta*)
170170
if (trackPion.sign() > 0) {
171-
if (std::abs(hfHelper.cosThetaStarD0(candidate)) > cuts->get(pTBin, "cos theta*")) {
171+
if (std::abs(HfHelper::cosThetaStarD0(candidate)) > cuts->get(pTBin, "cos theta*")) {
172172
return false;
173173
}
174174
} else {
175-
if (std::abs(hfHelper.cosThetaStarD0bar(candidate)) > cuts->get(pTBin, "cos theta*")) {
175+
if (std::abs(HfHelper::cosThetaStarD0bar(candidate)) > cuts->get(pTBin, "cos theta*")) {
176176
return false;
177177
}
178178
}

‎PWGHF/ALICE3/TableProducer/candidateSelectorD0ParametrizedPid.cxx‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,18 @@
1515
/// \author Nima Zardoshti <nima.zardoshti@cern.ch>, CERN
1616
/// \author Vít Kučera <vit.kucera@cern.ch>, CERN
1717

18-
#include <vector>
19-
#include <algorithm>
18+
#include "PWGHF/Core/HfHelper.h"
19+
#include "PWGHF/DataModel/CandidateReconstructionTables.h"
20+
#include "PWGHF/DataModel/CandidateSelectionTables.h"
21+
22+
#include "ALICE3/DataModel/RICH.h"
2023

2124
#include "CommonConstants/PhysicsConstants.h"
2225
#include "Framework/AnalysisTask.h"
2326
#include "Framework/runDataProcessing.h"
2427

25-
#include "ALICE3/DataModel/RICH.h"
26-
27-
#include "PWGHF/Core/HfHelper.h"
28-
#include "PWGHF/DataModel/CandidateReconstructionTables.h"
29-
#include "PWGHF/DataModel/CandidateSelectionTables.h"
28+
#include <algorithm>
29+
#include <vector>
3030

3131
using namespace o2;
3232
using namespace o2::analysis;
@@ -147,11 +147,11 @@ struct HfCandidateSelectorD0ParametrizedPid {
147147

148148
// invariant-mass cut
149149
if (trackPion.sign() > 0) {
150-
if (std::abs(hfHelper.invMassD0ToPiK(candidate) - o2::constants::physics::MassD0) > cuts->get(pTBin, "m")) {
150+
if (std::abs(HfHelper::invMassD0ToPiK(candidate) - o2::constants::physics::MassD0) > cuts->get(pTBin, "m")) {
151151
return false;
152152
}
153153
} else {
154-
if (std::abs(hfHelper.invMassD0barToKPi(candidate) - o2::constants::physics::MassD0) > cuts->get(pTBin, "m")) {
154+
if (std::abs(HfHelper::invMassD0barToKPi(candidate) - o2::constants::physics::MassD0) > cuts->get(pTBin, "m")) {
155155
return false;
156156
}
157157
}
@@ -168,11 +168,11 @@ struct HfCandidateSelectorD0ParametrizedPid {
168168

169169
// cut on cos(theta*)
170170
if (trackPion.sign() > 0) {
171-
if (std::abs(hfHelper.cosThetaStarD0(candidate)) > cuts->get(pTBin, "cos theta*")) {
171+
if (std::abs(HfHelper::cosThetaStarD0(candidate)) > cuts->get(pTBin, "cos theta*")) {
172172
return false;
173173
}
174174
} else {
175-
if (std::abs(hfHelper.cosThetaStarD0bar(candidate)) > cuts->get(pTBin, "cos theta*")) {
175+
if (std::abs(HfHelper::cosThetaStarD0bar(candidate)) > cuts->get(pTBin, "cos theta*")) {
176176
return false;
177177
}
178178
}

0 commit comments

Comments
 (0)