Use const& and std::move to avoid copies

Mostly done automatically by Clang-Tidy.

Author: vkucera

PWGEM/Dilepton/Core/DielectronCut.cxx

@@ -63,7 +63,7 @@ void DielectronCut::SetPairOpAng(float minOpAng, float maxOpAng)
 }
 void DielectronCut::SetMaxMeePhiVDep(std::function<float(float)> phivDepCut, float min_phiv, float max_phiv)
 {
-  mMaxMeePhiVDep = phivDepCut;
+  mMaxMeePhiVDep = std::move(phivDepCut);
   mMinPhivPair = min_phiv;
   mMaxPhivPair = max_phiv;
   LOG(info) << "Dielectron Cut, set max mee phiv dep: " << mMaxMeePhiVDep(2.5);
@@ -194,7 +194,7 @@ void DielectronCut::SetTrackMaxDcaZ(float maxDcaZ)
 
 void DielectronCut::SetTrackMaxDcaXYPtDep(std::function<float(float)> ptDepCut)
 {
-  mMaxDcaXYPtDep = ptDepCut;
+  mMaxDcaXYPtDep = std::move(ptDepCut);
   LOG(info) << "Dielectron Cut, set max DCA xy pt dep: " << mMaxDcaXYPtDep(1.0);
 }
 void DielectronCut::ApplyPhiV(bool flag)

PWGEM/Dilepton/Core/DielectronCut.h

@@ -537,7 +537,7 @@ class DielectronCut : public TNamed
   //   mPIDMlResponse = mlResponse;
   // }
 
-  void SetMLThresholds(const std::vector<float> bins, const std::vector<float> cuts)
+  void SetMLThresholds(const std::vector<float>& bins, const std::vector<float>& cuts)
   {
     if (bins.size() != cuts.size() + 1) {
       LOG(fatal) << "cuts.size() + 1 mutst be exactly the same as bins.size(). Check your bins and thresholds.";

PWGEM/Dilepton/Core/Dilepton.h

@@ -881,7 +881,7 @@ struct Dilepton {
   }
 
   template <int ev_id, typename TCollision, typename TTrack1, typename TTrack2, typename TCut, typename TAllTracks>
-  bool fillPairInfo(TCollision const& collision, TTrack1 const& t1, TTrack2 const& t2, TCut const& cut, TAllTracks const&, const std::vector<float> weightvector)
+  bool fillPairInfo(TCollision const& collision, TTrack1 const& t1, TTrack2 const& t2, TCut const& cut, TAllTracks const&, const std::vector<float>& weightvector)
   {
     if constexpr (ev_id == 0) {
       if constexpr (pairtype == o2::aod::pwgem::dilepton::utils::pairutil::DileptonPairType::kDielectron) {

PWGEM/Dilepton/Core/DileptonSV.h

@@ -1107,7 +1107,7 @@ struct DileptonSV {
   }
 
   template <int ev_id, typename TCollision, typename TTrack1, typename TTrack2, typename TCut, typename TAllTracks>
-  bool fillPairInfo(TCollision const& collision, TTrack1 const& t1, TTrack2 const& t2, TCut const& cut, TAllTracks const&, const std::vector<float> weightvector)
+  bool fillPairInfo(TCollision const& collision, TTrack1 const& t1, TTrack2 const& t2, TCut const& cut, TAllTracks const&, const std::vector<float>& weightvector)
   {
     dileptonSV candidate;
     if constexpr (ev_id == 0) {

PWGEM/Dilepton/Core/DimuonCut.cxx

@@ -20,6 +20,7 @@
 #include <Rtypes.h>
 
 #include <functional>
+#include <utility>
 #include <vector>
 
 ClassImp(DimuonCut);
@@ -98,7 +99,7 @@ void DimuonCut::SetMatchingChi2MCHMFT(float min, float max)
 }
 void DimuonCut::SetMaxMatchingChi2MCHMFTPtDep(std::function<float(float)> PtDepCut)
 {
-  mMaxMatchingChi2MCHMFTPtDep = PtDepCut;
+  mMaxMatchingChi2MCHMFTPtDep = std::move(PtDepCut);
   LOG(info) << "Dimuon Cut, set matching chi2 MFT-MCH range: " << mMaxMatchingChi2MCHMFTPtDep(0.5);
 }
 void DimuonCut::SetMaxDiffMatchingChi2MCHMFT(float diff)
@@ -143,13 +144,13 @@ void DimuonCut::EnableTTCA(const bool flag)
 }
 void DimuonCut::SetMaxPDCARabsDep(std::function<float(float)> RabsDepCut)
 {
-  mMaxPDCARabsDep = RabsDepCut;
+  mMaxPDCARabsDep = std::move(RabsDepCut);
   LOG(info) << "Dimuon Cut, set max pDCA as a function of Rabs: " << mMaxPDCARabsDep(10.0);
 }
 void DimuonCut::SetMFTHitMap(bool flag, std::vector<int> hitMap)
 {
   mApplyMFTHitMap = flag;
-  mRequiredMFTDisks = hitMap;
+  mRequiredMFTDisks = std::move(hitMap);
   if (mApplyMFTHitMap) {
     for (const auto& iDisk : mRequiredMFTDisks) {
       LOG(info) << "Dimuon Cut, require MFT hit on Disk: " << iDisk;

PWGEM/Dilepton/TableProducer/skimmerPrimaryMuon.cxx

@@ -269,7 +269,7 @@ struct skimmerPrimaryMuon {
   }
 
   template <bool isMC, bool withMFTCov, typename TFwdTracks, typename TMFTTracks, bool fillTable, typename TCollision, typename TFwdTrack, typename TMFTTracksCov>
-  bool fillFwdTrackTable(TCollision const& collision, TFwdTrack fwdtrack, TMFTTracksCov const& mftCovs, const bool isAmbiguous)
+  bool fillFwdTrackTable(TCollision const& collision, const TFwdTrack& fwdtrack, TMFTTracksCov const& mftCovs, const bool isAmbiguous)
   {
     if (fwdtrack.chi2MatchMCHMID() < 0.f) { // this should never happen. only for protection.
       return false;

PWGEM/Dilepton/TableProducer/skimmerPrimaryMuonQC.cxx

@@ -344,7 +344,7 @@ struct skimmerPrimaryMuonQC {
   }
 
   template <bool isMC, typename TFwdTracks, typename TMFTTracks, typename TCollision, typename TFwdTrack>
-  bool fillMuonInfo(TCollision const& collision, TFwdTrack fwdtrack)
+  bool fillMuonInfo(TCollision const& collision, const TFwdTrack& fwdtrack)
   {
     if (fwdtrack.trackType() != static_cast<uint8_t>(o2::aod::fwdtrack::ForwardTrackTypeEnum::GlobalMuonTrack) && fwdtrack.trackType() != static_cast<uint8_t>(o2::aod::fwdtrack::ForwardTrackTypeEnum::MuonStandaloneTrack)) {
       return false;

PWGEM/Dilepton/Tasks/MCtemplates.cxx

@@ -109,7 +109,7 @@ constexpr static uint32_t gkTrackFillMap = VarManager::ObjTypes::ReducedTrack |
 constexpr static uint32_t gkTrackFillMapWithCov = VarManager::ObjTypes::ReducedTrack | VarManager::ObjTypes::ReducedTrackBarrel | VarManager::ObjTypes::ReducedTrackBarrelCov | VarManager::ObjTypes::ReducedTrackBarrelPID;
 constexpr static uint32_t gkParticleMCFillMap = VarManager::ObjTypes::ParticleMC;
 
-void DefineHistograms(HistogramManager* histMan, TString histClasses, Configurable<std::string> configVar); // defines histograms for all tasks
+void DefineHistograms(HistogramManager* histMan, const TString& histClasses, const Configurable<std::string>& configVar); // defines histograms for all tasks
 
 struct AnalysisEventSelection {
   Produces<aod::EventCuts> eventSel;
@@ -698,7 +698,7 @@ WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
     adaptAnalysisTask<AnalysisSameEventPairing>(cfgc)};
 }
 
-void DefineHistograms(HistogramManager* histMan, TString histClasses, Configurable<std::string> configVar)
+void DefineHistograms(HistogramManager* histMan, const TString& histClasses, const Configurable<std::string>& configVar)
 {
   //
   // Define here the histograms for all the classes required in analysis.

PWGEM/Dilepton/Tasks/emEfficiencyEE.cxx

@@ -118,7 +118,7 @@ constexpr static uint32_t gkMCEventFillMap = VarManager::ObjTypes::ReducedEventM
 constexpr static uint32_t gkTrackFillMap = VarManager::ObjTypes::ReducedTrack | VarManager::ObjTypes::ReducedTrackBarrel | VarManager::ObjTypes::ReducedTrackBarrelCov | VarManager::ObjTypes::ReducedTrackBarrelPID;
 constexpr static uint32_t gkParticleMCFillMap = VarManager::ObjTypes::ParticleMC;
 
-void DefineHistograms(HistogramManager* histMan, TString histClasses, Configurable<std::string> configVar); // defines histograms for all tasks
+void DefineHistograms(HistogramManager* histMan, const TString& histClasses, const Configurable<std::string>& configVar); // defines histograms for all tasks
 void SetBinsLinear(std::vector<double>& fBins, const double min, const double max, const unsigned int steps);
 
 struct AnalysisEventSelection {
@@ -324,7 +324,7 @@ struct AnalysisEventQa {
   {
 
     Int_t midrap = 0;
-    for (auto mctrack : groupedMCTracks) {
+    for (const auto& mctrack : groupedMCTracks) {
       if (TMath::Abs(mctrack.eta()) < 0.5 && mctrack.isPhysicalPrimary() && (TMath::Abs(mctrack.pdgCode()) == 211 || mctrack.pdgCode() == 111)) {
         midrap++;
       }
@@ -779,7 +779,7 @@ struct AnalysisTrackSelection {
   }
 
   template <uint32_t TEventFillMap, uint32_t TTrackFillMap, uint32_t TTrackMCFillMap, typename TEvents, typename TEventsMC, typename TTracks, typename TTracksMC, typename TAmbigTracks>
-  void runDataFillMore(TEvents const& events, TEventsMC eventsMC, TTracks const& tracks, TTracksMC const& tracksMC, TAmbigTracks const& ambiTracksMid)
+  void runDataFillMore(TEvents const& events, const TEventsMC& eventsMC, TTracks const& tracks, TTracksMC const& tracksMC, TAmbigTracks const& ambiTracksMid)
   {
 
     VarManager::ResetValues(0, VarManager::kNEventWiseVariables);
@@ -2012,7 +2012,7 @@ WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
     adaptAnalysisTask<AnalysisSameEventPairing>(cfgc)};
 }
 
-void DefineHistograms(HistogramManager* histMan, TString histClasses, Configurable<std::string> configVar)
+void DefineHistograms(HistogramManager* histMan, const TString& histClasses, const Configurable<std::string>& configVar)
 {
   //
   // Define here the histograms for all the classes required in analysis.

PWGEM/Dilepton/Tasks/lmeeLFCocktail.cxx

@@ -127,7 +127,7 @@ struct lmeelfcocktail {
     return true;
   }
 
-  bool isAcceptedSingle(ROOT::Math::PtEtaPhiMVector p1)
+  bool isAcceptedSingle(const ROOT::Math::PtEtaPhiMVector& p1)
   {
     if (p1.Pt() < fConfigMinPt)
       return false;
@@ -138,7 +138,7 @@ struct lmeelfcocktail {
     return true;
   }
 
-  bool isAcceptedPair(ROOT::Math::PtEtaPhiMVector p1, ROOT::Math::PtEtaPhiMVector p2)
+  bool isAcceptedPair(const ROOT::Math::PtEtaPhiMVector& p1, const ROOT::Math::PtEtaPhiMVector& p2)
   {
     if (!isAcceptedSingle(p1)) {
       return false;
@@ -167,21 +167,21 @@ struct lmeelfcocktail {
   }
 
   template <typename T>
-  bool isAcceptedPair(T& p1, T& p2)
+  bool isAcceptedPair(const T& p1, const T& p2)
   {
     ROOT::Math::PtEtaPhiMVector v1(p1.ptSmeared(), p1.etaSmeared(), p1.phiSmeared(), o2::constants::physics::MassElectron);
     ROOT::Math::PtEtaPhiMVector v2(p2.ptSmeared(), p2.etaSmeared(), p2.phiSmeared(), o2::constants::physics::MassElectron);
     return isAcceptedPair(v1, v2);
   }
 
   template <typename T>
-  bool isAcceptedSingle(T& p1)
+  bool isAcceptedSingle(const T& p1)
   {
     ROOT::Math::PtEtaPhiMVector v1(p1.ptSmeared(), p1.etaSmeared(), p1.phiSmeared(), o2::constants::physics::MassElectron);
     return isAcceptedSingle(v1);
   }
 
-  void addHistogram1D_stage(TString histname, AxisSpec axis, int& i, TString s)
+  void addHistogram1D_stage(const TString& histname, const AxisSpec& axis, int& i, const TString& s)
   {
     i++;
     TString name = s + histname;
@@ -201,14 +201,14 @@ struct lmeelfcocktail {
     }
   }
 
-  void addHistogram1D(TString histname, AxisSpec axis, int& i)
+  void addHistogram1D(const TString& histname, const AxisSpec& axis, int& i)
   {
-    for (auto s : stage) {
+    for (const auto& s : stage) {
       addHistogram1D_stage(histname, axis, i, s);
     }
   }
 
-  void addHistogram1D_mother(TString histname, AxisSpec axis, int& i) // mother histograms only for gen. level, no decay channels
+  void addHistogram1D_mother(const TString& histname, const AxisSpec& axis, int& i) // mother histograms only for gen. level, no decay channels
   {
     i++;
     TString name = stage[0] + histname;
@@ -222,7 +222,7 @@ struct lmeelfcocktail {
     }
   }
 
-  void addHistogram2D_stage(TString histname, AxisSpec axis1, AxisSpec axis2, int& i, TString s)
+  void addHistogram2D_stage(const TString& histname, const AxisSpec& axis1, const AxisSpec& axis2, int& i, const TString& s)
   {
     i++;
     TString name = s + histname;
@@ -242,15 +242,15 @@ struct lmeelfcocktail {
     }
   }
 
-  void addHistogram2D(TString histname, AxisSpec axis1, AxisSpec axis2, int& i)
+  void addHistogram2D(const TString& histname, const AxisSpec& axis1, const AxisSpec& axis2, int& i)
   {
-    for (auto s : stage) {
+    for (const auto& s : stage) {
       addHistogram2D_stage(histname, axis1, axis2, i, s);
     }
   }
 
   template <typename TAxes>
-  void addHistogramND_stage(TString histname, TAxes const& axes, int& i, TString s)
+  void addHistogramND_stage(const TString& histname, TAxes const& axes, int& i, const TString& s)
   {
     i++;
     TString name = s + histname;
@@ -271,34 +271,34 @@ struct lmeelfcocktail {
   }
 
   template <typename TAxes>
-  void addHistogramND(TString histname, TAxes const& axes, int& i)
+  void addHistogramND(const TString& histname, TAxes const& axes, int& i)
   {
-    for (auto s : stage) {
+    for (const auto& s : stage) {
       addHistogramND_stage(histname, axes, i, s);
     }
   }
 
-  void fillHistogram1D(TString histname, int s, int pdg, int other_daughter_pdg, float value, float weight)
+  void fillHistogram1D(const TString& histname, int s, int pdg, int other_daughter_pdg, float value, float weight)
   {
     histograms1D[histogramId[stage[s] + histname]]->Fill(value, weight);
     histograms1D[histogramId[stage[s] + mesons[pdg].name + histname]]->Fill(value, weight);
     histograms1D[histogramId[stage[s] + mesons[pdg].name + decays[other_daughter_pdg] + histname]]->Fill(value, weight);
   }
 
-  void fillHistogram1D_mother(TString histname, int pdg, float value, float weight)
+  void fillHistogram1D_mother(const TString& histname, int pdg, float value, float weight)
   {
     histograms1D[histogramId[stage[0] + histname]]->Fill(value, weight);
     histograms1D[histogramId[stage[0] + mesons[pdg].name + histname]]->Fill(value, weight);
   }
 
-  void fillHistogram2D(TString histname, int s, int pdg, int other_daughter_pdg, float value1, float value2, float weight)
+  void fillHistogram2D(const TString& histname, int s, int pdg, int other_daughter_pdg, float value1, float value2, float weight)
   {
     histograms2D[histogramId[stage[s] + histname]]->Fill(value1, value2, weight);
     histograms2D[histogramId[stage[s] + mesons[pdg].name + histname]]->Fill(value1, value2, weight);
     histograms2D[histogramId[stage[s] + mesons[pdg].name + decays[other_daughter_pdg] + histname]]->Fill(value1, value2, weight);
   }
 
-  void fillHistogramND(TString histname, int s, int pdg, int other_daughter_pdg, double* values, double weight)
+  void fillHistogramND(const TString& histname, int s, int pdg, int other_daughter_pdg, double* values, double weight)
   {
     histogramsND[histogramId[stage[s] + histname]]->Fill(values, weight);
     histogramsND[histogramId[stage[s] + mesons[pdg].name + histname]]->Fill(values, weight);