Skip to content

Commit cb22790

Browse files
skundu692skundu692
committed
fix build error
1 parent 3ac5dbc commit cb22790

2 files changed

Lines changed: 67 additions & 76 deletions

File tree

‎PWGLF/TableProducer/Common/zdc2stagecalibration.cxx‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
#include <Framework/OutputObjHeader.h>
3636
#include <Framework/runDataProcessing.h>
3737

38+
#include <TH1.h>
3839
#include <TH2.h>
3940
#include <TH3.h>
4041

@@ -59,7 +60,7 @@ struct zdc2stagecalibration {
5960
Configurable<std::string> cfgURL{"cfgURL", "http://alice-ccdb.cern.ch", "Address of the CCDB to browse"};
6061
} cfgCcdbParam;
6162

62-
Service<o2::ccdb::BasicCCDBManager> ccdb;
63+
Service<o2::ccdb::BasicCCDBManager> ccdb{};
6364
HistogramRegistry histos{"histos", {}, OutputObjHandlingPolicy::AnalysisObject};
6465

6566
Configurable<float> cfgCutVertex{"cfgCutVertex", 10.0f, "Accepted z-vertex range"};

‎PWGLF/Tasks/Resonances/doublephimeson.cxx‎

Lines changed: 65 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -405,8 +405,8 @@ struct doublephimeson {
405405

406406
// get kstar
407407
TLorentzVector trackSum, PartOneCMS, PartTwoCMS, trackRelK;
408-
float getkstar(const TLorentzVector part1,
409-
const TLorentzVector part2)
408+
float getkstar(const TLorentzVector& part1,
409+
const TLorentzVector& part2)
410410
{
411411
// const TLorentzVector trackSum = part1 + part2;
412412
trackSum = part1 + part2;
@@ -426,39 +426,37 @@ struct doublephimeson {
426426
return 0.5 * trackRelK.P();
427427
}
428428

429-
float deepangle2(const ROOT::Math::PtEtaPhiMVector candidate1,
430-
const ROOT::Math::PtEtaPhiMVector candidate2)
429+
float deepangle2(const ROOT::Math::PtEtaPhiMVector& candidate1,
430+
const ROOT::Math::PtEtaPhiMVector& candidate2)
431431
{
432-
double pt1, pt2, pz1, pz2, p1, p2, angle;
433-
pt1 = candidate1.Pt();
434-
pt2 = candidate2.Pt();
435-
pz1 = candidate1.Pz();
436-
pz2 = candidate2.Pz();
437-
p1 = candidate1.P();
438-
p2 = candidate2.P();
439-
angle = TMath::ACos((pt1 * pt2 + pz1 * pz2) / (p1 * p2));
432+
const double pt1 = candidate1.Pt();
433+
const double pt2 = candidate2.Pt();
434+
const double pz1 = candidate1.Pz();
435+
const double pz2 = candidate2.Pz();
436+
const double p1 = candidate1.P();
437+
const double p2 = candidate2.P();
438+
const double angle = TMath::ACos((pt1 * pt2 + pz1 * pz2) / (p1 * p2));
440439
return angle;
441440
}
442441

443-
float deepangle(const TLorentzVector candidate1,
444-
const TLorentzVector candidate2)
442+
float deepangle(const TLorentzVector& candidate1,
443+
const TLorentzVector& candidate2)
445444
{
446-
double pt1, pt2, pz1, pz2, p1, p2, angle;
447-
pt1 = candidate1.Pt();
448-
pt2 = candidate2.Pt();
449-
pz1 = candidate1.Pz();
450-
pz2 = candidate2.Pz();
451-
p1 = candidate1.P();
452-
p2 = candidate2.P();
453-
angle = TMath::ACos((pt1 * pt2 + pz1 * pz2) / (p1 * p2));
445+
const double pt1 = candidate1.Pt();
446+
const double pt2 = candidate2.Pt();
447+
const double pz1 = candidate1.Pz();
448+
const double pz2 = candidate2.Pz();
449+
const double p1 = candidate1.P();
450+
const double p2 = candidate2.P();
451+
const double angle = TMath::ACos((pt1 * pt2 + pz1 * pz2) / (p1 * p2));
454452
return angle;
455453
}
456454

457455
// get cosTheta
458456
TLorentzVector daughterCMS;
459457
ROOT::Math::XYZVector threeVecDauCM, threeVecMother;
460-
float getCosTheta(const TLorentzVector mother,
461-
const TLorentzVector daughter)
458+
float getCosTheta(const TLorentzVector& mother,
459+
const TLorentzVector& daughter)
462460
{
463461
threeVecMother = mother.Vect();
464462
const float beta = mother.Beta();
@@ -574,27 +572,23 @@ struct doublephimeson {
574572
}
575573

576574
if (PIDStrategy == 1000) {
577-
if (TOFHit == 1 && std::sqrt(nsigmaTOF * nsigmaTOF + nsigmaTPC * nsigmaTPC) < 2.5) {
578-
return true;
579-
} else if (TOFHit != 1 && std::abs(nsigmaTPC) < 2.0) {
575+
if ((TOFHit == 1 && std::sqrt(nsigmaTOF * nsigmaTOF + nsigmaTPC * nsigmaTPC) < 2.5) ||
576+
(TOFHit != 1 && std::abs(nsigmaTPC) < 2.0)) {
580577
return true;
581578
}
582579
}
583580

584581
if (PIDStrategy == 1001) {
585-
if (TOFHit == 1 && std::sqrt(nsigmaTOF * nsigmaTOF + nsigmaTPC * nsigmaTPC) < 2.0) {
586-
return true;
587-
} else if (TOFHit != 1 && ptcand < 2.5 && std::abs(nsigmaTPC) < 2.0) {
588-
return true;
589-
} else if (TOFHit != 1 && ptcand >= 2.5 && nsigmaTPC > -2.0 && nsigmaTPC < 1.0) {
582+
if ((TOFHit == 1 && std::sqrt(nsigmaTOF * nsigmaTOF + nsigmaTPC * nsigmaTPC) < 2.0) ||
583+
(TOFHit != 1 && ptcand < 2.5 && std::abs(nsigmaTPC) < 2.0) ||
584+
(TOFHit != 1 && ptcand >= 2.5 && nsigmaTPC > -2.0 && nsigmaTPC < 1.0)) {
590585
return true;
591586
}
592587
}
593588

594589
if (PIDStrategy == 1002) {
595-
if (TOFHit == 1 && std::sqrt(nsigmaTOF * nsigmaTOF + nsigmaTPC * nsigmaTPC) < 2.0) {
596-
return true;
597-
} else if (TOFHit != 1 && std::abs(nsigmaTPC) < 2.0) {
590+
if ((TOFHit == 1 && std::sqrt(nsigmaTOF * nsigmaTOF + nsigmaTPC * nsigmaTPC) < 2.0) ||
591+
(TOFHit != 1 && std::abs(nsigmaTPC) < 2.0)) {
598592
return true;
599593
}
600594
}
@@ -702,11 +696,9 @@ struct doublephimeson {
702696
}
703697
}
704698
} else {
705-
if (TOFHit == 1 && std::sqrt(nsigmaTOF * nsigmaTOF + nsigmaTPC * nsigmaTPC) < 2.5) {
706-
return true;
707-
} else if (TOFHit != 1 && ptcand < 2.0 && nsigmaTPC > -2.5 && nsigmaTPC < 2.0) {
708-
return true;
709-
} else if (TOFHit != 1 && ptcand > 2.0 && nsigmaTPC > -2.5 && nsigmaTPC < 1.0) {
699+
if ((TOFHit == 1 && std::sqrt(nsigmaTOF * nsigmaTOF + nsigmaTPC * nsigmaTPC) < 2.5) ||
700+
(TOFHit != 1 && ptcand < 2.0 && nsigmaTPC > -2.5 && nsigmaTPC < 2.0) ||
701+
(TOFHit != 1 && ptcand > 2.0 && nsigmaTPC > -2.5 && nsigmaTPC < 1.0)) {
710702
return true;
711703
}
712704
}
@@ -766,9 +758,8 @@ struct doublephimeson {
766758
}
767759
}
768760
} else {
769-
if (TOFHit == 1 && std::sqrt(nsigmaTOF * nsigmaTOF + nsigmaTPC * nsigmaTPC) < 2.0) {
770-
return true;
771-
} else if (TOFHit != 1 && nsigmaTPC > -2.5 && nsigmaTPC < 1.0) {
761+
if ((TOFHit == 1 && std::sqrt(nsigmaTOF * nsigmaTOF + nsigmaTPC * nsigmaTPC) < 2.0) ||
762+
(TOFHit != 1 && nsigmaTPC > -2.5 && nsigmaTPC < 1.0)) {
772763
return true;
773764
}
774765
}
@@ -798,9 +789,8 @@ struct doublephimeson {
798789
} else if (ptcand >= 1.0 && ptcand < 2.0 && TOFHit == 1 && std::sqrt(nsigmaTOF * nsigmaTOF + nsigmaTPC * nsigmaTPC) < 2.5) {
799790
return true;
800791
} else if (ptcand > 2.0) {
801-
if (TOFHit == 1 && std::sqrt(nsigmaTOF * nsigmaTOF + nsigmaTPC * nsigmaTPC) < 2.0) {
802-
return true;
803-
} else if (TOFHit != 1 && nsigmaTPC > -2.5 && nsigmaTPC < 1.0) {
792+
if ((TOFHit == 1 && std::sqrt(nsigmaTOF * nsigmaTOF + nsigmaTPC * nsigmaTPC) < 2.0) ||
793+
(TOFHit != 1 && nsigmaTPC > -2.5 && nsigmaTPC < 1.0)) {
804794
return true;
805795
}
806796
}
@@ -1099,7 +1089,7 @@ struct doublephimeson {
10991089
return;
11001090
}
11011091
int phimult = 0;
1102-
for (auto phitrackd1 : phitracks) {
1092+
for (auto const& phitrackd1 : phitracks) {
11031093
if (phitrackd1.phiMass() < minPhiMass1 || phitrackd1.phiMass() > maxPhiMass1) {
11041094
continue;
11051095
}
@@ -1119,7 +1109,7 @@ struct doublephimeson {
11191109
}
11201110
phimult = phimult + 1;
11211111
}
1122-
for (auto phitrackd1 : phitracks) {
1112+
for (auto const& phitrackd1 : phitracks) {
11231113
auto kaonplusd1pt = TMath::Sqrt(phitrackd1.phid1Px() * phitrackd1.phid1Px() + phitrackd1.phid1Py() * phitrackd1.phid1Py());
11241114
auto kaonminusd1pt = TMath::Sqrt(phitrackd1.phid2Px() * phitrackd1.phid2Px() + phitrackd1.phid2Py() * phitrackd1.phid2Py());
11251115
if (kaonplusd1pt > maxKaonPt) {
@@ -1142,7 +1132,7 @@ struct doublephimeson {
11421132
Phid1.SetXYZM(phitrackd1.phiPx(), phitrackd1.phiPy(), phitrackd1.phiPz(), phitrackd1.phiMass());
11431133
Phi1kaonplus.SetXYZM(phitrackd1.phid1Px(), phitrackd1.phid1Py(), phitrackd1.phid1Pz(), 0.493);
11441134
Phi1kaonminus.SetXYZM(phitrackd1.phid2Px(), phitrackd1.phid2Py(), phitrackd1.phid2Pz(), 0.493);
1145-
for (auto phitrackd2 : phitracks) {
1135+
for (auto const& phitrackd2 : phitracks) {
11461136
auto phid2id = phitrackd2.index();
11471137
if (phid2id <= phid1id) {
11481138
continue;
@@ -1235,7 +1225,7 @@ struct doublephimeson {
12351225
}
12361226
int phimult = 0;
12371227

1238-
for (auto phitrackd1 : phitracks) {
1228+
for (auto const& phitrackd1 : phitracks) {
12391229
if (phitrackd1.phiMass() < minPhiMass1 || phitrackd1.phiMass() > maxPhiMass1) {
12401230
continue;
12411231
}
@@ -1255,7 +1245,7 @@ struct doublephimeson {
12551245
}
12561246
phimult = phimult + 1;
12571247
}
1258-
for (auto phitrackd1 : phitracks) {
1248+
for (auto const& phitrackd1 : phitracks) {
12591249
auto kaonplusd1pt = TMath::Sqrt(phitrackd1.phid1Px() * phitrackd1.phid1Px() + phitrackd1.phid1Py() * phitrackd1.phid1Py());
12601250
auto kaonminusd1pt = TMath::Sqrt(phitrackd1.phid2Px() * phitrackd1.phid2Px() + phitrackd1.phid2Py() * phitrackd1.phid2Py());
12611251

@@ -1283,7 +1273,7 @@ struct doublephimeson {
12831273
Phid1.SetXYZM(phitrackd1.phiPx(), phitrackd1.phiPy(), phitrackd1.phiPz(), phitrackd1.phiMass());
12841274
Phi1kaonplus.SetXYZM(phitrackd1.phid1Px(), phitrackd1.phid1Py(), phitrackd1.phid1Pz(), 0.493);
12851275
Phi1kaonminus.SetXYZM(phitrackd1.phid2Px(), phitrackd1.phid2Py(), phitrackd1.phid2Pz(), 0.493);
1286-
for (auto phitrackd2 : phitracks) {
1276+
for (auto const& phitrackd2 : phitracks) {
12871277
auto phid2id = phitrackd2.index();
12881278
if (phid2id <= phid1id) {
12891279
continue;
@@ -1350,14 +1340,14 @@ struct doublephimeson {
13501340
for (auto if1 = exoticresonance.begin(); if1 != exoticresonance.end(); ++if1) {
13511341
auto i5 = std::distance(exoticresonance.begin(), if1);
13521342

1353-
auto exotic1phi1 = phiresonanced1.at(i5);
1354-
auto exotic1phi2 = phiresonanced2.at(i5);
1355-
auto exotic1 = exoticresonance.at(i5);
1343+
const auto& exotic1phi1 = phiresonanced1.at(i5);
1344+
const auto& exotic1phi2 = phiresonanced2.at(i5);
1345+
const auto& exotic1 = exoticresonance.at(i5);
13561346

1357-
auto exotic1kaonplus1 = kaonplus1.at(i5);
1358-
auto exotic1kaonminus1 = kaonminus1.at(i5);
1359-
auto exotic1kaonplus2 = kaonplus2.at(i5);
1360-
auto exotic1kaonminus2 = kaonminus2.at(i5);
1347+
const auto& exotic1kaonplus1 = kaonplus1.at(i5);
1348+
const auto& exotic1kaonminus1 = kaonminus1.at(i5);
1349+
const auto& exotic1kaonplus2 = kaonplus2.at(i5);
1350+
const auto& exotic1kaonminus2 = kaonminus2.at(i5);
13611351
auto deltaRkaonplus1 = TMath::Sqrt(TMath::Power(exotic1kaonplus1.Phi() - exotic1kaonplus2.Phi(), 2.0) + TMath::Power(exotic1kaonplus1.Eta() - exotic1kaonplus2.Eta(), 2.0));
13621352
auto deltaRkaonminus1 = TMath::Sqrt(TMath::Power(exotic1kaonminus1.Phi() - exotic1kaonminus2.Phi(), 2.0) + TMath::Power(exotic1kaonminus1.Eta() - exotic1kaonminus2.Eta(), 2.0));
13631353
histos.fill(HIST("hDeltaRkaonplus"), deltaRkaonplus1);
@@ -1375,14 +1365,14 @@ struct doublephimeson {
13751365

13761366
for (auto if2 = if1 + 1; if2 != exoticresonance.end(); ++if2) {
13771367
auto i6 = std::distance(exoticresonance.begin(), if2);
1378-
auto exotic2phi1 = phiresonanced1.at(i6);
1379-
auto exotic2phi2 = phiresonanced2.at(i6);
1380-
auto exotic2 = exoticresonance.at(i6);
1381-
1382-
auto exotic2kaonplus1 = kaonplus1.at(i6);
1383-
auto exotic2kaonminus1 = kaonminus1.at(i6);
1384-
auto exotic2kaonplus2 = kaonplus2.at(i6);
1385-
auto exotic2kaonminus2 = kaonminus2.at(i6);
1368+
const auto& exotic2phi1 = phiresonanced1.at(i6);
1369+
const auto& exotic2phi2 = phiresonanced2.at(i6);
1370+
const auto& exotic2 = exoticresonance.at(i6);
1371+
1372+
const auto& exotic2kaonplus1 = kaonplus1.at(i6);
1373+
const auto& exotic2kaonminus1 = kaonminus1.at(i6);
1374+
const auto& exotic2kaonplus2 = kaonplus2.at(i6);
1375+
const auto& exotic2kaonminus2 = kaonminus2.at(i6);
13861376
auto deltaRkaonplus2 = TMath::Sqrt(TMath::Power(exotic2kaonplus1.Phi() - exotic2kaonplus2.Phi(), 2.0) + TMath::Power(exotic2kaonplus1.Eta() - exotic2kaonplus2.Eta(), 2.0));
13871377
auto deltaRkaonminus2 = TMath::Sqrt(TMath::Power(exotic2kaonminus1.Phi() - exotic2kaonminus2.Phi(), 2.0) + TMath::Power(exotic2kaonminus1.Eta() - exotic2kaonminus2.Eta(), 2.0));
13881378

@@ -1408,14 +1398,14 @@ struct doublephimeson {
14081398
} else {
14091399
for (auto if1 = exoticresonance.begin(); if1 != exoticresonance.end(); ++if1) {
14101400
auto i5 = std::distance(exoticresonance.begin(), if1);
1411-
auto exotic1phi1 = phiresonanced1.at(i5);
1412-
auto exotic1phi2 = phiresonanced2.at(i5);
1413-
auto exotic1 = exoticresonance.at(i5);
1414-
1415-
auto exotic1kaonplus1 = kaonplus1.at(i5);
1416-
auto exotic1kaonminus1 = kaonminus1.at(i5);
1417-
auto exotic1kaonplus2 = kaonplus2.at(i5);
1418-
auto exotic1kaonminus2 = kaonminus2.at(i5);
1401+
const auto& exotic1phi1 = phiresonanced1.at(i5);
1402+
const auto& exotic1phi2 = phiresonanced2.at(i5);
1403+
const auto& exotic1 = exoticresonance.at(i5);
1404+
1405+
const auto& exotic1kaonplus1 = kaonplus1.at(i5);
1406+
const auto& exotic1kaonminus1 = kaonminus1.at(i5);
1407+
const auto& exotic1kaonplus2 = kaonplus2.at(i5);
1408+
const auto& exotic1kaonminus2 = kaonminus2.at(i5);
14191409
auto deltaRkaonplus1 = TMath::Sqrt(TMath::Power(exotic1kaonplus1.Phi() - exotic1kaonplus2.Phi(), 2.0) + TMath::Power(exotic1kaonplus1.Eta() - exotic1kaonplus2.Eta(), 2.0));
14201410
auto deltaRkaonminus1 = TMath::Sqrt(TMath::Power(exotic1kaonminus1.Phi() - exotic1kaonminus2.Phi(), 2.0) + TMath::Power(exotic1kaonminus1.Eta() - exotic1kaonminus2.Eta(), 2.0));
14211411
auto deltam1 = TMath::Sqrt(TMath::Power(exotic1phi1.M() - 1.0192, 2.0) + TMath::Power(exotic1phi2.M() - 1.0192, 2.0));

0 commit comments

Comments
 (0)