Skip to content

[PWGEM] Use const& and std::move to avoid copies #17708

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
vkucera wants to merge 2 commits into
base: master
Choose a base branch
from
+84 −82
Open

[PWGEM] Use const& and std::move to avoid copies #17708

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f6fd7c3
Use `const&` and `std::move` to avoid copies
vkucera Sep 1, 2026
5bec802
Merge branch 'master' into const-PWGEM
vkucera Sep 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions PWGEM/Dilepton/Core/DielectronCut.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion PWGEM/Dilepton/Core/DielectronCut.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,7 @@
int pbin = lower_bound(mMLBins.begin(), mMLBins.end(), track.tpcInnerParam()) - mMLBins.begin() - 1;
if (pbin < 0) {
pbin = 0;
} else if (static_cast<int>(mMLBins.size()) - 2 < pbin) {

Check failure on line 288 in PWGEM/Dilepton/Core/DielectronCut.h

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number] 

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
pbin = static_cast<int>(mMLBins.size()) - 2;
}
// LOGF(info, "track.tpcInnerParam() = %f, pbin = %d, track.probElBDT() = %f, mMLCuts[pbin] = %f", track.tpcInnerParam(), pbin, track.probElBDT(), mMLCuts[pbin]);
Expand Down Expand Up @@ -537,7 +537,7 @@
// 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.";
Expand Down
2 changes: 1 addition & 1 deletion PWGEM/Dilepton/Core/Dilepton.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -488,10 +488,10 @@
}

// In case override, don't proceed, please - no CCDB access required
if (d_bz_input > -990) {

Check failure on line 491 in PWGEM/Dilepton/Core/Dilepton.h

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number] 

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
d_bz = d_bz_input;
o2::parameters::GRPMagField grpmag;
if (std::fabs(d_bz) > 1e-5) {

Check failure on line 494 in PWGEM/Dilepton/Core/Dilepton.h

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number] 

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
grpmag.setL3Current(30000.f / (d_bz / 5.0f));
}
o2::base::Propagator::initFieldFromGRP(&grpmag);
Expand Down Expand Up @@ -589,7 +589,7 @@
pair_dca_axis_title = "DCA_{ee}^{3D} (#sigma)";
if (cfgDCAType == 1) {
pair_dca_axis_title = "DCA_{ee}^{XY} (#sigma)";
} else if (cfgDCAType == 2) {

Check failure on line 592 in PWGEM/Dilepton/Core/Dilepton.h

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number] 

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
pair_dca_axis_title = "DCA_{ee}^{Z} (#sigma)";
}
if (cfgUseSignedDCA) {
Expand Down Expand Up @@ -716,9 +716,9 @@
}

// event info
if (nmod == 2) {

Check failure on line 719 in PWGEM/Dilepton/Core/Dilepton.h

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number] 

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
o2::aod::pwgem::dilepton::utils::eventhistogram::addEventHistograms<2>(&fRegistry);
} else if (nmod == 3) {

Check failure on line 721 in PWGEM/Dilepton/Core/Dilepton.h

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number] 

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
o2::aod::pwgem::dilepton::utils::eventhistogram::addEventHistograms<3>(&fRegistry);
} else {
o2::aod::pwgem::dilepton::utils::eventhistogram::addEventHistograms<-1>(&fRegistry);
Expand Down Expand Up @@ -836,7 +836,7 @@
fDimuonCut.SetMatchingChi2MCHMID(0.f, dimuoncuts.cfg_max_matching_chi2_mchmid);
fDimuonCut.SetDCAxy(0.f, dimuoncuts.cfg_max_dcaxy);
fDimuonCut.SetRabs(dimuoncuts.cfg_min_rabs, dimuoncuts.cfg_max_rabs);
fDimuonCut.SetMaxPDCARabsDep([&](float rabs) { return (rabs < 26.5 ? 594.f : 324.f); });

Check failure on line 839 in PWGEM/Dilepton/Core/Dilepton.h

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number] 

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
fDimuonCut.SetMaxdPtdEtadPhiwrtMCHMID(dimuoncuts.cfg_max_relDPt_wrt_matchedMCHMID, dimuoncuts.cfg_max_DEta_wrt_matchedMCHMID, dimuoncuts.cfg_max_DPhi_wrt_matchedMCHMID); // this is relevant for global muons
fDimuonCut.SetMFTHitMap(dimuoncuts.requireMFTHitMap, dimuoncuts.requiredMFTDisks);
fDimuonCut.EnableTTCA(dimuoncuts.enableTTCA);
Expand All @@ -847,7 +847,7 @@
{
bool is_good = true;
for (const auto& qn : qvectors[nmod]) {
if (std::fabs(qn[0]) > 20.f || std::fabs(qn[1]) > 20.f) {

Check failure on line 850 in PWGEM/Dilepton/Core/Dilepton.h

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number] 

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
is_good = false;
break;
}
Expand Down Expand Up @@ -881,7 +881,7 @@
}

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) {
Expand Down Expand Up @@ -946,7 +946,7 @@
} else {
pair_dca = o2::aod::pwgem::dilepton::utils::pairutil::pairDCAQuadSum(o2::aod::pwgem::dilepton::utils::emtrackutil::dcaXYinSigma(t1), o2::aod::pwgem::dilepton::utils::emtrackutil::dcaXYinSigma(t2));
}
} else if (cfgDCAType == 2) {

Check failure on line 949 in PWGEM/Dilepton/Core/Dilepton.h

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number] 

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
if (cfgUseSignedDCA) {
pair_dca = o2::aod::pwgem::dilepton::utils::pairutil::pairDCASignQuadSum(o2::aod::pwgem::dilepton::utils::emtrackutil::dcaZinSigma(t1), o2::aod::pwgem::dilepton::utils::emtrackutil::dcaZinSigma(t2), t1.sign(), t2.sign());
} else {
Expand All @@ -973,7 +973,7 @@
fRegistry.fill(HIST("Pair/") + HIST(event_pair_types[ev_id]) + HIST("uls/hMvsOpAng"), opAng, v12.M(), weight);
if (cfgDCAType == 1) {
fRegistry.fill(HIST("Pair/") + HIST(event_pair_types[ev_id]) + HIST("uls/hDCA1vsDCA2"), o2::aod::pwgem::dilepton::utils::emtrackutil::dcaXYinSigma(t1), o2::aod::pwgem::dilepton::utils::emtrackutil::dcaXYinSigma(t2), weight);
} else if (cfgDCAType == 2) {

Check failure on line 976 in PWGEM/Dilepton/Core/Dilepton.h

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number] 

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
fRegistry.fill(HIST("Pair/") + HIST(event_pair_types[ev_id]) + HIST("uls/hDCA1vsDCA2"), o2::aod::pwgem::dilepton::utils::emtrackutil::dcaZinSigma(t1), o2::aod::pwgem::dilepton::utils::emtrackutil::dcaZinSigma(t2), weight);
}
}
Expand Down
2 changes: 1 addition & 1 deletion PWGEM/Dilepton/Core/DileptonSV.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
7 changes: 4 additions & 3 deletions PWGEM/Dilepton/Core/DimuonCut.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
#include <Rtypes.h>

#include <functional>
#include <utility>
#include <vector>

ClassImp(DimuonCut);
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion PWGEM/Dilepton/TableProducer/skimmerPrimaryMuon.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,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;
Expand Down
4 changes: 2 additions & 2 deletions PWGEM/Dilepton/Tasks/MCtemplates.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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.
Expand Down
8 changes: 4 additions & 4 deletions PWGEM/Dilepton/Tasks/emEfficiencyEE.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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++;
}
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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.
Expand Down
36 changes: 18 additions & 18 deletions PWGEM/Dilepton/Tasks/lmeeLFCocktail.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down Expand Up @@ -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;
Expand All @@ -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;
Expand All @@ -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;
Expand All @@ -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;
Expand All @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion PWGEM/Dilepton/Tasks/matchingMFT.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -515,7 +515,7 @@ struct matchingMFT {
}

template <bool withMFTCov = false, typename TCollision, typename TFwdTrack, typename TFwdTracks, typename TMFTTracks, typename TMFTTracksCov>
void fillHistograms(TCollision const& collision, TFwdTrack fwdtrack, TFwdTracks const&, TMFTTracks const&, TMFTTracksCov const& mftCovs)
void fillHistograms(TCollision const& collision, const TFwdTrack& fwdtrack, TFwdTracks const&, TMFTTracks const&, TMFTTracksCov const& mftCovs)
{
if (fwdtrack.trackType() != o2::aod::fwdtrack::ForwardTrackTypeEnum::GlobalMuonTrack) { // only for protection
return;
Expand Down
4 changes: 2 additions & 2 deletions PWGEM/Dilepton/Tasks/tableReaderBarrel.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ constexpr static uint32_t gkTrackFillMapWithColl = VarManager::ObjTypes::Reduced
constexpr static int pairTypeEE = VarManager::kDecayToEE;

// Global function used to define needed histogram classes
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;
Expand Down Expand Up @@ -1235,7 +1235,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.
Expand Down
Loading
Loading