Skip to content

Commit 3f77695

Browse files
Preet-BhanjanPreet-Bhanjan
authored
Merge branch 'AliceO2Group:master' into master
2 parents 919cc6d + 886200a commit 3f77695

12 files changed

Lines changed: 31 additions & 29 deletions

‎DPG/Tasks/AOTEvent/detectorOccupancyQa.cxx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -779,8 +779,8 @@ struct DetectorOccupancyQaTask {
779779
if (!col.selection_bit(kNoITSROFrameBorder))
780780
continue;
781781

782-
std::vector<int> vCollsAssocToGivenColl = vCollsInTimeWin[colIndex];
783-
std::vector<float> vCollsTimeDeltaWrtGivenColl = vTimeDeltaForColls[colIndex];
782+
const std::vector<int>& vCollsAssocToGivenColl = vCollsInTimeWin[colIndex];
783+
const std::vector<float>& vCollsTimeDeltaWrtGivenColl = vTimeDeltaForColls[colIndex];
784784

785785
LOGP(debug, " >> vCollsAssocToGivenColl.size={}", vCollsAssocToGivenColl.size());
786786

‎DPG/Tasks/AOTEvent/eventSelectionQa.cxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1415,7 +1415,7 @@ struct EventSelectionQaTask {
14151415
bool isVertexUPC = flags & dataformats::Vertex<o2::dataformats::TimeStamp<int>>::Flags::UPCMode; // is vertex with UPC settings
14161416

14171417
// the second collision in ROF
1418-
std::vector<int> vAssocToSameROF = vCollsInSameITSROF[colIndex];
1418+
const std::vector<int>& vAssocToSameROF = vCollsInSameITSROF[colIndex];
14191419
int thisColIndex = vAssocToSameROF[0];
14201420
float vZassoc = vCollVz[thisColIndex]; // vZ of the second collision in the same ROF
14211421
float nPVassoc = vTracksITS567perColl[thisColIndex]; // n PV tracks of the second collision in the same ROF

‎DPG/Tasks/AOTEvent/rofOccupancyQa.cxx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -754,7 +754,7 @@ struct RofOccupancyQaTask {
754754
// LOGP(info, "#### starting new coll: bc={} bcInTF={} bcInITSROF={} rofId={}; noROFborder={}; rofOffset={} rofLength={}", vFoundGlobalBC[colIndex], bcInTF, bcInITSROF, rofId, bc.selection_bit(kNoITSROFrameBorder), rofOffset, rofLength);
755755
// LOGP(info, "#### starting new coll: bcInTF={} bcInITSROF={} rofIdInTF={}; noROFborder={}, vZ={} mult={}; rofOffset={} rofLength={}", bcInTF, bcInITSROF, rofIdInTF, bc.selection_bit(kNoITSROFrameBorder), vZ, vTracksITS567perColl[colIndex], rofOffset, rofLength);
756756

757-
std::vector<int> vAssocToSameROF = vCollsInSameITSROF[colIndex];
757+
const std::vector<int>& vAssocToSameROF = vCollsInSameITSROF[colIndex];
758758
int nITS567tracksForRofVetoStrict = 0; // to veto events with other collisions in the same ITS ROF
759759
float nSumAmplFT0CforRofVetoStrict = 0; // to veto events with other collisions in the same ITS ROF
760760
// int nITS567tracksForRofVetoStandard = 0; // to veto events with other collisions in the same ITS ROF, with per-collision multiplicity above threshold
@@ -836,8 +836,8 @@ struct RofOccupancyQaTask {
836836
vArrNoCollInSameRofWithCloseVz.push_back(vVzCutThisColl);
837837
continue;
838838
}
839-
std::vector<int> vAssocToThisCol = vCollsInTimeWin[colIndex];
840-
std::vector<float> vCollsTimeDeltaWrtGivenColl = vTimeDeltaForColls[colIndex];
839+
const std::vector<int>& vAssocToThisCol = vCollsInTimeWin[colIndex];
840+
const std::vector<float>& vCollsTimeDeltaWrtGivenColl = vTimeDeltaForColls[colIndex];
841841
int nITS567tracksInFullTimeWindow = 0;
842842
int sumAmpFT0CInFullTimeWindow = 0;
843843
int nITS567tracksForVetoNarrow = 0; // to veto events with nearby collisions (narrower range)

‎DPG/Tasks/AOTTrack/PID/TOF/qaPIDTOF.cxx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -379,7 +379,7 @@ struct tofPidQa {
379379
int evtimeflag = 0;
380380

381381
if constexpr (fillHistograms) {
382-
for (auto t : tracks) {
382+
for (const auto& t : tracks) {
383383
if (!t.hasTOF()) { // Skipping tracks without TOF
384384
continue;
385385
}
@@ -529,7 +529,7 @@ struct tofPidQa {
529529
soa::Filtered<TrackCandidates> const& tracks)
530530
{
531531
isEventSelected<true>(collision, tracks);
532-
for (auto t : tracks) {
532+
for (const auto& t : tracks) {
533533
isTrackSelected<true>(collision, t);
534534
}
535535
}
@@ -543,7 +543,7 @@ struct tofPidQa {
543543
return;
544544
}
545545

546-
for (auto t : tracks) {
546+
for (const auto& t : tracks) {
547547
if (!isTrackSelected<false>(collision, t)) {
548548
continue;
549549
}

‎DPG/Tasks/AOTTrack/PID/TOF/qaPIDTOFDynamic.cxx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -401,7 +401,7 @@ struct tofPidQaDynamic {
401401
int evtimeflag = 0;
402402

403403
if constexpr (fillHistograms) {
404-
for (auto t : tracks) {
404+
for (const auto& t : tracks) {
405405
if (!t.hasTOF()) { // Skipping tracks without TOF
406406
continue;
407407
}
@@ -554,7 +554,7 @@ struct tofPidQaDynamic {
554554
tofResponse->processSetup(collision.bc_as<o2::aod::BCsWithTimestamps>());
555555

556556
isEventSelected<true>(collision, tracks);
557-
for (auto t : tracks) {
557+
for (const auto& t : tracks) {
558558
isTrackSelected<true>(collision, t);
559559
}
560560
}
@@ -568,7 +568,7 @@ struct tofPidQaDynamic {
568568
return;
569569
}
570570

571-
for (auto t : tracks) {
571+
for (const auto& t : tracks) {
572572
if (!isTrackSelected<false>(collision, t)) {
573573
continue;
574574
}

‎DPG/Tasks/AOTTrack/PID/TOF/qaPIDTOFEvTime.cxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ struct tofPidCollisionTimeQa {
167167
}
168168

169169
listEfficiency.setObject(new THashList);
170-
auto makeEfficiency = [&](TString effname, TString efftitle) {
170+
auto makeEfficiency = [&](const TString& effname, const TString& efftitle) {
171171
listEfficiency->Add(new TEfficiency(effname, efftitle + ";TOF multiplicity;Efficiency", nBinsMultiplicity, 0, rangeMultiplicity));
172172
};
173173

‎DPG/Tasks/AOTTrack/V0Cascades/perfK0sResolution.cxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -345,7 +345,7 @@ struct perfK0sResolution {
345345
}
346346

347347
template <typename TCollision>
348-
bool isEventAccepted(TCollision collision, bool fillHists)
348+
bool isEventAccepted(const TCollision& collision, bool fillHists)
349349
// check whether the collision passes our collision selections
350350
{
351351
if (fillHists)

‎DPG/Tasks/AOTTrack/qaEfficiency.cxx‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -500,7 +500,7 @@ struct QaEfficiency {
500500
subList->SetName(partName);
501501
listEfficiencyMC->Add(subList);
502502

503-
auto makeEfficiency = [&](const TString effname, auto h) { // 1D efficiencies
503+
auto makeEfficiency = [&](const TString& effname, const auto& h) { // 1D efficiencies
504504
LOG(debug) << " Making 1D TEfficiency " << effname << " from " << h->GetName();
505505
const TAxis* axis = h->GetXaxis();
506506
TString efftitle = h->GetTitle();
@@ -563,7 +563,7 @@ struct QaEfficiency {
563563
makeEfficiency("ITS-TPC_vsPhi_Prm_Trk", hPhiTrkItsTpcPrm[histogramIndex]);
564564
makeEfficiency("ITS-TPC-TOF_vsPhi_Prm", hPhiItsTpcTofPrm[histogramIndex]);
565565

566-
auto makeEfficiency2D = [&](const TString effname, auto h) { // 2D efficiencies
566+
auto makeEfficiency2D = [&](const TString& effname, const auto& h) { // 2D efficiencies
567567
LOG(debug) << " Making 2D TEfficiency " << effname << " from " << h->GetName();
568568
const TAxis* axisX = h->GetXaxis();
569569
const TAxis* axisY = h->GetYaxis();
@@ -898,7 +898,7 @@ struct QaEfficiency {
898898
listEfficiencyData.setObject(new THashList);
899899
if (makeEff) {
900900
LOG(debug) << "Making TEfficiency for Data";
901-
auto makeEfficiency = [&](TString effname, TString efftitle, auto templateHisto, TEfficiency*& eff) {
901+
auto makeEfficiency = [&](const TString& effname, const TString& efftitle, auto templateHisto, TEfficiency*& eff) {
902902
TAxis* axis = histos.get<TH1>(templateHisto)->GetXaxis();
903903
if (axis->IsVariableBinSize()) {
904904
eff = new TEfficiency(effname, efftitle, axis->GetNbins(), axis->GetXbins()->GetArray());
@@ -927,7 +927,7 @@ struct QaEfficiency {
927927
"TPC-TOF M.E. in data " + tagPhi + ";#it{#varphi} (rad);Efficiency", HIST("Data/pos/phi/its_tpc_tof"),
928928
effTPCTOFMatchingVsPhi);
929929

930-
auto makeEfficiency2D = [&](TString effname, TString efftitle, auto templateHistoX, auto templateHistoY, TEfficiency*& eff) {
930+
auto makeEfficiency2D = [&](const TString& effname, const TString& efftitle, auto templateHistoX, auto templateHistoY, TEfficiency*& eff) {
931931
TAxis* axisX = histos.get<TH1>(templateHistoX)->GetXaxis();
932932
TAxis* axisY = histos.get<TH1>(templateHistoY)->GetYaxis();
933933
if (axisX->IsVariableBinSize() || axisY->IsVariableBinSize()) {
@@ -1366,7 +1366,7 @@ struct QaEfficiency {
13661366
}
13671367

13681368
// Filling 1D efficiencies
1369-
auto doFillEfficiency = [&](const TString effname, auto num, auto den) {
1369+
auto doFillEfficiency = [&](const TString& effname, const auto& num, const auto& den) {
13701370
TEfficiency* eff = static_cast<TEfficiency*>(subList->FindObject(effname));
13711371
if (!eff) {
13721372
LOG(warning) << "Cannot find TEfficiency " << effname;
@@ -1436,7 +1436,7 @@ struct QaEfficiency {
14361436
}
14371437

14381438
// Filling 2D efficiencies
1439-
auto fillEfficiency2D = [&](const TString effname, auto num, auto den) {
1439+
auto fillEfficiency2D = [&](const TString& effname, const auto& num, const auto& den) {
14401440
TEfficiency* eff = static_cast<TEfficiency*>(subList->FindObject(effname));
14411441
if (!eff) {
14421442
LOG(warning) << "Cannot find TEfficiency " << effname;

‎DPG/Tasks/AOTTrack/qaEventTrackLite.cxx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ struct qaEventTrackLite {
154154
///
155155
return initBBok ? mMip * o2::common::BetheBlochAleph(x[0] / par[0], mBetheBlockAleph[0], mBetheBlockAleph[1], mBetheBlockAleph[2], mBetheBlockAleph[3], mBetheBlockAleph[4]) * std::pow(par[1], mChargeFactor) : 0.;
156156
}
157-
void setUpBetheBlockAleph(std::string str_case)
157+
void setUpBetheBlockAleph(const std::string& str_case)
158158
{
159159
if (str_case.find("LHC22c") != std::string::npos) {
160160
// From A. Kalteyer (2022 Jul 18)
@@ -418,7 +418,7 @@ struct qaEventTrackLite {
418418
histos.fill(HIST("Tracks/TPC/dEdxvsP"), p, track.tpcSignal());
419419
histos.fill(HIST("Tracks/TPC/dEdxvsPvsEta"), p, track.eta(), track.tpcSignal());
420420
if (betheBlock.initBBok) {
421-
auto tpcdEdxRes = [&](TF1 func) { return track.tpcSignal() - func.Eval(p); };
421+
auto tpcdEdxRes = [&](const TF1& func) { return track.tpcSignal() - func.Eval(p); };
422422
if (b_tpcResProton) {
423423
histos.fill(HIST("Tracks/TPC/dEdxvsPproton"), p, tpcdEdxRes(funcBBproton));
424424
histos.fill(HIST("Tracks/TPC/dEdxvsPprotonvsEta"), p, track.eta(), tpcdEdxRes(funcBBproton));

‎DPG/Tasks/AOTTrack/qaTrackSplitting.cxx‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
#include <cstdint>
3636
#include <map>
3737
#include <memory>
38+
#include <type_traits>
3839
#include <vector>
3940

4041
using namespace o2;
@@ -134,10 +135,11 @@ struct qaTrackSplitting {
134135
if (!collision.sel8()) {
135136
return;
136137
}
137-
typedef std::shared_ptr<TrackCandidatesMC::iterator> trkType;
138+
using TrackType = const TrackCandidatesMC::iterator;
139+
using TrackTypePtr = std::shared_ptr<TrackType>;
138140

139-
std::map<int64_t, std::vector<trkType>> particleUsageCounter;
140-
for (auto track : tracks) {
141+
std::map<int64_t, std::vector<TrackTypePtr>> particleUsageCounter;
142+
for (const auto& track : tracks) {
141143
histos.fill(HIST("tracks"), 0);
142144
if (!track.has_mcParticle()) {
143145
continue;
@@ -156,7 +158,7 @@ struct qaTrackSplitting {
156158
continue;
157159
}
158160
histos.fill(HIST("tracks"), 4);
159-
particleUsageCounter[track.mcParticleId()].push_back(std::make_shared<decltype(track)>(track));
161+
particleUsageCounter[track.mcParticleId()].push_back(std::make_shared<TrackType>(track));
160162
}
161163
for (const auto& [mcId, tracksMatched] : particleUsageCounter) {
162164
histos.fill(HIST("numberOfRecoed"), tracksMatched.size());

0 commit comments

Comments
 (0)