Skip to content

Commit fdfcb0d

Browse files
amatyjaamatyja
committed
Moved to RecoDecoy methods
1 parent 3761d61 commit fdfcb0d

File tree

1 file changed

+73
-74
lines changed

1 file changed

+73
-74
lines changed

‎PWGUD/Tasks/upcTauTau13topo.cxx‎

Lines changed: 73 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -1587,31 +1587,31 @@ struct TauTau13topo {
15871587

15881588
} // end of init method
15891589

1590-
float eta(float px, float py, float pz)
1591-
// Just a simple function to return pseudorapidity
1592-
{
1593-
float arg = -2.; // outside valid range for std::atanh
1594-
float mom = std::sqrt(px * px + py * py + pz * pz);
1595-
if (mom != 0)
1596-
arg = pz / mom;
1597-
if (-1. < arg && arg < 1.)
1598-
return std::atanh(arg); // definition of eta
1599-
return -999.;
1600-
}
1590+
// float eta(float px, float py, float pz)
1591+
// // Just a simple function to return pseudorapidity
1592+
// {
1593+
// float arg = -2.; // outside valid range for std::atanh
1594+
// float mom = std::sqrt(px * px + py * py + pz * pz);
1595+
// if (mom != 0)
1596+
// arg = pz / mom;
1597+
// if (-1. < arg && arg < 1.)
1598+
// return std::atanh(arg); // definition of eta
1599+
// return -999.;
1600+
// }
16011601

1602-
float phi(float px, float py)
1603-
// Just a simple function to return azimuthal angle from 0 to 2pi
1604-
{
1605-
if (px != 0)
1606-
return (std::atan2(py, px) + o2::constants::math::PI);
1607-
return -999.;
1608-
}
1602+
// float phi(float px, float py)
1603+
// // Just a simple function to return azimuthal angle from 0 to 2pi
1604+
// {
1605+
// if (px != 0)
1606+
// return (std::atan2(py, px) + o2::constants::math::PI);
1607+
// return -999.;
1608+
// }
16091609

1610-
float pt(float px, float py)
1611-
// Just a simple function to return pt
1612-
{
1613-
return std::sqrt(px * px + py * py);
1614-
}
1610+
// float pt(float px, float py)
1611+
// // Just a simple function to return pt
1612+
// {
1613+
// return std::sqrt(px * px + py * py);
1614+
// }
16151615

16161616
float rapidity(float energy, float pz)
16171617
// Just a simple function to return track rapidity
@@ -1630,17 +1630,11 @@ struct TauTau13topo {
16301630
return angle;
16311631
}
16321632

1633-
float invariantMass(float E, float px, float py, float pz)
1634-
// Just a simple function to return invariant mass
1635-
{
1636-
return std::sqrt(E * E - px * px - py * py - pz * pz);
1637-
}
1638-
1639-
float energy(float px, float py, float pz, float mass)
1640-
// Just a simple function to return energy
1641-
{
1642-
return std::sqrt(px * px + py * py + pz * pz + mass * mass);
1643-
}
1633+
// float invariantMass(float E, float px, float py, float pz)
1634+
// // Just a simple function to return invariant mass
1635+
// {
1636+
// return std::sqrt(E * E - px * px - py * py - pz * pz);
1637+
// }
16441638

16451639
// float calculateDeltaPhi(TLorentzVector p, TLorentzVector p1)
16461640
float calculateDeltaPhi(ROOT::Math::LorentzVector<ROOT::Math::PxPyPzE4D<double>> p, ROOT::Math::LorentzVector<ROOT::Math::PxPyPzE4D<double>> p1)
@@ -1696,8 +1690,10 @@ struct TauTau13topo {
16961690
// helper function to calculate scalar asymmetry
16971691
float scalarAsymMC(auto particle1, auto particle2)
16981692
{
1699-
auto pt1 = pt(particle1.px(), particle1.py());
1700-
auto pt2 = pt(particle2.px(), particle2.py());
1693+
// auto pt1 = pt(particle1.px(), particle1.py());
1694+
auto pt1 = RecoDecay::pt(particle1.px(), particle1.py());
1695+
// auto pt2 = pt(particle2.px(), particle2.py());
1696+
auto pt2 = RecoDecay::pt(particle2.px(), particle2.py());
17011697
auto delta = pt1 - pt2;
17021698
return std::abs(delta) / (pt1 + pt2);
17031699
}
@@ -1864,7 +1860,7 @@ struct TauTau13topo {
18641860
} else {
18651861
isGlobalTrack = false;
18661862
}
1867-
if (std::abs(eta(track.px(), track.py(), track.pz())) < 0.8) {
1863+
if (std::abs(RecoDecay::eta(std::array<double, 3>{track.px(), track.py(), track.pz()})) < 0.8) {
18681864
registry.get<TH1>(HIST("global/hTrackEfficiencyPVGlobal"))->Fill(8., 1.);
18691865
} else {
18701866
isGlobalTrack = false;
@@ -2143,7 +2139,7 @@ struct TauTau13topo {
21432139
for (const auto& trk : PVContributors) {
21442140
qtot += trk.sign();
21452141
// p.SetXYZM(trk.px(), trk.py(), trk.pz(), MassPiPlus);
2146-
p.SetXYZT(trk.px(), trk.py(), trk.pz(), energy(trk.px(), trk.py(), trk.pz(), MassPiPlus));
2142+
p.SetXYZT(trk.px(), trk.py(), trk.pz(), RecoDecay::e(trk.px(), trk.py(), trk.pz(), MassPiPlus));
21472143
registry.get<TH1>(HIST("global/hTrackPtPV"))->Fill(p.Pt());
21482144
if (std::abs(p.Eta()) < trkEtacut)
21492145
nEtaIn15++; // 1.5 is a default
@@ -2218,7 +2214,8 @@ struct TauTau13topo {
22182214
registry.get<TH1>(HIST("global1/hNTracksPV"))->Fill(PVContributors.size());
22192215
for (const auto& trk : PVContributors) {
22202216
// p.SetXYZM(trk.px(), trk.py(), trk.pz(), MassPiPlus);
2221-
p.SetXYZT(trk.px(), trk.py(), trk.pz(), energy(trk.px(), trk.py(), trk.pz(), MassPiPlus));
2217+
// p.SetXYZT(trk.px(), trk.py(), trk.pz(), energy(trk.px(), trk.py(), trk.pz(), MassPiPlus));
2218+
p.SetXYZT(trk.px(), trk.py(), trk.pz(), RecoDecay::e(trk.px(), trk.py(), trk.pz(), MassPiPlus));
22222219
registry.get<TH1>(HIST("global1/hTrackPtPV"))->Fill(p.Pt());
22232220
registry.get<TH2>(HIST("global1/hTrackEtaPhiPV"))->Fill(p.Eta(), p.Phi());
22242221
}
@@ -2388,14 +2385,14 @@ struct TauTau13topo {
23882385

23892386
for (const auto& trk : PVContributors) {
23902387
// p.SetXYZM(trk.px(), trk.py(), trk.pz(), MassElectron);
2391-
p.SetXYZT(trk.px(), trk.py(), trk.pz(), energy(trk.px(), trk.py(), trk.pz(), MassElectron));
2388+
p.SetXYZT(trk.px(), trk.py(), trk.pz(), RecoDecay::e(trk.px(), trk.py(), trk.pz(), MassElectron));
23922389
for (const auto& trk1 : PVContributors) {
23932390
if (trk.index() >= trk1.index())
23942391
continue;
23952392
if (trk1.hasTPC())
23962393
nPiHasTPC[trk.index()]++;
23972394
// p1.SetXYZM(trk1.px(), trk1.py(), trk1.pz(), MassElectron);
2398-
p1.SetXYZT(trk1.px(), trk1.py(), trk1.pz(), energy(trk1.px(), trk1.py(), trk1.pz(), MassElectron));
2395+
p1.SetXYZT(trk1.px(), trk1.py(), trk1.pz(), RecoDecay::e(trk1.px(), trk1.py(), trk1.pz(), MassElectron));
23992396
invMass2El[(counterTmp < 3 ? counterTmp : 5 - counterTmp)][(counterTmp < 3 ? 0 : 1)] = (p + p1).mag2();
24002397
gammaPair[(counterTmp < 3 ? counterTmp : 5 - counterTmp)][(counterTmp < 3 ? 0 : 1)] = (p + p1);
24012398
registry.get<TH1>(HIST("control/cut0/hInvMass2ElAll"))->Fill((p + p1).mag2());
@@ -2412,7 +2409,7 @@ struct TauTau13topo {
24122409
p.SetXYZT(0., 0., 0., 0.);
24132410
for (const auto& trk : PVContributors) {
24142411
// p1.SetXYZM(trk.px(), trk.py(), trk.pz(), MassPiPlus);
2415-
p1.SetXYZT(trk.px(), trk.py(), trk.pz(), energy(trk.px(), trk.py(), trk.pz(), MassPiPlus));
2412+
p1.SetXYZT(trk.px(), trk.py(), trk.pz(), RecoDecay::e(trk.px(), trk.py(), trk.pz(), MassPiPlus));
24162413
p += p1;
24172414
scalarPtsum += trk.pt();
24182415
} // end of loop over PVContributors
@@ -2441,9 +2438,9 @@ struct TauTau13topo {
24412438

24422439
// inv mass of 3pi + 1e
24432440
// p1.SetXYZM(trk.px(), trk.py(), trk.pz(), MassPiPlus);
2444-
p1.SetXYZT(trk.px(), trk.py(), trk.pz(), energy(trk.px(), trk.py(), trk.pz(), MassPiPlus));
2441+
p1.SetXYZT(trk.px(), trk.py(), trk.pz(), RecoDecay::e(trk.px(), trk.py(), trk.pz(), MassPiPlus));
24452442
// p2.SetXYZM(trk.px(), trk.py(), trk.pz(), MassElectron);
2446-
p2.SetXYZT(trk.px(), trk.py(), trk.pz(), energy(trk.px(), trk.py(), trk.pz(), MassElectron));
2443+
p2.SetXYZT(trk.px(), trk.py(), trk.pz(), RecoDecay::e(trk.px(), trk.py(), trk.pz(), MassElectron));
24472444
mass3pi1e[counterTmp] = (p - p1 + p2).mag();
24482445

24492446
v1.SetXYZ(trk.px(), trk.py(), trk.pz());
@@ -2492,7 +2489,7 @@ struct TauTau13topo {
24922489
trkTimeRes[counterTmp] = trk.trackTimeRes();
24932490

24942491
// p1.SetXYZM(trk.px(), trk.py(), trk.pz(), MassPiPlus);
2495-
p1.SetXYZT(trk.px(), trk.py(), trk.pz(), energy(trk.px(), trk.py(), trk.pz(), MassPiPlus));
2492+
p1.SetXYZT(trk.px(), trk.py(), trk.pz(), RecoDecay::e(trk.px(), trk.py(), trk.pz(), MassPiPlus));
24962493
tmpMomentum[counterTmp] = p1.P();
24972494
tmpPt[counterTmp] = p1.Pt();
24982495
tmpDedx[counterTmp] = trk.tpcSignal();
@@ -3608,7 +3605,7 @@ struct TauTau13topo {
36083605
if (std::abs(rapidity(mother.e(), mother.pz())) > 0.9)
36093606
// if (std::abs(tmp.Rapidity()) > 0.9)
36103607
tauInRapidity = false;
3611-
if (std::abs(eta(mcParticle.px(), mcParticle.py(), mcParticle.pz())) > 0.9)
3608+
if (std::abs(RecoDecay::eta(std::array<double, 3>{mcParticle.px(), mcParticle.py(), mcParticle.pz()})) > 0.9)
36123609
// if (std::abs(tmp.Eta()) > 0.9)
36133610
partFromTauInEta = false;
36143611

@@ -3629,10 +3626,10 @@ struct TauTau13topo {
36293626
}
36303627
count++;
36313628
if (collisions.size() > 0) {
3632-
registryMC.get<TH1>(HIST("globalMCrec/hMCetaGenCol"))->Fill(eta(mcParticle.px(), mcParticle.py(), mcParticle.pz()));
3633-
registryMC.get<TH1>(HIST("globalMCrec/hMCphiGenCol"))->Fill(phi(mcParticle.px(), mcParticle.py()));
3629+
registryMC.get<TH1>(HIST("globalMCrec/hMCetaGenCol"))->Fill(RecoDecay::eta(std::array<double, 3>{mcParticle.px(), mcParticle.py(), mcParticle.pz()}));
3630+
registryMC.get<TH1>(HIST("globalMCrec/hMCphiGenCol"))->Fill(RecoDecay::phi(mcParticle.px(), mcParticle.py()));
36343631
registryMC.get<TH1>(HIST("globalMCrec/hMCyGenCol"))->Fill(rapidity(mcParticle.e(), mcParticle.pz()));
3635-
registryMC.get<TH1>(HIST("globalMCrec/hMCptGenCol"))->Fill(pt(mcParticle.px(), mcParticle.py()));
3632+
registryMC.get<TH1>(HIST("globalMCrec/hMCptGenCol"))->Fill(RecoDecay::pt(mcParticle.px(), mcParticle.py()));
36363633
}
36373634
} // mother is tau
36383635
} // has mothers
@@ -3719,13 +3716,13 @@ struct TauTau13topo {
37193716
registryMC.get<TH1>(HIST("efficiencyMCEl/hMCdeltaAlphaEpi"))->Fill(deltaAlpha2);
37203717
registryMC.get<TH1>(HIST("efficiencyMCEl/hMCdeltaAlphaEpi"))->Fill(deltaAlpha3);
37213718
//
3722-
registryMC.get<TH1>(HIST("efficiencyMCEl/hMCdeltaPhiEpi"))->Fill(calculateDeltaPhi(phi(tmp1ProngMC.px(), tmp1ProngMC.py()), phi(tmpPion1MC.px(), tmpPion1MC.py())));
3723-
registryMC.get<TH1>(HIST("efficiencyMCEl/hMCdeltaPhiEpi"))->Fill(calculateDeltaPhi(phi(tmp1ProngMC.px(), tmp1ProngMC.py()), phi(tmpPion2MC.px(), tmpPion2MC.py())));
3724-
registryMC.get<TH1>(HIST("efficiencyMCEl/hMCdeltaPhiEpi"))->Fill(calculateDeltaPhi(phi(tmp1ProngMC.px(), tmp1ProngMC.py()), phi(tmpPion3MC.px(), tmpPion3MC.py())));
3719+
registryMC.get<TH1>(HIST("efficiencyMCEl/hMCdeltaPhiEpi"))->Fill(calculateDeltaPhi(RecoDecay::phi(tmp1ProngMC.px(), tmp1ProngMC.py()), RecoDecay::phi(tmpPion1MC.px(), tmpPion1MC.py())));
3720+
registryMC.get<TH1>(HIST("efficiencyMCEl/hMCdeltaPhiEpi"))->Fill(calculateDeltaPhi(RecoDecay::phi(tmp1ProngMC.px(), tmp1ProngMC.py()), RecoDecay::phi(tmpPion2MC.px(), tmpPion2MC.py())));
3721+
registryMC.get<TH1>(HIST("efficiencyMCEl/hMCdeltaPhiEpi"))->Fill(calculateDeltaPhi(RecoDecay::phi(tmp1ProngMC.px(), tmp1ProngMC.py()), RecoDecay::phi(tmpPion3MC.px(), tmpPion3MC.py())));
37253722
//
3726-
registryMC.get<TH1>(HIST("efficiencyMCEl/hMCdeltaPhiPipi"))->Fill(calculateDeltaPhi(phi(tmpPion1MC.px(), tmpPion1MC.py()), phi(tmpPion2MC.px(), tmpPion2MC.py())));
3727-
registryMC.get<TH1>(HIST("efficiencyMCEl/hMCdeltaPhiPipi"))->Fill(calculateDeltaPhi(phi(tmpPion1MC.px(), tmpPion1MC.py()), phi(tmpPion3MC.px(), tmpPion3MC.py())));
3728-
registryMC.get<TH1>(HIST("efficiencyMCEl/hMCdeltaPhiPipi"))->Fill(calculateDeltaPhi(phi(tmpPion2MC.px(), tmpPion2MC.py()), phi(tmpPion3MC.px(), tmpPion3MC.py())));
3723+
registryMC.get<TH1>(HIST("efficiencyMCEl/hMCdeltaPhiPipi"))->Fill(calculateDeltaPhi(RecoDecay::phi(tmpPion1MC.px(), tmpPion1MC.py()), RecoDecay::phi(tmpPion2MC.px(), tmpPion2MC.py())));
3724+
registryMC.get<TH1>(HIST("efficiencyMCEl/hMCdeltaPhiPipi"))->Fill(calculateDeltaPhi(RecoDecay::phi(tmpPion1MC.px(), tmpPion1MC.py()), RecoDecay::phi(tmpPion3MC.px(), tmpPion3MC.py())));
3725+
registryMC.get<TH1>(HIST("efficiencyMCEl/hMCdeltaPhiPipi"))->Fill(calculateDeltaPhi(RecoDecay::phi(tmpPion2MC.px(), tmpPion2MC.py()), RecoDecay::phi(tmpPion3MC.px(), tmpPion3MC.py())));
37293726

37303727
//
37313728
auto deltaAlphaPi1 = deltaAlpha(tmpPion1MC, tmpPion2MC);
@@ -3738,13 +3735,13 @@ struct TauTau13topo {
37383735
float energyInCone = 0;
37393736
float angleLimit = 0.5;
37403737
if (deltaAlpha1 < angleLimit) {
3741-
energyInCone += pt(tmpPion1MC.px(), tmpPion1MC.py());
3738+
energyInCone += RecoDecay::pt(tmpPion1MC.px(), tmpPion1MC.py());
37423739
}
37433740
if (deltaAlpha2 < angleLimit) {
3744-
energyInCone += pt(tmpPion2MC.px(), tmpPion2MC.py());
3741+
energyInCone += RecoDecay::pt(tmpPion2MC.px(), tmpPion2MC.py());
37453742
}
37463743
if (deltaAlpha3 < angleLimit) {
3747-
energyInCone += pt(tmpPion3MC.px(), tmpPion3MC.py());
3744+
energyInCone += RecoDecay::pt(tmpPion3MC.px(), tmpPion3MC.py());
37483745
}
37493746
registryMC.get<TH1>(HIST("efficiencyMCEl/hMCvirtCal"))->Fill(energyInCone);
37503747
//
@@ -3757,17 +3754,19 @@ struct TauTau13topo {
37573754
registryMC.get<TH1>(HIST("efficiencyMCEl/hMCVector"))->Fill(vectorAsym(tmp1ProngMC, tmpPion3MC));
37583755

37593756
// add eta phi
3760-
registryMC.get<TH1>(HIST("efficiencyMCEl/hMCptEl"))->Fill(pt(tmp1ProngMC.px(), tmp1ProngMC.py()));
3757+
registryMC.get<TH1>(HIST("efficiencyMCEl/hMCptEl"))->Fill(RecoDecay::pt(tmp1ProngMC.px(), tmp1ProngMC.py()));
37613758

37623759
float px3pi = tmpPion1MC.px() + tmpPion2MC.px() + tmpPion3MC.px();
37633760
float py3pi = tmpPion1MC.py() + tmpPion2MC.py() + tmpPion3MC.py();
37643761
float pz3pi = tmpPion1MC.pz() + tmpPion2MC.pz() + tmpPion3MC.pz();
37653762
float en3pi = tmpPion1MC.e() + tmpPion2MC.e() + tmpPion3MC.e();
37663763

3767-
registryMC.get<TH1>(HIST("efficiencyMCEl/hMCpt4trk"))->Fill(pt(tmp1ProngMC.px() + px3pi, tmp1ProngMC.py() + py3pi));
3768-
registryMC.get<TH1>(HIST("efficiencyMCEl/hMCinvmass4pi"))->Fill(invariantMass(tmp1ProngMC.e() + en3pi, tmp1ProngMC.px() + px3pi, tmp1ProngMC.py() + py3pi, tmp1ProngMC.pz() + pz3pi));
3769-
registryMC.get<TH1>(HIST("efficiencyMCEl/hMCinvmass3pi"))->Fill(invariantMass(en3pi, px3pi, py3pi, pz3pi));
3770-
registryMC.get<TH1>(HIST("efficiencyMCEl/hMCdeltaphi13"))->Fill(calculateDeltaPhi(phi(tmp1ProngMC.px(), tmp1ProngMC.py()), phi(px3pi, py3pi)));
3764+
registryMC.get<TH1>(HIST("efficiencyMCEl/hMCpt4trk"))->Fill(RecoDecay::pt(tmp1ProngMC.px() + px3pi, tmp1ProngMC.py() + py3pi));
3765+
// registryMC.get<TH1>(HIST("efficiencyMCEl/hMCinvmass4pi"))->Fill(invariantMass(tmp1ProngMC.e() + en3pi, tmp1ProngMC.px() + px3pi, tmp1ProngMC.py() + py3pi, tmp1ProngMC.pz() + pz3pi));
3766+
registryMC.get<TH1>(HIST("efficiencyMCEl/hMCinvmass4pi"))->Fill(RecoDecay::m(std::array<double, 3>{(tmp1ProngMC.px() + px3pi), (tmp1ProngMC.py() + py3pi), (tmp1ProngMC.pz() + pz3pi)}, (tmp1ProngMC.e() + en3pi)));
3767+
// registryMC.get<TH1>(HIST("efficiencyMCEl/hMCinvmass3pi"))->Fill(invariantMass(en3pi, px3pi, py3pi, pz3pi));
3768+
registryMC.get<TH1>(HIST("efficiencyMCEl/hMCinvmass3pi"))->Fill(RecoDecay::m(std::array<double, 3>{px3pi, py3pi, pz3pi}, en3pi));
3769+
registryMC.get<TH1>(HIST("efficiencyMCEl/hMCdeltaphi13"))->Fill(calculateDeltaPhi(RecoDecay::phi(tmp1ProngMC.px(), tmp1ProngMC.py()), RecoDecay::phi(px3pi, py3pi)));
37713770

37723771
// reconstructed event
37733772
if (collisions.size() < 1)
@@ -3896,7 +3895,7 @@ struct TauTau13topo {
38963895
nPVTracks++;
38973896
trackCharge += track.sign();
38983897
// if (std::abs(eta(track.px(),track.py(),track.pz())) >= trkEtacut) allInEtaAcceptance = false;
3899-
if (std::abs(eta(track.px(), track.py(), track.pz())) < trkEtacut)
3898+
if (std::abs(RecoDecay::eta(std::array<double, 3>{track.px(), track.py(), track.pz()})) < trkEtacut)
39003899
nTrkInEtaRange++;
39013900
if (track.pt() > 0.1)
39023901
nTrkAbovePtThreshold++;
@@ -4062,20 +4061,20 @@ struct TauTau13topo {
40624061
flagVcalPV[i] = true;
40634062
}
40644063
} // end of second loop
4065-
float tmpEtaData = eta(tmptrack.px(), tmptrack.py(), tmptrack.pz());
4066-
float tmpPhiData = phi(tmptrack.px(), tmptrack.py());
4064+
float tmpEtaData = RecoDecay::eta(std::array<double, 3>{tmptrack.px(), tmptrack.py(), tmptrack.pz()});
4065+
float tmpPhiData = RecoDecay::phi(tmptrack.px(), tmptrack.py());
40674066
registryMC.get<TH2>(HIST("global1MCrec/hTrackEtaPhiPV"))->Fill(tmpEtaData, tmpPhiData);
40684067
registryMC.get<TH1>(HIST("global1MCrec/hTrackPtPV"))->Fill(tmptrack.pt());
40694068
// p1.SetXYZM(v1.X(), v1.Y(), v1.Z(), MassPiPlus); // in case of ghost
4070-
p1.SetXYZT(v1.X(), v1.Y(), v1.Z(), energy(v1.X(), v1.Y(), v1.Z(), MassPiPlus)); // in case of ghost
4069+
p1.SetXYZT(v1.X(), v1.Y(), v1.Z(), RecoDecay::e(v1.X(), v1.Y(), v1.Z(), MassPiPlus)); // in case of ghost
40714070

40724071
if (trackMCId[i] >= 0) {
40734072
// p1.SetXYZM(v1.X(), v1.Y(), v1.Z(), (std::abs(tmptrack.udMcParticle().pdgCode()) == 211 ? MassPiPlus : MassElectron));
40744073
// p1.SetXYZT(v1.X(), v1.Y(), v1.Z(), energy(v1.X(), v1.Y(), v1.Z(), (std::abs(tmptrack.udMcParticle().pdgCode()) == 211 ? MassPiPlus : MassElectron)));
4075-
p1.SetXYZT(v1.X(), v1.Y(), v1.Z(), energy(v1.X(), v1.Y(), v1.Z(), (std::abs(tmptrack.udMcParticle().pdgCode()) == kPiPlus ? MassPiPlus : MassElectron))); // 211
4076-
float tmpPt = pt(tmptrack.udMcParticle().px(), tmptrack.udMcParticle().py());
4077-
float tmpEta = eta(tmptrack.udMcParticle().px(), tmptrack.udMcParticle().py(), tmptrack.udMcParticle().pz());
4078-
float tmpPhi = phi(tmptrack.udMcParticle().px(), tmptrack.udMcParticle().py());
4074+
p1.SetXYZT(v1.X(), v1.Y(), v1.Z(), RecoDecay::e(v1.X(), v1.Y(), v1.Z(), (std::abs(tmptrack.udMcParticle().pdgCode()) == kPiPlus ? MassPiPlus : MassElectron))); // 211
4075+
float tmpPt = RecoDecay::pt(tmptrack.udMcParticle().px(), tmptrack.udMcParticle().py());
4076+
float tmpEta = RecoDecay::eta(std::array<double, 3>{tmptrack.udMcParticle().px(), tmptrack.udMcParticle().py(), tmptrack.udMcParticle().pz()});
4077+
float tmpPhi = RecoDecay::phi(tmptrack.udMcParticle().px(), tmptrack.udMcParticle().py());
40794078
registryMC.get<TH2>(HIST("global1MCrec/hpTGenRecTracksPV"))->Fill(tmptrack.pt(), tmpPt);
40804079
registryMC.get<TH2>(HIST("global1MCrec/hDeltapTGenRecVsRecpTTracksPV"))->Fill(tmptrack.pt() - tmpPt, tmptrack.pt());
40814080
registryMC.get<TH2>(HIST("global1MCrec/hEtaGenRecTracksPV"))->Fill(tmpEtaData, tmpEta);
@@ -4231,10 +4230,10 @@ struct TauTau13topo {
42314230
// if (tmptrack.hasTOF()) trkHasTof[i] = true;
42324231
v1.SetXYZ(tmptrack.px(), tmptrack.py(), tmptrack.pz());
42334232
// p1.SetXYZM(v1.X(), v1.Y(), v1.Z(), MassPiPlus); // in case of ghost
4234-
p1.SetXYZT(v1.X(), v1.Y(), v1.Z(), energy(v1.X(), v1.Y(), v1.Z(), MassPiPlus)); // in case of ghost
4233+
p1.SetXYZT(v1.X(), v1.Y(), v1.Z(), RecoDecay::e(v1.X(), v1.Y(), v1.Z(), MassPiPlus)); // in case of ghost
42354234
if (trackMCId[i] >= 0) {
42364235
// p1.SetXYZM(v1.X(), v1.Y(), v1.Z(), (i == matchedElIndexToData ? MassElectron : MassPiPlus));
4237-
p1.SetXYZT(v1.X(), v1.Y(), v1.Z(), energy(v1.X(), v1.Y(), v1.Z(), (i == matchedElIndexToData ? MassElectron : MassPiPlus)));
4236+
p1.SetXYZT(v1.X(), v1.Y(), v1.Z(), RecoDecay::e(v1.X(), v1.Y(), v1.Z(), (i == matchedElIndexToData ? MassElectron : MassPiPlus)));
42384237
}
42394238

42404239
nSigmaEl[counterTmp] = tmptrack.tpcNSigmaEl();
@@ -5032,7 +5031,7 @@ struct TauTau13topo {
50325031
for (const auto& trk : PVContributors) {
50335032
qtot += trk.sign();
50345033
// p.SetXYZM(trk.px(), trk.py(), trk.pz(), MassPiPlus);
5035-
p.SetXYZT(trk.px(), trk.py(), trk.pz(), energy(trk.px(), trk.py(), trk.pz(), MassPiPlus));
5034+
p.SetXYZT(trk.px(), trk.py(), trk.pz(), RecoDecay::e(trk.px(), trk.py(), trk.pz(), MassPiPlus));
50365035
if (std::abs(p.Eta()) < trkEtacut)
50375036
nEtaIn15++; // 0.9 is a default
50385037
if (trk.pt() > 0.1)

0 commit comments

Comments
 (0)