Skip to content

Commit 486bbcd

Browse files
authored
[Trigger,PWGCF,PWGEM,PWGLF,PWGUD] Use const& and std::move to avoid copies (#17705)
1 parent 26052ef commit 486bbcd

13 files changed

Lines changed: 36 additions & 36 deletions

EventFiltering/PWGCF/CFFilterAll.cxx

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1087,7 +1087,7 @@ struct CFFilterAll {
10871087
}
10881088

10891089
template <typename T>
1090-
bool checkTrack(T const& track, std::string trackName)
1090+
bool checkTrack(T const& track, const std::string& trackName)
10911091
{
10921092
if (track.pt() < TrackSelections.momentum->get(trackName.c_str(), "PtMin")) {
10931093
return false;
@@ -1135,7 +1135,7 @@ struct CFFilterAll {
11351135
}
11361136

11371137
template <typename T>
1138-
bool checkTrackPid(T const& track, std::string trackName)
1138+
bool checkTrackPid(T const& track, const std::string& trackName)
11391139
{
11401140
float momentum = -99;
11411141

@@ -1236,8 +1236,8 @@ struct CFFilterAll {
12361236
return true;
12371237
}
12381238

1239-
float getkstar(const ROOT::Math::PtEtaPhiMVector part1,
1240-
const ROOT::Math::PtEtaPhiMVector part2)
1239+
float getkstar(const ROOT::Math::PtEtaPhiMVector& part1,
1240+
const ROOT::Math::PtEtaPhiMVector& part2)
12411241
{
12421242
const ROOT::Math::PtEtaPhiMVector trackSum = part1 + part2;
12431243
const float beta = trackSum.Beta();
@@ -1257,7 +1257,7 @@ struct CFFilterAll {
12571257
}
12581258

12591259
ROOT::Math::PxPyPzEVector
1260-
getqij(const ROOT::Math::PtEtaPhiMVector parti, const ROOT::Math::PtEtaPhiMVector partj)
1260+
getqij(const ROOT::Math::PtEtaPhiMVector& parti, const ROOT::Math::PtEtaPhiMVector& partj)
12611261
{
12621262
ROOT::Math::PxPyPzEVector vecparti(parti);
12631263
ROOT::Math::PxPyPzEVector vecpartj(partj);
@@ -1266,7 +1266,7 @@ struct CFFilterAll {
12661266
float scaling = trackDifference.Dot(trackSum) / trackSum.Dot(trackSum);
12671267
return trackDifference - scaling * trackSum;
12681268
}
1269-
float getQ3(const ROOT::Math::PtEtaPhiMVector part1, const ROOT::Math::PtEtaPhiMVector part2, const ROOT::Math::PtEtaPhiMVector part3)
1269+
float getQ3(const ROOT::Math::PtEtaPhiMVector& part1, const ROOT::Math::PtEtaPhiMVector& part2, const ROOT::Math::PtEtaPhiMVector& part3)
12701270
{
12711271
ROOT::Math::PxPyPzEVector q12 = getqij(part1, part2);
12721272
ROOT::Math::PxPyPzEVector q23 = getqij(part2, part3);

EventFiltering/PWGEM/HeavyNeutralMesonFilter.cxx

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -289,8 +289,8 @@ struct HeavyNeutralMesonFilter {
289289
return true;
290290
}
291291

292-
float getkstar(const ROOT::Math::PtEtaPhiMVector part1,
293-
const ROOT::Math::PtEtaPhiMVector part2)
292+
float getkstar(const ROOT::Math::PtEtaPhiMVector& part1,
293+
const ROOT::Math::PtEtaPhiMVector& part2)
294294
{
295295
const ROOT::Math::PtEtaPhiMVector trackSum = part1 + part2;
296296
const float beta = trackSum.Beta();
@@ -306,8 +306,8 @@ struct HeavyNeutralMesonFilter {
306306
return 0.5 * trackRelK.P();
307307
}
308308

309-
ROOT::Math::PxPyPzEVector getqij(const ROOT::Math::PtEtaPhiMVector parti,
310-
const ROOT::Math::PtEtaPhiMVector partj)
309+
ROOT::Math::PxPyPzEVector getqij(const ROOT::Math::PtEtaPhiMVector& parti,
310+
const ROOT::Math::PtEtaPhiMVector& partj)
311311
{
312312
ROOT::Math::PxPyPzEVector vecparti(parti);
313313
ROOT::Math::PxPyPzEVector vecpartj(partj);
@@ -316,9 +316,9 @@ struct HeavyNeutralMesonFilter {
316316
float scaling = trackDifference.Dot(trackSum) / trackSum.Dot(trackSum);
317317
return trackDifference - scaling * trackSum;
318318
}
319-
float getQ3(const ROOT::Math::PtEtaPhiMVector part1,
320-
const ROOT::Math::PtEtaPhiMVector part2,
321-
const ROOT::Math::PtEtaPhiMVector part3)
319+
float getQ3(const ROOT::Math::PtEtaPhiMVector& part1,
320+
const ROOT::Math::PtEtaPhiMVector& part2,
321+
const ROOT::Math::PtEtaPhiMVector& part3)
322322
{
323323
ROOT::Math::PxPyPzEVector q12 = getqij(part1, part2);
324324
ROOT::Math::PxPyPzEVector q23 = getqij(part2, part3);

EventFiltering/PWGLF/filterdoublephi.cxx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ struct filterdoublephi {
188188
if (collision.sel8()) {
189189
auto posThisColl = posTracks->sliceByCached(aod::track::collisionId, collision.globalIndex(), cache);
190190
auto negThisColl = negTracks->sliceByCached(aod::track::collisionId, collision.globalIndex(), cache);
191-
for (auto track1 : posThisColl) {
191+
for (const auto& track1 : posThisColl) {
192192
// track selection
193193
if (!selectionTrack(track1)) {
194194
continue;
@@ -209,7 +209,7 @@ struct filterdoublephi {
209209
qaRegistry.fill(HIST("hNsigmaPtkaonTOF"), track1.tofNSigmaKa(), track1.pt());
210210
}
211211
auto track1ID = track1.globalIndex();
212-
for (auto track2 : negThisColl) {
212+
for (const auto& track2 : negThisColl) {
213213
// track selection
214214
if (!selectionTrack(track2)) {
215215
continue;

EventFiltering/PWGLF/filterf1proton.cxx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -419,8 +419,8 @@ struct filterf1proton {
419419
return true;
420420
}
421421

422-
float getkstar(const ROOT::Math::PtEtaPhiMVector part1,
423-
const ROOT::Math::PtEtaPhiMVector part2)
422+
float getkstar(const ROOT::Math::PtEtaPhiMVector& part1,
423+
const ROOT::Math::PtEtaPhiMVector& part2)
424424
{
425425
const ROOT::Math::PtEtaPhiMVector trackSum = part1 + part2;
426426
const float beta = trackSum.Beta();
@@ -439,7 +439,7 @@ struct filterf1proton {
439439
return 0.5 * trackRelK.P();
440440
}
441441

442-
std::vector<double> setValuesBB(o2::ccdb::CcdbApi& ccdbApi, aod::BCsWithTimestamps::iterator const& bunchCrossing, const std::string ccdbPath)
442+
std::vector<double> setValuesBB(o2::ccdb::CcdbApi& ccdbApi, aod::BCsWithTimestamps::iterator const& bunchCrossing, const std::string& ccdbPath)
443443
{
444444
std::map<std::string, std::string> metadata;
445445
auto h = ccdbApi.retrieveFromTFileAny<TH1F>(ccdbPath, metadata, bunchCrossing.timestamp());

EventFiltering/PWGLF/nucleiFilter.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -413,7 +413,7 @@ struct nucleiFilter {
413413
continue;
414414
}
415415
const auto& h3vector = h3vectors[iH3];
416-
auto pivector = trackVector;
416+
const auto& pivector = trackVector;
417417
auto cm = h3vector + trackVector;
418418
const ROOT::Math::Boost boost(cm.BoostToCM());
419419
boost(pivector);

EventFiltering/PWGLF/strangenessFilter.cxx

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -266,23 +266,23 @@ struct strangenessFilter {
266266
{
267267
return track.pt() > cfgHMOmegaCuts.hMinPtHM && std::abs(track.eta()) < cfgHMOmegaCuts.hEtaHM && track.tpcNClsCrossedRows() >= tpcmincrossedrows && track.tpcChi2NCl() <= 4.f && track.itsChi2NCl() <= 36.f && (track.itsClusterMap() & 0x7) != 0;
268268
}
269-
float getV0V0DCA(TVector3 v01pos, TVector3 v01mom, TVector3 v02pos, TVector3 v02mom)
269+
float getV0V0DCA(const TVector3& v01pos, const TVector3& v01mom, const TVector3& v02pos, const TVector3& v02mom)
270270
{
271271
TVector3 posdiff = v02pos - v01pos;
272272
TVector3 cross = v01mom.Cross(v02mom);
273273
TVector3 dcaVec = (posdiff.Dot(cross) / cross.Mag2()) * cross;
274274
return dcaVec.Mag();
275275
}
276-
float getV0V0CPA(TVector3 v01mom, TVector3 v02mom)
276+
float getV0V0CPA(const TVector3& v01mom, const TVector3& v02mom)
277277
{
278278
return v01mom.Dot(v02mom) / (v01mom.Mag() * v02mom.Mag());
279279
}
280-
float getV0V0Distance(TVector3 v01pos, TVector3 v02pos)
280+
float getV0V0Distance(const TVector3& v01pos, const TVector3& v02pos)
281281
{
282282
TVector3 posdiff = v02pos - v01pos;
283283
return posdiff.Mag();
284284
}
285-
float getV0V0Radius(TVector3 v01pos, TVector3 v01mom, TVector3 v02pos, TVector3 v02mom)
285+
float getV0V0Radius(const TVector3& v01pos, TVector3 v01mom, const TVector3& v02pos, TVector3 v02mom)
286286
{
287287
TVector3 posdiff = v02pos - v01pos;
288288
v01mom *= 1. / v01mom.Mag();
@@ -296,7 +296,7 @@ struct strangenessFilter {
296296
radVec *= 0.5;
297297
return radVec.Mag();
298298
}
299-
bool isSelectedV0V0(TVector3 v01pos, TVector3 v01mom, TVector3 v02pos, TVector3 v02mom)
299+
bool isSelectedV0V0(const TVector3& v01pos, const TVector3& v01mom, const TVector3& v02pos, const TVector3& v02mom)
300300
{
301301
if (getV0V0DCA(v01pos, v01mom, v02pos, v02mom) > cfgLLCuts.cfgMaxDCAV0V0)
302302
return false;
@@ -1217,7 +1217,7 @@ struct strangenessFilter {
12171217

12181218
// QA tracks
12191219
int triggcounterAllEv = 0;
1220-
for (auto track : tracks) { // start loop over tracks
1220+
for (const auto& track : tracks) { // start loop over tracks
12211221
if (cfgTrackCuts.isTrackFilter && !selectTrack(track)) {
12221222
continue;
12231223
}
@@ -1524,7 +1524,7 @@ struct strangenessFilter {
15241524
QAHistosSigma.fill(HIST("hDecayRadiusSigma"), decRad);
15251525
// pair a proton
15261526
bool isProtonPaired = false;
1527-
for (auto track : tracks) {
1527+
for (const auto& track : tracks) {
15281528
if (track.globalIndex() == dauTrack.globalIndex()) {
15291529
continue;
15301530
}

EventFiltering/PWGUD/diffractionBCFilter.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -321,7 +321,7 @@ struct DGBCFilterRun3 {
321321

322322
// loop over bcs
323323
int isDGBC;
324-
for (auto bc : bcs) {
324+
for (const auto& bc : bcs) {
325325
auto bcnum = bc.globalBC();
326326
auto ccs = false;
327327

EventFiltering/PWGUD/diffractionFilter.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,7 @@ struct DGFilterRun3 {
284284

285285
// forward tracks
286286
int nforwardTracks[5] = {0};
287-
for (auto track : fwdtracks) {
287+
for (const auto& track : fwdtracks) {
288288
nforwardTracks[track.trackType()]++;
289289
registry.fill(HIST("forwardTracks/timeResolution"), track.trackType(), track.trackTimeRes());
290290
}

EventFiltering/macros/checkBCrangesSkimming.C

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ void checkNearbyBCs(std::vector<selectedFrames>& frames, ULong64_t bcDiffToleran
181181
}
182182

183183
// Get RunNumber
184-
std::string getRunNumber(std::string fileName)
184+
std::string getRunNumber(const std::string& fileName)
185185
{
186186
std::string runNumber = "";
187187
std::regex re("/5[0-9]*");

EventFiltering/macros/checkSkimming.C

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
#include <string>
2323
#include <vector>
2424

25-
void checkSkimming(std::string original_path = "AnalysisResults.root", std::string skimmed_path = "AnalysisResults_skimmed.root", TFile* outputFile = nullptr, bool skipDownscaled = true)
25+
void checkSkimming(const std::string& original_path = "AnalysisResults.root", const std::string& skimmed_path = "AnalysisResults_skimmed.root", TFile* outputFile = nullptr, bool skipDownscaled = true)
2626
{
2727
gStyle->SetOptStat(0);
2828
std::string runNumber = "";
@@ -57,7 +57,7 @@ void checkSkimming(std::string original_path = "AnalysisResults.root", std::stri
5757

5858
// Find the bins corresponding to the desired labels
5959
std::vector<double> selected_bins1, selected_bins2;
60-
for (auto lab : labels) {
60+
for (const auto& lab : labels) {
6161
int bin1 = hist1->GetXaxis()->FindBin(lab.c_str());
6262
if (bin1 == -1) {
6363
std::cerr << "Error: Label " << lab << " not found in histogram 1." << std::endl;
@@ -104,7 +104,7 @@ void checkSkimming(std::string original_path = "AnalysisResults.root", std::stri
104104
}
105105
}
106106

107-
void checkSkimming(std::string listName = "period.txt", bool skipDownscaled = true)
107+
void checkSkimming(const std::string& listName = "period.txt", bool skipDownscaled = true)
108108
{
109109
std::string periodName = listName.substr(0, listName.find_last_of('.'));
110110
std::ifstream file(listName);

0 commit comments

Comments
 (0)