Skip to content

Commit fcb3ad0

Browse files
vkuceravkucera
committed
Use const& and std::move to avoid copies
Mostly done automatically by Clang-Tidy.
1 parent b7efad9 commit fcb3ad0

55 files changed

Lines changed: 197 additions & 191 deletions

Some content is hidden

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

‎PWGUD/AQC/udQC.cxx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -711,7 +711,7 @@ struct UDQC {
711711
return;
712712
}
713713

714-
for (auto fv0 : fv0s) {
714+
for (const auto& fv0 : fv0s) {
715715
registry.get<TH1>(HIST("FV0/hV0A"))->Fill(fv0.time());
716716
// side A
717717
for (size_t ind = 0; ind < fv0.channel().size(); ind++) {
@@ -738,7 +738,7 @@ struct UDQC {
738738
registry.get<TH1>(HIST("FT0/hT0AC"))->Fill(collision.t0AC());
739739
}
740740
}
741-
for (auto ft0 : ft0s) {
741+
for (const auto& ft0 : ft0s) {
742742
registry.get<TH1>(HIST("FT0/hT0A"))->Fill(ft0.timeA());
743743
registry.get<TH1>(HIST("FT0/hT0C"))->Fill(ft0.timeC());
744744

@@ -760,7 +760,7 @@ struct UDQC {
760760
{
761761
// LOGF(debug, "<FDDSignals> %d", fdds.size());
762762

763-
for (auto fdd : fdds) {
763+
for (const auto& fdd : fdds) {
764764

765765
registry.get<TH1>(HIST("FDD/hFDDA"))->Fill(fdd.timeA());
766766
registry.get<TH1>(HIST("FDD/hFDDC"))->Fill(fdd.timeC());

‎PWGUD/Core/DGCutparHolder.cxx‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111

1212
#include "PWGUD/Core/DGCutparHolder.h"
1313

14+
#include <utility>
1415
#include <vector>
1516

1617
// setter
@@ -45,7 +46,7 @@ void DGCutparHolder::SetNTracks(int MinNTracks, int MaxNTracks)
4546
}
4647
void DGCutparHolder::SetNetCharges(std::vector<int> netCharges)
4748
{
48-
mNetCharges = netCharges;
49+
mNetCharges = std::move(netCharges);
4950
}
5051
void DGCutparHolder::SetPidHypothesis(int pidHypo)
5152
{
@@ -102,11 +103,11 @@ void DGCutparHolder::SetMaxFITtime(float maxFITtime)
102103
}
103104
void DGCutparHolder::SetFITAmpLimits(std::vector<float> FITAmpLimits)
104105
{
105-
mFITAmpLimits = FITAmpLimits;
106+
mFITAmpLimits = std::move(FITAmpLimits);
106107
}
107108
void DGCutparHolder::SetCollisionSel(std::vector<int> collisionSel)
108109
{
109-
mCollisionSel = collisionSel;
110+
mCollisionSel = std::move(collisionSel);
110111
}
111112

112113
// getter

‎PWGUD/Core/DGCutparHolder.h‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414

1515
#include <Rtypes.h>
1616

17+
#include <utility>
1718
#include <vector>
1819

1920
// object to hold customizable cut values
@@ -40,7 +41,7 @@ class DGCutparHolder
4041
bool TOR = true,
4142
float maxFITtime = 4,
4243
std::vector<float> FITAmpLimits = {0., 0., 0., 0., 0.},
43-
std::vector<int> collisionSel = {1, 1, 1, 0, 1, 0, 0}) : mNDtcoll{ndtcoll}, mMinNBCs{nMinBCs}, mWithFwdTracks{withFwdTracks}, mGlobalTracksOnly{globalTracksOnly}, mITSOnlyTracks{ITSonlyTracks}, mMinRgtrwTOF{minrgtrwTOF}, mMinNTracks{MinNTracks}, mMaxNTracks{MaxNTracks}, mNetCharges{NetCharges}, mPidHypo{pidHypo}, mMinVertexPosz{MinPosz}, mMaxVertexPosz{MaxPosz}, mMinPt{minPt}, mMaxPt{maxPt}, mMinEta{minEta}, mMaxEta{maxEta}, mMinIVM{minIVM}, mMaxIVM{maxIVM}, mMaxNSigmaTPC{maxNSigmaTPC}, mMaxNSigmaTOF{maxNSigmaTOF}, mTVX{TVX}, mTSC{TSC}, mTCE{TCE}, mTOR{TOR}, mMaxFITtime{maxFITtime}, mFITAmpLimits{FITAmpLimits}, mCollisionSel{collisionSel}
44+
std::vector<int> collisionSel = {1, 1, 1, 0, 1, 0, 0}) : mNDtcoll{ndtcoll}, mMinNBCs{nMinBCs}, mWithFwdTracks{withFwdTracks}, mGlobalTracksOnly{globalTracksOnly}, mITSOnlyTracks{ITSonlyTracks}, mMinRgtrwTOF{minrgtrwTOF}, mMinNTracks{MinNTracks}, mMaxNTracks{MaxNTracks}, mNetCharges{std::move(NetCharges)}, mPidHypo{pidHypo}, mMinVertexPosz{MinPosz}, mMaxVertexPosz{MaxPosz}, mMinPt{minPt}, mMaxPt{maxPt}, mMinEta{minEta}, mMaxEta{maxEta}, mMinIVM{minIVM}, mMaxIVM{maxIVM}, mMaxNSigmaTPC{maxNSigmaTPC}, mMaxNSigmaTOF{maxNSigmaTOF}, mTVX{TVX}, mTSC{TSC}, mTCE{TCE}, mTOR{TOR}, mMaxFITtime{maxFITtime}, mFITAmpLimits{std::move(FITAmpLimits)}, mCollisionSel{std::move(collisionSel)}
4445
{
4546
}
4647

‎PWGUD/Core/DGPIDSelector.cxx‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
#include <cstdlib>
2323
#include <functional>
2424
#include <string>
25+
#include <utility>
2526
#include <vector>
2627

2728
// -----------------------------------------------------------------------------
@@ -87,7 +88,7 @@ DGPIDCuts::DGPIDCuts()
8788

8889
DGPIDCuts::DGPIDCuts(std::vector<float> PIDCutValues)
8990
{
90-
setPIDCuts(PIDCutValues);
91+
setPIDCuts(std::move(PIDCutValues));
9192
}
9293

9394
DGPIDCuts::~DGPIDCuts()
@@ -196,7 +197,7 @@ void DGAnaparHolder::SetdBC(int min, int max)
196197
mdBCMax = max;
197198
}
198199

199-
void DGAnaparHolder::SetFITvetoes(std::vector<int> vetoes)
200+
void DGAnaparHolder::SetFITvetoes(const std::vector<int>& vetoes)
200201
{
201202

202203
if (vetoes.size() == 5) {
@@ -254,22 +255,22 @@ void DGAnaparHolder::SetnCombine(std::size_t nComb)
254255

255256
void DGAnaparHolder::SetnetCharges(std::vector<int> charges)
256257
{
257-
mNetCharges = charges;
258+
mNetCharges = std::move(charges);
258259
}
259260

260261
void DGAnaparHolder::SetunlikeCharges(std::vector<int> charges)
261262
{
262-
mUnlikeCharges = charges;
263+
mUnlikeCharges = std::move(charges);
263264
}
264265

265266
void DGAnaparHolder::SetlikeCharges(std::vector<int> charges)
266267
{
267-
mLikeCharges = charges;
268+
mLikeCharges = std::move(charges);
268269
}
269270

270271
void DGAnaparHolder::SetPIDs(std::vector<int> pids)
271272
{
272-
mDGPIDs = pids;
273+
mDGPIDs = std::move(pids);
273274
}
274275

275276
// -----------------------------------------------------------------------------
@@ -435,7 +436,7 @@ void DGPIDSelector::Print()
435436
mAnaPars.Print();
436437
}
437438

438-
void DGPIDSelector::init(DGAnaparHolder anaPars)
439+
void DGPIDSelector::init(const DGAnaparHolder& anaPars)
439440
{
440441
mAnaPars = anaPars;
441442
mUnlikeIVMs.clear();

‎PWGUD/Core/DGPIDSelector.h‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
#include <algorithm>
2222
#include <cstddef>
2323
#include <cstdlib>
24+
#include <utility>
2425
#include <vector>
2526

2627
const int numDGPIDCutParameters = 9;
@@ -124,7 +125,7 @@ struct DGAnaparHolder {
124125
std::vector<int> unlikeCharges = {0},
125126
std::vector<int> likeCharges = {-2, 2},
126127
std::vector<int> DGPIDs = {211, 211},
127-
std::vector<float> DGPIDCutValues = {}) : mMinNTracks{MinNTracks}, mMaxNTracks{MaxNTracks}, mMinRgtrwTOF{minrgtrwTOF}, mMaxDCAxy{maxDCAxy}, mMaxDCAz{maxDCAz}, mdBCMin{dBCMin}, mdBCMax{dBCMax}, mFITvetoes{FITvetoes}, mITSOnlyTracks{ITSonlyTracks}, mMinNClTPC{minNClTPC}, mMaxNClTPC{maxNClTPC}, mMinChi2NClTPC{minChi2NClTPC}, mMaxChi2NClTPC{maxChi2NClTPC}, mMinpt{minpt}, mMaxpt{maxpt}, mMineta{mineta}, mMaxeta{maxeta}, mMinAlpha{minalpha}, mMaxAlpha{maxalpha}, mMinptsys{minptsys}, mMaxptsys{maxptsys}, mNCombine{nCombine}, mNetCharges{netCharges}, mUnlikeCharges{unlikeCharges}, mLikeCharges{likeCharges}, mDGPIDs{DGPIDs}, mDGPIDCutValues{DGPIDCutValues}
128+
std::vector<float> DGPIDCutValues = {}) : mMinNTracks{MinNTracks}, mMaxNTracks{MaxNTracks}, mMinRgtrwTOF{minrgtrwTOF}, mMaxDCAxy{maxDCAxy}, mMaxDCAz{maxDCAz}, mdBCMin{dBCMin}, mdBCMax{dBCMax}, mFITvetoes{std::move(FITvetoes)}, mITSOnlyTracks{ITSonlyTracks}, mMinNClTPC{minNClTPC}, mMaxNClTPC{maxNClTPC}, mMinChi2NClTPC{minChi2NClTPC}, mMaxChi2NClTPC{maxChi2NClTPC}, mMinpt{minpt}, mMaxpt{maxpt}, mMineta{mineta}, mMaxeta{maxeta}, mMinAlpha{minalpha}, mMaxAlpha{maxalpha}, mMinptsys{minptsys}, mMaxptsys{maxptsys}, mNCombine{nCombine}, mNetCharges{std::move(netCharges)}, mUnlikeCharges{std::move(unlikeCharges)}, mLikeCharges{std::move(likeCharges)}, mDGPIDs{std::move(DGPIDs)}, mDGPIDCutValues{std::move(DGPIDCutValues)}
128129
{
129130
if (mdBCMin < -16) {
130131
mdBCMin = -16;
@@ -148,7 +149,7 @@ struct DGAnaparHolder {
148149
void SetMinRgtrwTOF(float);
149150
void SetmaxDCA(float, float);
150151
void SetdBC(int, int);
151-
void SetFITvetoes(std::vector<int>);
152+
void SetFITvetoes(const std::vector<int>&);
152153
void SetITSOnlyTracks(bool);
153154
void SetNClTPC(int, int);
154155
void SetChi2NClTPC(float, float);
@@ -239,7 +240,7 @@ struct DGParticle {
239240
public:
240241
DGParticle();
241242
template <typename TTrack>
242-
DGParticle(TDatabasePDG* pdg, DGAnaparHolder anaPars, TTrack const& tracks, std::vector<int> comb)
243+
DGParticle(TDatabasePDG* pdg, const DGAnaparHolder& anaPars, TTrack const& tracks, const std::vector<int>& comb)
243244
{
244245
// compute invariant mass
245246
TLorentzVector lvtmp;
@@ -284,12 +285,12 @@ struct DGPIDSelector {
284285
~DGPIDSelector();
285286

286287
// setters
287-
void init(DGAnaparHolder anaPars);
288+
void init(const DGAnaparHolder& anaPars);
288289

289290
// getters
290291
void Print();
291292
template <typename TTrack>
292-
bool isGoodCombination(std::vector<int> comb, TTrack const& tracks, std::vector<int> acceptedCharges)
293+
bool isGoodCombination(const std::vector<int>& comb, TTrack const& tracks, std::vector<int> acceptedCharges)
293294
{
294295
// compute net charge of track combination
295296
int netCharge = 0.;

‎PWGUD/Core/DGSelector.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ class DGSelector
3737
~DGSelector() { delete fPDG; }
3838

3939
template <typename CC, typename BCs, typename TCs, typename FWs>
40-
int Print(DGCutparHolder /*diffCuts*/, CC& collision, BCs& /*bcRange*/, TCs& /*tracks*/, FWs& /*fwdtracks*/)
40+
int Print(const DGCutparHolder& /*diffCuts*/, CC& collision, BCs& /*bcRange*/, TCs& /*tracks*/, FWs& /*fwdtracks*/)
4141
{
4242
LOGF(info, "Size of array %i", collision.size());
4343
return 1;

‎PWGUD/Core/SGCutParHolder.cxx‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111

1212
#include "PWGUD/Core/SGCutParHolder.h"
1313

14+
#include <utility>
1415
#include <vector>
1516

1617
// setter
@@ -69,7 +70,7 @@ void SGCutParHolder::SetMaxFITtime(float maxFITtime)
6970
}
7071
void SGCutParHolder::SetFITAmpLimits(std::vector<float> FITAmpLimits)
7172
{
72-
mFITAmpLimits = FITAmpLimits;
73+
mFITAmpLimits = std::move(FITAmpLimits);
7374
}
7475

7576
// getter

‎PWGUD/Core/SGCutParHolder.h‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414

1515
#include <Rtypes.h>
1616

17+
#include <utility>
1718
#include <vector>
1819

1920
// object to hold customizable cut values
@@ -32,7 +33,7 @@ class SGCutParHolder
3233
float minEta = -1.0, float maxEta = 1.0,
3334
float maxFITtime = 4,
3435
float minRgtrwTOF = 0.,
35-
std::vector<float> FITAmpLimits = {0., 0., 0., 0., 0.}) : mNDtcoll{ndtcoll}, mMinNBCs{nMinBCs}, mWithFwdTracks{withFwdTracks}, mGlobalTracksOnly{globalTracksOnly}, mITSOnlyTracks{ITSonlyTracks}, mMinNTracks{MinNTracks}, mMaxNTracks{MaxNTracks}, mPidHypo{pidHypo}, mMinVertexPosz{MinPosz}, mMaxVertexPosz{MaxPosz}, mMinPt{minPt}, mMaxPt{maxPt}, mMinEta{minEta}, mMaxEta{maxEta}, mMaxFITtime{maxFITtime}, mMinRgtrwTOF{minRgtrwTOF}, mFITAmpLimits{FITAmpLimits}
36+
std::vector<float> FITAmpLimits = {0., 0., 0., 0., 0.}) : mNDtcoll{ndtcoll}, mMinNBCs{nMinBCs}, mWithFwdTracks{withFwdTracks}, mGlobalTracksOnly{globalTracksOnly}, mITSOnlyTracks{ITSonlyTracks}, mMinNTracks{MinNTracks}, mMaxNTracks{MaxNTracks}, mPidHypo{pidHypo}, mMinVertexPosz{MinPosz}, mMaxVertexPosz{MaxPosz}, mMinPt{minPt}, mMaxPt{maxPt}, mMinEta{minEta}, mMaxEta{maxEta}, mMaxFITtime{maxFITtime}, mMinRgtrwTOF{minRgtrwTOF}, mFITAmpLimits{std::move(FITAmpLimits)}
3637
{
3738
}
3839

‎PWGUD/Core/UDFSParser.cxx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,8 +138,8 @@ bool UDFSParser::isNumber(std::string s)
138138
}
139139

140140
// -----------------------------------------------------------------------------
141-
std::string UDFSParser::trim(std::string str,
142-
std::string whitespace = " \t")
141+
std::string UDFSParser::trim(const std::string& str,
142+
const std::string& whitespace = " \t")
143143
{
144144
const auto strBegin = str.find_first_not_of(whitespace);
145145
if (strBegin == std::string::npos)

‎PWGUD/Core/UDFSParser.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ class UDFSParser
6060

6161
// helper functions for string parsing
6262
bool isNumber(std::string s);
63-
std::string trim(std::string str, std::string whitespace);
63+
std::string trim(const std::string& str, const std::string& whitespace);
6464
std::vector<std::string> tokenize(std::string& str, std::string separator = ",");
6565
bool isInVector(int num, std::vector<int> vec);
6666

0 commit comments

Comments
 (0)