Skip to content

Commit f527840

Browse files
vkuceravkucera
authored
[PWGHF] Use const& and std::move to avoid copies (#17709)
1 parent 1c1042d commit f527840

13 files changed

Lines changed: 74 additions & 72 deletions

‎PWGHF/D2H/TableProducer/dataCreatorCharmHadPiReduced.cxx‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -488,7 +488,7 @@ struct HfDataCreatorCharmHadPiReduced {
488488
const PParticles& particlesMc,
489489
const std::vector<TTrack>& vecDaughtersB,
490490
int& indexHfCandCharm,
491-
std::map<int64_t, int64_t> selectedTracksPion,
491+
const std::map<int64_t, int64_t>& selectedTracksPion,
492492
const int64_t indexCollisionMaxNumContrib)
493493
{
494494

@@ -619,7 +619,7 @@ struct HfDataCreatorCharmHadPiReduced {
619619
}
620620
tables.rowHfDPiMcCheckReduced(pdgCodeBeautyMother, pdgCodeCharmMother, pdgCodeProng0, pdgCodeProng1, pdgCodeProng2, pdgCodeProng3);
621621
}
622-
tables.rowHfDPiMcRecReduced(indexHfCandCharm, selectedTracksPion[vecDaughtersB.back().globalIndex()], flag, flagWrongCollision, debug, motherPt);
622+
tables.rowHfDPiMcRecReduced(indexHfCandCharm, selectedTracksPion.at(vecDaughtersB.back().globalIndex()), flag, flagWrongCollision, debug, motherPt);
623623
} else if constexpr (DecChannel == DecayChannel::BsToDsminusPi) {
624624
// Bs → Ds- π+ → (K- K+ π-) π+
625625
auto indexRec = RecoDecay::getMatchedMCRec<true, false, false, true, true>(particlesMc, std::array{vecDaughtersB[0], vecDaughtersB[1], vecDaughtersB[2], vecDaughtersB[3]}, Pdg::kBS, std::array{-kKPlus, +kKPlus, -kPiPlus, +kPiPlus}, true, &sign, 3);
@@ -774,7 +774,7 @@ struct HfDataCreatorCharmHadPiReduced {
774774
}
775775
tables.rowHfDsPiMcCheckReduced(pdgCodeBeautyMother, pdgCodeCharmMother, pdgCodeProng0, pdgCodeProng1, pdgCodeProng2, pdgCodeProng3);
776776
}
777-
tables.rowHfDsPiMcRecReduced(indexHfCandCharm, selectedTracksPion[vecDaughtersB.back().globalIndex()], flag, flagWrongCollision, debug, motherPt);
777+
tables.rowHfDsPiMcRecReduced(indexHfCandCharm, selectedTracksPion.at(vecDaughtersB.back().globalIndex()), flag, flagWrongCollision, debug, motherPt);
778778
} else if constexpr (DecChannel == DecayChannel::BplusToD0barPi) {
779779
// B+ → D0(bar) π+ → (K+ π-) π+
780780
auto indexRec = RecoDecay::getMatchedMCRec<false, false, false, true, true>(particlesMc, std::array{vecDaughtersB[0], vecDaughtersB[1], vecDaughtersB[2]}, Pdg::kBPlus, std::array{+kPiPlus, +kKPlus, -kPiPlus}, true, &sign, 2);
@@ -871,7 +871,7 @@ struct HfDataCreatorCharmHadPiReduced {
871871
}
872872
tables.rowHfD0PiMcCheckReduced(pdgCodeBeautyMother, pdgCodeCharmMother, pdgCodeProng0, pdgCodeProng1, pdgCodeProng2);
873873
}
874-
tables.rowHfD0PiMcRecReduced(indexHfCandCharm, selectedTracksPion[vecDaughtersB.back().globalIndex()], flag, flagWrongCollision, debug, motherPt);
874+
tables.rowHfD0PiMcRecReduced(indexHfCandCharm, selectedTracksPion.at(vecDaughtersB.back().globalIndex()), flag, flagWrongCollision, debug, motherPt);
875875
} else if constexpr (DecChannel == DecayChannel::LbToLcplusPi) {
876876
// Lb → Lc+ π- → (p K- π+) π-
877877
auto indexRec = RecoDecay::getMatchedMCRec<false, false, false, true, true>(particlesMc, std::array{vecDaughtersB[0], vecDaughtersB[1], vecDaughtersB[2], vecDaughtersB[3]}, Pdg::kLambdaB0, std::array{+kProton, -kKPlus, +kPiPlus, -kPiPlus}, true, &sign, 3);
@@ -975,7 +975,7 @@ struct HfDataCreatorCharmHadPiReduced {
975975
}
976976
tables.rowHfLcPiMcCheckReduced(pdgCodeBeautyMother, pdgCodeCharmMother, pdgCodeProng0, pdgCodeProng1, pdgCodeProng2, pdgCodeProng3);
977977
}
978-
tables.rowHfLcPiMcRecReduced(indexHfCandCharm, selectedTracksPion[vecDaughtersB.back().globalIndex()], flag, flagWrongCollision, debug, motherPt);
978+
tables.rowHfLcPiMcRecReduced(indexHfCandCharm, selectedTracksPion.at(vecDaughtersB.back().globalIndex()), flag, flagWrongCollision, debug, motherPt);
979979
} else if constexpr (DecChannel == DecayChannel::B0ToDstarPi) {
980980
// B0 → D*+ π- → (D0 π+) π- → (K- π+ π+) π-
981981
auto indexRec = RecoDecay::getMatchedMCRec<true, false, false, true, true>(particlesMc, std::array{vecDaughtersB[0], vecDaughtersB[1], vecDaughtersB[2], vecDaughtersB[3]}, Pdg::kB0, std::array{+kKPlus, -kPiPlus, -kPiPlus, +kPiPlus}, true, &sign, 4);
@@ -1012,7 +1012,7 @@ struct HfDataCreatorCharmHadPiReduced {
10121012
checkWrongCollision(particleMother, collision, indexCollisionMaxNumContrib, flagWrongCollision);
10131013
}
10141014
}
1015-
tables.rowHfDStarPiMcRecReduced(indexHfCandCharm, selectedTracksPion[vecDaughtersB.back().globalIndex()], flag, flagWrongCollision, debug, motherPt);
1015+
tables.rowHfDStarPiMcRecReduced(indexHfCandCharm, selectedTracksPion.at(vecDaughtersB.back().globalIndex()), flag, flagWrongCollision, debug, motherPt);
10161016
}
10171017
}
10181018

@@ -1447,7 +1447,7 @@ struct HfDataCreatorCharmHadPiReduced {
14471447
tables.hfCandPidProng1(candC.nSigTpcPi1(), candC.nSigTofPi1(), candC.nSigTpcKa1(), candC.nSigTofKa1(), nSigmaTpcPr1, nSigmaTofPr1, charmHadDauTracks[1].hasTOF(), charmHadDauTracks[1].hasTPC());
14481448

14491449
// Soft pion tables
1450-
auto trackSoftPion = charmHadDauTracks.back();
1450+
const auto& trackSoftPion = charmHadDauTracks.back();
14511451
auto trackParCovSoftPion = getTrackParCov(trackSoftPion);
14521452
std::array<float, 2> dcaSoftPion{trackSoftPion.dcaXY(), trackSoftPion.dcaZ()};
14531453
std::array<float, 3> pVecSoftPion = trackSoftPion.pVector();

‎PWGHF/D2H/Tasks/taskDstarToD0Pi.cxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -418,7 +418,7 @@ struct HfTaskDstarToD0Pi {
418418
/// @param selectedCands selected candidates with selection flag
419419
/// @param preslice preslice to slice
420420
template <bool ApplyMl, typename T1, typename T2>
421-
void runTaskDstar(CollisionsWCent const& cols, T1 selectedCands, T2 preslice)
421+
void runTaskDstar(CollisionsWCent const& cols, const T1& selectedCands, const T2& preslice)
422422
{
423423
for (const auto& col : cols) {
424424
auto nPVContributors = col.numContrib();

‎PWGHF/HFC/Macros/DhCorrelationExtraction.cxx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ Bool_t DhCorrelationExtraction::setDmesonSpecie(DmesonSpecie k)
201201
return kTRUE;
202202
}
203203

204-
Bool_t DhCorrelationExtraction::extractCorrelations(Double_t ptCandMin, Double_t ptCandMax, Double_t ptHadMin, Double_t ptHadMax, TString codeName)
204+
Bool_t DhCorrelationExtraction::extractCorrelations(Double_t ptCandMin, Double_t ptCandMax, Double_t ptHadMin, Double_t ptHadMax, const TString& codeName)
205205
{
206206

207207
if (fSubtractSoftPiME) {
@@ -1513,7 +1513,7 @@ Double_t DhCorrelationExtraction::calculateBaselineError(TH1D*& histo, Bool_t to
15131513
return errBaseline;
15141514
}
15151515

1516-
void DhCorrelationExtraction::setTH1HistoStyle(TH1D*& histo, TString hTitle, TString hXaxisTitle, TString hYaxisTitle,
1516+
void DhCorrelationExtraction::setTH1HistoStyle(TH1D*& histo, const TString& hTitle, const TString& hXaxisTitle, const TString& hYaxisTitle,
15171517
Style_t markerStyle, Color_t markerColor, Double_t markerSize,
15181518
Color_t lineColor, Int_t lineWidth, Float_t hTitleXaxisOffset, Float_t hTitleYaxisOffset,
15191519
Float_t hTitleXaxisSize, Float_t hTitleYaxisSize, Float_t hLabelXaxisSize, Float_t hLabelYaxisSize,
@@ -1538,7 +1538,7 @@ void DhCorrelationExtraction::setTH1HistoStyle(TH1D*& histo, TString hTitle, TSt
15381538
histo->GetYaxis()->CenterTitle(centerYaxisTitle);
15391539
}
15401540

1541-
void DhCorrelationExtraction::setTH2HistoStyle(TH2D*& histo, TString hTitle, TString hXaxisTitle, TString hYaxisTitle, TString hZaxisTitle,
1541+
void DhCorrelationExtraction::setTH2HistoStyle(TH2D*& histo, const TString& hTitle, const TString& hXaxisTitle, const TString& hYaxisTitle, const TString& hZaxisTitle,
15421542
Float_t hTitleXaxisOffset, Float_t hTitleYaxisOffset, Float_t hTitleZaxisOffset,
15431543
Float_t hTitleXaxisSize, Float_t hTitleYaxisSize, Float_t hTitleZaxisSize,
15441544
Float_t hLabelXaxisSize, Float_t hLabelYaxisSize, Float_t hLabelZaxisSize,

‎PWGHF/HFC/Macros/DhCorrelationExtraction.h‎

Lines changed: 32 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@
2929
#include <Rtypes.h>
3030
#include <RtypesCore.h>
3131

32+
#include <utility>
33+
3234
class DhCorrelationExtraction : public TObject
3335
{
3436

@@ -53,39 +55,39 @@ class DhCorrelationExtraction : public TObject
5355
/// Methods to set the input configuration
5456
// Input files, directories and histograms
5557
Bool_t setDmesonSpecie(DmesonSpecie k);
56-
void setInputFilenameMass(TString filenameMass) { fFileNameMass = filenameMass; }
57-
void setInputFilenameSe(TString filenameSE) { fFileNameSE = filenameSE; }
58-
void setInputFilenameMe(TString filenameME) { fFileNameME = filenameME; }
59-
void setInputFilenameSecPart(TString filenameSecPart) { fFileSecPartName = filenameSecPart; }
58+
void setInputFilenameMass(TString filenameMass) { fFileNameMass = std::move(filenameMass); }
59+
void setInputFilenameSe(TString filenameSE) { fFileNameSE = std::move(filenameSE); }
60+
void setInputFilenameMe(TString filenameME) { fFileNameME = std::move(filenameME); }
61+
void setInputFilenameSecPart(TString filenameSecPart) { fFileSecPartName = std::move(filenameSecPart); }
6062
void setInputFilenameBiasBtoD(TString filenamePromptMcRec, TString filenameNonPromptMcRec)
6163
{
62-
fFilePromptMcRecName = filenamePromptMcRec;
63-
fFileNonPromptMcRecName = filenameNonPromptMcRec;
64+
fFilePromptMcRecName = std::move(filenamePromptMcRec);
65+
fFileNonPromptMcRecName = std::move(filenameNonPromptMcRec);
6466
}
65-
void setDirNameSe(TString dirNameSE) { fDirNameSE = dirNameSE; }
66-
void setDirNameMe(TString dirNameME) { fDirNameME = dirNameME; }
67-
void setDirNameSecPart(TString dirNameSecPart) { fDirSecPartName = dirNameSecPart; }
68-
void setMassHistoNameSgn(TString massHistoNameSgn) { fMassHistoNameSgn = massHistoNameSgn; }
69-
void setMassHistoNameBkg(TString massHistoNameBkg) { fMassHistoNameBkg = massHistoNameBkg; }
70-
void setMassHistoNameSBs(TString massHistoNameSBs) { fMassHistoNameSBs = massHistoNameSBs; }
71-
void setSeCorrelHistoSignalName(TString correlNameSigSE) { fSECorrelSignalRegionName = correlNameSigSE; }
72-
void setSeCorrelHistoSidebandName(TString correlNameSbSE) { fSECorrelSidebandsName = correlNameSbSE; }
73-
void setSeCorrelHistoSidebandLeftName(TString correlNameSbSE) { fSECorrelSidebandLeftName = correlNameSbSE; }
74-
void setSeCorrelHistoSidebandRightName(TString correlNameSbSE) { fSECorrelSidebandRightName = correlNameSbSE; }
75-
void setMeCorrelHistoSignalName(TString correlNameSigME) { fMECorrelSignalRegionName = correlNameSigME; }
76-
void setMeCorrelHistoSidebandName(TString correlNameSbME) { fMECorrelSidebandsName = correlNameSbME; }
77-
void setMeCorrelHistoSidebandLeftName(TString correlNameSbME) { fMECorrelSidebandLeftName = correlNameSbME; }
78-
void setMeCorrelHistoSidebandRightName(TString correlNameSbME) { fMECorrelSidebandRightName = correlNameSbME; }
67+
void setDirNameSe(TString dirNameSE) { fDirNameSE = std::move(dirNameSE); }
68+
void setDirNameMe(TString dirNameME) { fDirNameME = std::move(dirNameME); }
69+
void setDirNameSecPart(TString dirNameSecPart) { fDirSecPartName = std::move(dirNameSecPart); }
70+
void setMassHistoNameSgn(TString massHistoNameSgn) { fMassHistoNameSgn = std::move(massHistoNameSgn); }
71+
void setMassHistoNameBkg(TString massHistoNameBkg) { fMassHistoNameBkg = std::move(massHistoNameBkg); }
72+
void setMassHistoNameSBs(TString massHistoNameSBs) { fMassHistoNameSBs = std::move(massHistoNameSBs); }
73+
void setSeCorrelHistoSignalName(TString correlNameSigSE) { fSECorrelSignalRegionName = std::move(correlNameSigSE); }
74+
void setSeCorrelHistoSidebandName(TString correlNameSbSE) { fSECorrelSidebandsName = std::move(correlNameSbSE); }
75+
void setSeCorrelHistoSidebandLeftName(TString correlNameSbSE) { fSECorrelSidebandLeftName = std::move(correlNameSbSE); }
76+
void setSeCorrelHistoSidebandRightName(TString correlNameSbSE) { fSECorrelSidebandRightName = std::move(correlNameSbSE); }
77+
void setMeCorrelHistoSignalName(TString correlNameSigME) { fMECorrelSignalRegionName = std::move(correlNameSigME); }
78+
void setMeCorrelHistoSidebandName(TString correlNameSbME) { fMECorrelSidebandsName = std::move(correlNameSbME); }
79+
void setMeCorrelHistoSidebandLeftName(TString correlNameSbME) { fMECorrelSidebandLeftName = std::move(correlNameSbME); }
80+
void setMeCorrelHistoSidebandRightName(TString correlNameSbME) { fMECorrelSidebandRightName = std::move(correlNameSbME); }
7981
void setHistoSecPartName(TString histoPrimaryPartName, TString histoAllPartName)
8082
{
81-
fHistoPrimaryPartName = histoPrimaryPartName;
82-
fHistoAllPartName = histoAllPartName;
83+
fHistoPrimaryPartName = std::move(histoPrimaryPartName);
84+
fHistoAllPartName = std::move(histoAllPartName);
8385
}
84-
void setInputFilenameFdTemplate(TString filenameFDTemplate) { fFileFDTemplateName = filenameFDTemplate; }
85-
void setInputFilenameFdPromptFrac(TString filenameFDPromptFrac) { fFileFDPromptFracName = filenameFDPromptFrac; }
86-
void setInputHistoNameFdTemplatePrompt(TString hNameFDTemplatePrompt) { fHistoFDTemplatePromptName = hNameFDTemplatePrompt; }
87-
void setInputHistoNameFdTemplateNonPrompt(TString hNameFDTemplateNonPrompt) { fHistoFDTemplateNonPromptName = hNameFDTemplateNonPrompt; }
88-
void setInputHistoNameFdPromptFrac(TString hNameFDPromptFrac) { fHistoFDPromptFracName = hNameFDPromptFrac; }
86+
void setInputFilenameFdTemplate(TString filenameFDTemplate) { fFileFDTemplateName = std::move(filenameFDTemplate); }
87+
void setInputFilenameFdPromptFrac(TString filenameFDPromptFrac) { fFileFDPromptFracName = std::move(filenameFDPromptFrac); }
88+
void setInputHistoNameFdTemplatePrompt(TString hNameFDTemplatePrompt) { fHistoFDTemplatePromptName = std::move(hNameFDTemplatePrompt); }
89+
void setInputHistoNameFdTemplateNonPrompt(TString hNameFDTemplateNonPrompt) { fHistoFDTemplateNonPromptName = std::move(hNameFDTemplateNonPrompt); }
90+
void setInputHistoNameFdPromptFrac(TString hNameFDPromptFrac) { fHistoFDPromptFracName = std::move(hNameFDPromptFrac); }
8991

9092
// Input conditions: PtCand, PtHad, PoolBins
9193
void setNpools(Int_t npools) { fNpools = npools; }
@@ -143,15 +145,15 @@ class DhCorrelationExtraction : public TObject
143145
Bool_t readInputInvMass();
144146
Bool_t readInputFdSubtr();
145147
Bool_t readInputSecondaryPartContamination();
146-
Bool_t extractCorrelations(Double_t ptCandMin, Double_t ptCandMax, Double_t ptHadMin, Double_t ptHadMax, TString codeName);
148+
Bool_t extractCorrelations(Double_t ptCandMin, Double_t ptCandMax, Double_t ptHadMin, Double_t ptHadMax, const TString& codeName);
147149
TH1D* getCorrectedCorrHisto() { return fCorrectedCorrHisto; }
148150
TH1D* getCorrectedCorrHistoBaselineSubtr() { return fCorrectedCorrHistoBaselineSubtr; }
149151
TH1D* getCorrectedCorrHistoReflected() { return fCorrectedCorrHistoReflected; }
150152
TH1D* getCorrectedCorrHistoReflectedBaselineSubtr() { return fCorrectedCorrHistoReflectedBaselineSubtr; }
151153

152154
/// Histogram style
153-
void setTH1HistoStyle(TH1D*& histo, TString hTitle, TString hXaxisTitle, TString hYaxisTitle, Style_t markerStyle = kFullCircle, Color_t markerColor = kRed + 1, Double_t markerSize = 1.4, Color_t lineColor = kRed + 1, Int_t lineWidth = 3, Float_t hTitleXaxisOffset = 1.0, Float_t hTitleYaxisOffset = 1.0, Float_t hTitleXaxisSize = 0.060, Float_t hTitleYaxisSize = 0.060, Float_t hLabelXaxisSize = 0.060, Float_t hLabelYaxisSize = 0.060, Bool_t centerXaxisTitle = false, Bool_t centerYaxisTitle = false);
154-
void setTH2HistoStyle(TH2D*& histo, TString hTitle, TString hXaxisTitle, TString hYaxisTitle, TString hZaxisTitle, Float_t hTitleXaxisOffset = 1.8, Float_t hTitleYaxisOffset = 1.8, Float_t hTitleZaxisOffset = 1.2, Float_t hTitleXaxisSize = 0.060, Float_t hTitleYaxisSize = 0.060, Float_t hTitleZaxisSize = 0.060, Float_t hLabelXaxisSize = 0.060, Float_t hLabelYaxisSize = 0.060, Float_t hLabelZaxisSize = 0.060, Bool_t centerXaxisTitle = true, Bool_t centerYaxisTitle = true);
155+
void setTH1HistoStyle(TH1D*& histo, const TString& hTitle, const TString& hXaxisTitle, const TString& hYaxisTitle, Style_t markerStyle = kFullCircle, Color_t markerColor = kRed + 1, Double_t markerSize = 1.4, Color_t lineColor = kRed + 1, Int_t lineWidth = 3, Float_t hTitleXaxisOffset = 1.0, Float_t hTitleYaxisOffset = 1.0, Float_t hTitleXaxisSize = 0.060, Float_t hTitleYaxisSize = 0.060, Float_t hLabelXaxisSize = 0.060, Float_t hLabelYaxisSize = 0.060, Bool_t centerXaxisTitle = false, Bool_t centerYaxisTitle = false);
156+
void setTH2HistoStyle(TH2D*& histo, const TString& hTitle, const TString& hXaxisTitle, const TString& hYaxisTitle, const TString& hZaxisTitle, Float_t hTitleXaxisOffset = 1.8, Float_t hTitleYaxisOffset = 1.8, Float_t hTitleZaxisOffset = 1.2, Float_t hTitleXaxisSize = 0.060, Float_t hTitleYaxisSize = 0.060, Float_t hTitleZaxisSize = 0.060, Float_t hLabelXaxisSize = 0.060, Float_t hLabelYaxisSize = 0.060, Float_t hLabelZaxisSize = 0.060, Bool_t centerXaxisTitle = true, Bool_t centerYaxisTitle = true);
155157

156158
private:
157159
TFile* fFileMass; // File containing the mass histograms

0 commit comments

Comments
 (0)