Skip to content

[PWGJE] Use const& and std::move to avoid copies #17710

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 1 commit into
base: master
Choose a base branch
from
Open

[PWGJE] Use const& and std::move to avoid copies #17710

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 4 additions & 3 deletions PWGJE/Core/JetBkgSubUtils.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
#include <algorithm>
#include <cstdlib>
#include <tuple>
#include <utility>
#include <vector>

#include <math.h>
Expand All @@ -41,7 +42,7 @@
constSubAlpha(constSubAlpha_out),
constSubRMax(constSubRMax_out),
nHardReject(nHardReject_out),
ghostAreaSpec(ghostAreaSpec_out)
ghostAreaSpec(std::move(ghostAreaSpec_out))

{
}
Expand Down Expand Up @@ -73,7 +74,7 @@
std::vector<double> rhoMdvector;

// Fill a vector for pT/area to be used for the median
for (auto& ijet : alljets) {

Check failure on line 77 in PWGJE/Core/JetBkgSubUtils.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[const-ref-in-for-loop] 

Use constant references for non-modified iterators in range-based for loops.

if (ijet.area() <= 0.0) {
continue;
Expand Down Expand Up @@ -162,11 +163,11 @@
return constituentSub(jets);
}

double JetBkgSubUtils::getMd(fastjet::PseudoJet jet) const
double JetBkgSubUtils::getMd(const fastjet::PseudoJet& jet) const
{
// Refere to https://arxiv.org/abs/1211.2811 for the rhoM caclulation
double sum(0);
for (auto constituent : jet.constituents()) {
for (const auto& constituent : jet.constituents()) {
sum += TMath::Sqrt(constituent.m() * constituent.m() + constituent.pt() * constituent.pt()) - constituent.pt();
}

Expand Down
5 changes: 3 additions & 2 deletions PWGJE/Core/JetBkgSubUtils.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
#include <fastjet/Selector.hh>

#include <tuple>
#include <utility>
#include <vector>

#include <math.h>
Expand Down Expand Up @@ -107,7 +108,7 @@ class JetBkgSubUtils
constSubRMax = rmax_out;
}
void setDoRhoMassSub(bool doMSub_out = true) { doRhoMassSub = doMSub_out; }
void setGhostAreaSpec(fastjet::GhostedAreaSpec ghostAreaSpec_out) { ghostAreaSpec = ghostAreaSpec_out; }
void setGhostAreaSpec(fastjet::GhostedAreaSpec ghostAreaSpec_out) { ghostAreaSpec = std::move(ghostAreaSpec_out); }

// Getters
float getJetBkgR() const { return jetBkgR; }
Expand All @@ -124,7 +125,7 @@ class JetBkgSubUtils
fastjet::Selector getRhoSelector() const { return selRho; }

// Calculate the jet mass
double getMd(fastjet::PseudoJet jet) const;
double getMd(const fastjet::PseudoJet& jet) const;

protected:
float jetBkgR = 0.2;
Expand Down
8 changes: 4 additions & 4 deletions PWGJE/Core/JetDerivedDataUtilities.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
};

template <typename T>
bool selectCollision(T const& collision, const std::vector<int>& eventSelectionMaskBits, bool skipMBGapEvents = true, bool rctSelection = true, std::string rctLabel = "CBT_hadronPID", bool rejectLimitedAcceptanceRct = false, bool requireZDCRct = false)
bool selectCollision(T const& collision, const std::vector<int>& eventSelectionMaskBits, bool skipMBGapEvents = true, bool rctSelection = true, const std::string& rctLabel = "CBT_hadronPID", bool rejectLimitedAcceptanceRct = false, bool requireZDCRct = false)
{

if (skipMBGapEvents && collision.getSubGeneratorId() == JCollisionSubGeneratorId::mbGap) {
Expand All @@ -78,7 +78,7 @@
return true;
}
bool isOrCondition = false;
for (auto eventSelectionMaskBit : eventSelectionMaskBits) {

Check failure on line 81 in PWGJE/Core/JetDerivedDataUtilities.h

View workflow job for this annotation

GitHub Actions / O2 linter

[const-ref-in-for-loop] 

Use constant references for non-modified iterators in range-based for loops.
if (eventSelectionMaskBit == -1) {
isOrCondition = true;
continue;
Expand All @@ -96,7 +96,7 @@
return !isOrCondition;
}

bool eventSelectionMasksContainSelection(const std::string& eventSelectionMasks, std::string selection)
bool eventSelectionMasksContainSelection(const std::string& eventSelectionMasks, const std::string& selection)
{
size_t position = 0;
while ((position = eventSelectionMasks.find(selection, position)) != std::string::npos) {
Expand Down Expand Up @@ -266,7 +266,7 @@
// Check for EMCAL in readout requires any of the EMCAL trigger classes (including EMC in MB trigger) to fire
std::array<triggerAliases, 11> selectAliases = {{triggerAliases::kTVXinEMC, triggerAliases::kEMC7, triggerAliases::kDMC7, triggerAliases::kEG1, triggerAliases::kEG2, triggerAliases::kDG1, triggerAliases::kDG2, triggerAliases::kEJ1, triggerAliases::kEJ2, triggerAliases::kDJ1, triggerAliases::kDJ2}};
bool found = false;
for (auto alias : selectAliases) {

Check failure on line 269 in PWGJE/Core/JetDerivedDataUtilities.h

View workflow job for this annotation

GitHub Actions / O2 linter

[const-ref-in-for-loop] 

Use constant references for non-modified iterators in range-based for loops.
if (collision.alias_bit(alias)) {
found = true;
break;
Expand Down Expand Up @@ -308,7 +308,7 @@
if (triggerMaskBits.size() == 0) {
return true;
}
for (auto triggerMaskBit : triggerMaskBits) {

Check failure on line 311 in PWGJE/Core/JetDerivedDataUtilities.h

View workflow job for this annotation

GitHub Actions / O2 linter

[const-ref-in-for-loop] 

Use constant references for non-modified iterators in range-based for loops.
if (collision.triggerSel() & (1ULL << triggerMaskBit)) {
return true;
}
Expand All @@ -325,7 +325,7 @@
return collision.triggerSel() & (1ULL << triggerMaskBit);
}

bool triggerMasksContainTrigger(const std::string& triggerMasks, std::string trigger)
bool triggerMasksContainTrigger(const std::string& triggerMasks, const std::string& trigger)
{
size_t position = 0;
while ((position = triggerMasks.find(trigger, position)) != std::string::npos) {
Expand Down Expand Up @@ -733,7 +733,7 @@
return std::abs(track.dcaZ()) < dcaZmax;
}

std::vector<int> initialiseClusterDefinitions(const std::string clusterDefinitions)
std::vector<int> initialiseClusterDefinitions(const std::string& clusterDefinitions)
{
std::vector<int> clusterDefinitionsVec;
if (clusterDefinitions.empty()) {
Expand Down
5 changes: 3 additions & 2 deletions PWGJE/Core/JetFindingUtilities.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
#include <memory>
#include <string>
#include <type_traits>
#include <utility>
#include <vector>

#include <math.h>
Expand Down Expand Up @@ -116,7 +117,7 @@
template <typename T, typename U>
void analyseTracks(std::vector<fastjet::PseudoJet>& inputParticles, T const& tracks, int trackSelection, const U* candidate = nullptr)
{
for (auto& track : tracks) {

Check failure on line 120 in PWGJE/Core/JetFindingUtilities.h

View workflow job for this annotation

GitHub Actions / O2 linter

[const-ref-in-for-loop] 

Use constant references for non-modified iterators in range-based for loops.
if (isTrackSelected(track, trackSelection, candidate)) {
fastjetutilities::fillTracks(track, inputParticles, track.globalIndex());
}
Expand All @@ -135,11 +136,11 @@
template <typename T, typename U>
void analyseTracksMultipleCandidates(std::vector<fastjet::PseudoJet>& inputParticles, T const& tracks, int trackSelection, U const& candidates)
{
for (auto& track : tracks) {

Check failure on line 139 in PWGJE/Core/JetFindingUtilities.h

View workflow job for this annotation

GitHub Actions / O2 linter

[const-ref-in-for-loop] 

Use constant references for non-modified iterators in range-based for loops.
if (!jetderiveddatautilities::selectTrack(track, trackSelection)) {
continue;
}
for (auto& candidate : candidates) {

Check failure on line 143 in PWGJE/Core/JetFindingUtilities.h

View workflow job for this annotation

GitHub Actions / O2 linter

[const-ref-in-for-loop] 

Use constant references for non-modified iterators in range-based for loops.
if (jetcandidateutilities::isDaughterTrack(track, candidate)) {
continue;
}
Expand Down Expand Up @@ -278,12 +279,12 @@
* @param doHFJetFinding set whether only jets containing a HF candidate are saved
*/
template <typename T, typename U, typename V>
void findJets(JetFinder& jetFinder, std::vector<fastjet::PseudoJet>& inputParticles, float jetPtMin, float jetPtMax, std::vector<double> jetRadius, float jetAreaFractionMin, T const& collision, U& jetsTable, V& constituentsTable, std::shared_ptr<THn> thnSparseJet, bool fillThnSparse, bool doCandidateJetFinding = false)
void findJets(JetFinder& jetFinder, std::vector<fastjet::PseudoJet>& inputParticles, float jetPtMin, float jetPtMax, std::vector<double> jetRadius, float jetAreaFractionMin, T const& collision, U& jetsTable, V& constituentsTable, const std::shared_ptr<THn>& thnSparseJet, bool fillThnSparse, bool doCandidateJetFinding = false)
{
auto jetRValues = static_cast<std::vector<double>>(jetRadius);
auto jetRValues = static_cast<std::vector<double>>(std::move(jetRadius));
jetFinder.jetPtMin = jetPtMin;
jetFinder.jetPtMax = jetPtMax;
for (auto R : jetRValues) {

Check failure on line 287 in PWGJE/Core/JetFindingUtilities.h

View workflow job for this annotation

GitHub Actions / O2 linter

[const-ref-in-for-loop] 

Use constant references for non-modified iterators in range-based for loops.
jetFinder.jetR = R;
std::vector<fastjet::PseudoJet> jets;
fastjet::ClusterSequenceArea clusterSeq(jetFinder.findJets(inputParticles, jets));
Expand Down Expand Up @@ -341,7 +342,7 @@
template <bool checkIsDaughter, typename T, typename U>
void analyseParticles(std::vector<fastjet::PseudoJet>& inputParticles, const std::string& particleSelection, int jetTypeParticleLevel, T const& particles, o2::framework::Service<o2::framework::O2DatabasePDG> pdgDatabase, const U* candidate = nullptr)
{
for (auto& particle : particles) {

Check failure on line 345 in PWGJE/Core/JetFindingUtilities.h

View workflow job for this annotation

GitHub Actions / O2 linter

[const-ref-in-for-loop] 

Use constant references for non-modified iterators in range-based for loops.
if (particleSelection == "PhysicalPrimary" && !particle.isPhysicalPrimary()) { // CHECK : Does this exclude the HF hadron?
continue;
} else if (particleSelection == "HepMCStatus" && particle.getHepMCStatusCode() != 1) { // do we need isPhysicalPrimary as well? Note: Might give unforseen results if the generator isnt PYTHIA
Expand All @@ -356,7 +357,7 @@
}
auto pdgParticle = pdgDatabase->GetParticle(particle.pdgCode());
auto pdgCharge = pdgParticle ? std::abs(pdgParticle->Charge()) : -1.0;
if (jetTypeParticleLevel == static_cast<int>(JetType::charged) && pdgCharge < 3.0) {

Check failure on line 360 in PWGJE/Core/JetFindingUtilities.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.
continue;
}
if (jetTypeParticleLevel == static_cast<int>(JetType::neutral) && pdgCharge != 0.0) {
Expand Down
9 changes: 4 additions & 5 deletions PWGJE/Core/MlResponseHfTagging.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,9 @@
// Fill the map of available input features
// the key is the feature's name (std::string)
// the value is the corresponding value in EnumInputFeatures
#define FILL_MAP_BJET(FEATURE) \
{ \
#FEATURE, static_cast<uint8_t>(InputFeaturesBTag::FEATURE) \
}
#define FILL_MAP_BJET(FEATURE) \
{ \
#FEATURE, static_cast<uint8_t>(InputFeaturesBTag::FEATURE)}

// Check if the index of mCachedIndices (index associated to a FEATURE)
// matches the entry in EnumInputFeatures associated to this FEATURE
Expand Down Expand Up @@ -424,7 +423,7 @@ class GNNBjetAllocator : public TensorAllocator

public:
GNNBjetAllocator() : TensorAllocator(), nJetFeat(4), nTrkFeat(13), nFlav(3), nTrkOrigin(5), maxNNodes(40), tfFunc([](float x) { return x; }) {}
GNNBjetAllocator(int64_t nJetFeat, int64_t nTrkFeat, int64_t nFlav, int64_t nTrkOrigin, std::vector<float>& tfJetMean, std::vector<float>& tfJetStdev, std::vector<float>& tfTrkMean, std::vector<float>& tfTrkStdev, int64_t maxNNodes = 40, std::string tfFuncType = "linear")
GNNBjetAllocator(int64_t nJetFeat, int64_t nTrkFeat, int64_t nFlav, int64_t nTrkOrigin, std::vector<float>& tfJetMean, std::vector<float>& tfJetStdev, std::vector<float>& tfTrkMean, std::vector<float>& tfTrkStdev, int64_t maxNNodes = 40, const std::string& tfFuncType = "linear")
: TensorAllocator(), nJetFeat(nJetFeat), nTrkFeat(nTrkFeat), nFlav(nFlav), nTrkOrigin(nTrkOrigin), maxNNodes(maxNNodes), tfJetMean(tfJetMean), tfJetStdev(tfJetStdev), tfTrkMean(tfTrkMean), tfTrkStdev(tfTrkStdev), tfFunc([](float x) { return x; })
{
if (tfFuncType == "asinh") {
Expand Down
3 changes: 2 additions & 1 deletion PWGJE/DataModel/EMCALClusterDefinition.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
#define PWGJE_DATAMODEL_EMCALCLUSTERDEFINITION_H_

#include <string>
#include <utility>

namespace o2::aod
{
Expand Down Expand Up @@ -50,7 +51,7 @@ struct EMCALClusterDefinition {
algorithm = pAlgorithm;
storageID = pStorageID;
selectedCellType = pSelectedCellType;
name = pName;
name = std::move(pName);
seedEnergy = pSeedEnergy;
minCellEnergy = pMinCellEnergy;
timeMin = pTimeMin;
Expand Down
2 changes: 1 addition & 1 deletion PWGJE/TableProducer/derivedDataProducer.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -620,7 +620,7 @@ struct JetDerivedDataProducerTask {
void processClusters(aod::Collision const&, aod::EMCALClusters const& clusters, aod::EMCALClusterCells const& cells, aod::Calos const&, aod::EMCALMatchedTracks const& matchedTracks, soa::Join<aod::Tracks, aod::TracksExtra> const&)
{

for (auto cluster : clusters) {
for (const auto& cluster : clusters) {

auto const clusterCells = cells.sliceBy(preslices.perClusterCells, cluster.globalIndex());

Expand Down
4 changes: 2 additions & 2 deletions PWGJE/TableProducer/derivedDataSelector.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,9 +155,9 @@ struct JetDerivedDataSelector {

void processSelectMcCollisionsPerCollision(aod::JMcCollisions const& mcCollisions, soa::Join<aod::JCollisions, aod::JMcCollisionLbs> const& collisions)
{
for (auto mcCollision : mcCollisions) {
for (const auto& mcCollision : mcCollisions) {
const auto collisionsPerMcCollision = collisions.sliceBy(CollisionsPerMcCollision, mcCollision.globalIndex());
for (auto collision : collisionsPerMcCollision) {
for (const auto& collision : collisionsPerMcCollision) {
if (collisionFlag[collision.globalIndex()]) {
mcCollisionFlag[mcCollision.globalIndex()] = true;
}
Expand Down
4 changes: 2 additions & 2 deletions PWGJE/TableProducer/derivedDataWriter.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -711,11 +711,11 @@ struct JetDerivedDataWriter {

const auto particlesPerMcCollision = particles.sliceBy(preslices.ParticlesPerMcCollision, mcCollision.globalIndex());

for (auto particle : particlesPerMcCollision) {
for (const auto& particle : particlesPerMcCollision) {
particleMapping[particle.globalIndex()] = particleTableIndex;
particleTableIndex++;
}
for (auto particle : particlesPerMcCollision) {
for (const auto& particle : particlesPerMcCollision) {

std::vector<int32_t> mothersIds;
int daughtersIds[2] = {-1, -1};
Expand Down
2 changes: 1 addition & 1 deletion PWGJE/TableProducer/mcOutlierRejector.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ struct McOutlierRejectorTask {
if (selectionObjects.size() != 0) {
float selectionObjectPt = 0.0;
if constexpr (std::is_same_v<std::decay_t<T>, aod::JetTracksMCD> || std::is_same_v<std::decay_t<T>, aod::JetParticles>) {
for (auto selectionObject : selectionObjects) {
for (const auto& selectionObject : selectionObjects) {
selectionObjectPt = selectionObject.pt();
// may be slow - could save only MC particle then check difference only for tracks IDd as outliers?
if constexpr (std::is_same_v<std::decay_t<T>, aod::JetTracksMCD>) { // tracks
Expand Down
2 changes: 1 addition & 1 deletion PWGJE/Tasks/emcalGammaGammaBcWise.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ bool isPhotonAccepted(Photon const& p, emcal::Geometry* emcalGeom = nullptr)
}

struct Meson {
Meson(Photon p1, Photon p2) : p1(p1), p2(p2)
Meson(const Photon& p1, const Photon& p2) : p1(p1), p2(p2)
{
pMeson = p1.photon + p2.photon;
}
Expand Down
4 changes: 2 additions & 2 deletions PWGJE/Tasks/emcalPi0EnergyScaleCalib.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,8 +178,8 @@ struct Photon {
};

struct Meson {
Meson(Photon p1, Photon p2) : pgamma1(p1),
pgamma2(p2)
Meson(const Photon& p1, const Photon& p2) : pgamma1(p1),
pgamma2(p2)
{
pMeson = p1.photon + p2.photon;
}
Expand Down
4 changes: 2 additions & 2 deletions PWGJE/Tasks/fullJetSpectra.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1185,7 +1185,7 @@ struct FullJetSpectra {
if (bcs.size() == 0) {
return;
}
for (auto bc : bcs) {
for (const auto& bc : bcs) {
registry.fill(HIST("hBCCounter"), 0.5); // All BC
if (bc.selection_bit(aod::evsel::EventSelectionFlags::kIsTriggerTVX)) {
registry.fill(HIST("hBCCounter"), 1.5); // BC+TVX
Expand All @@ -1197,7 +1197,7 @@ struct FullJetSpectra {
}
}
auto collisionsInBC = collisions.sliceBy(perFoundBC, bc.globalIndex());
for (auto collision : collisionsInBC) {
for (const auto& collision : collisionsInBC) {
registry.fill(HIST("hBCCounter"), 4.5); // CollinBC
if (collision.selection_bit(o2::aod::evsel::kIsTriggerTVX)) {
registry.fill(HIST("hBCCounter"), 5.5); // CollinBC+TVX
Expand Down
2 changes: 1 addition & 1 deletion PWGJE/Tasks/fullJetTriggerQATask.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -420,7 +420,7 @@ struct JetTriggerQA {
}

template <typename T, typename U>
void check_maxJetPt(T const jet, U& vecMaxJet)
void check_maxJetPt(T const& jet, U& vecMaxJet)
{
for (unsigned int i = 0; i < vecMaxJet.size(); i++) {
auto maxJet = vecMaxJet[i];
Expand Down
2 changes: 1 addition & 1 deletion PWGJE/Tasks/jetD0AngSubstructure.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -698,7 +698,7 @@ struct JetD0AngSubstructure {
typename JetTableMCP,
typename CandidatesMCD,
typename CandidatesMCP>
void analyseMonteCarlo(MCPJetsPerMCCollissionPreslice jetmcpreslice,
void analyseMonteCarlo(const MCPJetsPerMCCollissionPreslice& jetmcpreslice,
aod::JetMcCollisions const& mccollisions,
aod::JetCollisionsMCD const& collisions,
JetTableMCD const& /*mcdjets*/,
Expand Down
6 changes: 3 additions & 3 deletions PWGJE/Tasks/jetDebug.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ struct JetDebugTask {
if (jetderiveddatautilities::selectCollision(collision, eventSelection, false, false)) {
registry.fill(HIST("h_collisions"), 2.0);
}
for (auto track : tracks) {
for (const auto& track : tracks) {
registry.fill(HIST("h_track_pt"), track.pt());
registry.fill(HIST("h_track_phi"), track.phi());
registry.fill(HIST("h_track_eta"), track.eta());
Expand Down Expand Up @@ -218,7 +218,7 @@ struct JetDebugTask {
if (jetderiveddatautilities::selectCollision(collision, eventSelection, false, false)) {
registry.fill(HIST("h_collisions"), 2.0);
}
for (auto track : tracks) {
for (const auto& track : tracks) {
registry.fill(HIST("h_track_pt"), track.pt());
registry.fill(HIST("h_track_phi"), track.phi());
registry.fill(HIST("h_track_eta"), track.eta());
Expand Down Expand Up @@ -299,7 +299,7 @@ struct JetDebugTask {

void processMCPCharged(aod::JMcCollision const&, soa::Join<aod::ChargedMCParticleLevelJets, aod::ChargedMCParticleLevelJetConstituents> const& jets, aod::JMcParticles const& tracks)
{
for (auto track : tracks) {
for (const auto& track : tracks) {
registry.fill(HIST("h_particle_pt"), track.pt());
registry.fill(HIST("h_particle_phi"), track.phi());
registry.fill(HIST("h_particle_eta"), track.eta());
Expand Down
4 changes: 2 additions & 2 deletions PWGJE/Tasks/jetFinderQA.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -982,7 +982,7 @@ struct JetFinderQATask {
if (!jetderiveddatautilities::selectCollision(collision, eventSelectionBits)) {
return;
}
for (auto jet : jets) {
for (const auto& jet : jets) {
if (!jetfindingutilities::isInEtaAcceptance(jet, jetEtaMin, jetEtaMax, trackEtaMin, trackEtaMax)) {
continue;
}
Expand All @@ -1004,7 +1004,7 @@ struct JetFinderQATask {
if (!jetderiveddatautilities::selectCollision(collision, eventSelectionBits)) {
return;
}
for (auto jet : jets) {
for (const auto& jet : jets) {
if (!jetfindingutilities::isInEtaAcceptance(jet, jetEtaMin, jetEtaMax, trackEtaMin, trackEtaMax)) {
continue;
}
Expand Down
2 changes: 1 addition & 1 deletion PWGJE/Tasks/jetSubstructureOutput.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,7 +308,7 @@ struct JetSubstructureOutputTask {
void processClearMapsMCP(aod::JetMcCollisions const& mcCollisions)
{
jetMappingMCP.clear();
for (auto mcCollision : mcCollisions) {
for (const auto& mcCollision : mcCollisions) {
mcCollisionOutputTable(mcCollision.posZ(), mcCollision.accepted(), mcCollision.attempted(), mcCollision.xsectGen(), mcCollision.xsectErr(), mcCollision.weight());
}
}
Expand Down
6 changes: 3 additions & 3 deletions PWGJE/Tasks/jetTutorial.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -335,7 +335,7 @@ struct JetTutorialTask {
if (!jetderiveddatautilities::selectCollision(collision, eventSelectionBits)) {
return;
}
for (auto jet : jets) {
for (const auto& jet : jets) {
registry.fill(HIST("h_jet_pt"), jet.pt());
registry.fill(HIST("h_jet_pt_rhosub"), jet.pt() - (collision.rho() * jet.area()));
registry.fill(HIST("h_jet_eta"), jet.eta());
Expand All @@ -349,7 +349,7 @@ struct JetTutorialTask {
if (!jetderiveddatautilities::selectCollision(collision, eventSelectionBits)) {
return;
}
for (auto jet : jets) {
for (const auto& jet : jets) {
registry.fill(HIST("h_jet_pt_constsub"), jet.pt());
registry.fill(HIST("h_jet_eta"), jet.eta());
registry.fill(HIST("h_jet_phi"), jet.phi());
Expand All @@ -362,7 +362,7 @@ struct JetTutorialTask {
if (!jetderiveddatautilities::selectCollision(collision, eventSelectionBits)) {
return;
}
for (auto jet : jets) {
for (const auto& jet : jets) {
registry.fill(HIST("h_jet_pt_constsub"), jet.pt());
registry.fill(HIST("h_jet_eta"), jet.eta());
registry.fill(HIST("h_jet_phi"), jet.phi());
Expand Down
2 changes: 1 addition & 1 deletion PWGJE/Tasks/jetValidationQA.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -410,7 +410,7 @@ struct mcJetTrackCollisionQa {

// fill qa histograms for selected tracks in collision
template <class ValidationTracks, typename coll>
void fillMcTrackHistos(ValidationTracks const& mct, coll collision, bool mc) // could give collision as argument for additional association
void fillMcTrackHistos(ValidationTracks const& mct, const coll& collision, bool mc) // could give collision as argument for additional association
{
for (const auto& track : mct) {
if (!jetderiveddatautilities::selectTrack(track, trackSelection) || !(track.collisionId() == collision.globalIndex())) {
Expand Down
4 changes: 2 additions & 2 deletions PWGJE/Tasks/mcGeneratorStudies.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ struct MCGeneratorStudies {
}

template <typename TMCParticle, typename TMCParticles>
bool isGammaGammaDecay(TMCParticle mcParticle, TMCParticles mcParticles)
bool isGammaGammaDecay(const TMCParticle& mcParticle, const TMCParticles& mcParticles)
{
auto daughtersIds = mcParticle.daughtersIds();
if (daughtersIds.size() != 2)
Expand All @@ -237,7 +237,7 @@ struct MCGeneratorStudies {
}

template <typename TMCParticle, typename TMCParticles>
bool isAccepted(TMCParticle mcParticle, TMCParticles mcParticles)
bool isAccepted(const TMCParticle& mcParticle, const TMCParticles& mcParticles)
{
auto daughtersIds = mcParticle.daughtersIds();
if (daughtersIds.size() != 2)
Expand Down
4 changes: 2 additions & 2 deletions PWGJE/Tasks/nucleiInJets.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -791,7 +791,7 @@ struct nucleiInJets {
}

template <typename TrackType>
bool isTrackSelectedWithoutDcaxy(const TrackType track)
bool isTrackSelectedWithoutDcaxy(const TrackType& track)
{
// standard track selection
if (track.pt() < cfgtrkMinPt)
Expand Down Expand Up @@ -822,7 +822,7 @@ struct nucleiInJets {
}

template <typename TrackType>
bool isTrackSelected(const TrackType track)
bool isTrackSelected(const TrackType& track)
{
if (!isTrackSelectedWithoutDcaxy(track))
return false;
Expand Down
Loading
Loading