Skip to content

Commit 43abedd

Browse files
joonsukbaejoonsukbae
committed
Rename currentQOverPt -> smearQOverPt per review
1 parent c6c4c38 commit 43abedd

File tree

1 file changed

+31
-31
lines changed

1 file changed

+31
-31
lines changed

‎Common/Tools/TrackTuner.h‎

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -756,23 +756,23 @@ struct TrackTuner : o2::framework::ConfigurableGroup {
756756
dcaZResData = evalGraph(ptMC, grDcaZResVsPtPionData[phiBin].get());
757757

758758
// Local Q/Pt resolution: either the constant configurable value, or evaluated per-track from graphs
759-
double currentQOverPtMC = qOverPtMC;
760-
double currentQOverPtData = qOverPtData;
759+
double smearQOverPtMC = qOverPtMC;
760+
double smearQOverPtData = qOverPtData;
761761
if (updateCurvature || updateCurvatureIU) {
762-
if ((currentQOverPtMC < 0) || (currentQOverPtData < 0)) {
762+
if ((smearQOverPtMC < 0) || (smearQOverPtData < 0)) {
763763
/// check that input graphs for q/pt smearing are correctly retrieved
764764
if (!grOneOverPtPionData.get() || !grOneOverPtPionMC.get()) {
765765
LOG(fatal) << "### q/pt smearing: input graphs not correctly retrieved. Aborting.";
766766
}
767-
currentQOverPtMC = std::max(0.0, evalGraph(ptMC, grOneOverPtPionMC.get()));
768-
currentQOverPtData = std::max(0.0, evalGraph(ptMC, grOneOverPtPionData.get()));
767+
smearQOverPtMC = std::max(0.0, evalGraph(ptMC, grOneOverPtPionMC.get()));
768+
smearQOverPtData = std::max(0.0, evalGraph(ptMC, grOneOverPtPionData.get()));
769769
if (debugInfo) {
770770
LOG(info) << "### q/pt graph-based smearing: pT=" << ptMC
771-
<< " sigma(1/pT)_MC=" << currentQOverPtMC
772-
<< " sigma(1/pT)_Data=" << currentQOverPtData
773-
<< " ratio(Data/MC)=" << (currentQOverPtMC > 0. ? currentQOverPtData / currentQOverPtMC : -1.);
771+
<< " sigma(1/pT)_MC=" << smearQOverPtMC
772+
<< " sigma(1/pT)_Data=" << smearQOverPtData
773+
<< " ratio(Data/MC)=" << (smearQOverPtMC > 0. ? smearQOverPtData / smearQOverPtMC : -1.);
774774
}
775-
} // currentQOverPtMC, currentQOverPtData block ends here
775+
} // smearQOverPtMC, smearQOverPtData block ends here
776776
} // updateCurvature, updateCurvatureIU block ends here
777777

778778
if (updateTrackDCAs) {
@@ -841,44 +841,44 @@ struct TrackTuner : o2::framework::ConfigurableGroup {
841841
// double dpt1o =pt1o-pt1mc;
842842
deltaQpt = trackParQPtMCRec - trackParQPtMC;
843843
// double dpt1n =dpt1o *(spt1o >0. ? (spt1n /spt1o ) : 1.);
844-
deltaQptTuned = deltaQpt * (currentQOverPtMC > 0. ? (currentQOverPtData / currentQOverPtMC) : 1.);
844+
deltaQptTuned = deltaQpt * (smearQOverPtMC > 0. ? (smearQOverPtData / smearQOverPtMC) : 1.);
845845
// double pt1n = pt1mc+dpt1n;
846846
trackParQPtTuned = trackParQPtMC + deltaQptTuned;
847847
trackParCov.setQ2Pt(trackParQPtTuned);
848848

849849
// updating track cov matrix elements for 1/Pt at innermost update point
850850
// if(sd0rpo>0. && spt1o>0.)covar[10]*=(sd0rpn/sd0rpo)*(spt1n/spt1o);//ypt
851851
sigma1PtY = trackParCov.getSigma1PtY();
852-
if (dcaXYResMC > 0. && currentQOverPtMC > 0.) {
853-
sigma1PtY *= ((dcaXYResData / dcaXYResMC) * (currentQOverPtData / currentQOverPtMC));
852+
if (dcaXYResMC > 0. && smearQOverPtMC > 0.) {
853+
sigma1PtY *= ((dcaXYResData / dcaXYResMC) * (smearQOverPtData / smearQOverPtMC));
854854
trackParCov.setCov(sigma1PtY, 10);
855855
}
856856

857857
// if(sd0zo>0. && spt1o>0.) covar[11]*=(sd0zn/sd0zo)*(spt1n/spt1o);//zpt
858858
sigma1PtZ = trackParCov.getSigma1PtZ();
859-
if (dcaZResMC > 0. && currentQOverPtMC > 0.) {
860-
sigma1PtZ *= ((dcaZResData / dcaZResMC) * (currentQOverPtData / currentQOverPtMC));
859+
if (dcaZResMC > 0. && smearQOverPtMC > 0.) {
860+
sigma1PtZ *= ((dcaZResData / dcaZResMC) * (smearQOverPtData / smearQOverPtMC));
861861
trackParCov.setCov(sigma1PtZ, 11);
862862
}
863863

864864
// if(spt1o>0.) covar[12]*=(spt1n/spt1o);//sinPhipt
865865
sigma1PtSnp = trackParCov.getSigma1PtSnp();
866-
if (currentQOverPtMC > 0.) {
867-
sigma1PtSnp *= (currentQOverPtData / currentQOverPtMC);
866+
if (smearQOverPtMC > 0.) {
867+
sigma1PtSnp *= (smearQOverPtData / smearQOverPtMC);
868868
trackParCov.setCov(sigma1PtSnp, 12);
869869
}
870870

871871
// if(spt1o>0.) covar[13]*=(spt1n/spt1o);//tanTpt
872872
sigma1PtTgl = trackParCov.getSigma1PtTgl();
873-
if (currentQOverPtMC > 0.) {
874-
sigma1PtTgl *= (currentQOverPtData / currentQOverPtMC);
873+
if (smearQOverPtMC > 0.) {
874+
sigma1PtTgl *= (smearQOverPtData / smearQOverPtMC);
875875
trackParCov.setCov(sigma1PtTgl, 13);
876876
}
877877

878878
// if(spt1o>0.) covar[14]*=(spt1n/spt1o)*(spt1n/spt1o);//ptpt
879879
sigma1Pt2 = trackParCov.getSigma1Pt2();
880-
if (currentQOverPtMC > 0.) {
881-
sigma1Pt2 *= (currentQOverPtData / currentQOverPtMC) * (currentQOverPtData / currentQOverPtMC);
880+
if (smearQOverPtMC > 0.) {
881+
sigma1Pt2 *= (smearQOverPtData / smearQOverPtMC) * (smearQOverPtData / smearQOverPtMC);
882882
trackParCov.setCov(sigma1Pt2, 14);
883883
}
884884
} // updateCurvatureIU block ends here
@@ -974,7 +974,7 @@ struct TrackTuner : o2::framework::ConfigurableGroup {
974974
}
975975
deltaQpt = trackParQPtMCRec - trackParQPtMC;
976976
// double dpt1n =dpt1o *(spt1o >0. ? (spt1n /spt1o ) : 1.);
977-
deltaQptTuned = deltaQpt * (currentQOverPtMC > 0. ? (currentQOverPtData / currentQOverPtMC) : 1.);
977+
deltaQptTuned = deltaQpt * (smearQOverPtMC > 0. ? (smearQOverPtData / smearQOverPtMC) : 1.);
978978
// double pt1n = pt1mc+dpt1n;
979979
trackParQPtTuned = trackParQPtMC + deltaQptTuned;
980980
trackParCov.setQ2Pt(trackParQPtTuned);
@@ -1035,36 +1035,36 @@ struct TrackTuner : o2::framework::ConfigurableGroup {
10351035
if ((updateCurvature) && (!updateCurvatureIU)) {
10361036
// if(sd0rpo>0. && spt1o>0.)covar[10]*=(sd0rpn/sd0rpo)*(spt1n/spt1o);//ypt
10371037
sigma1PtY = trackParCov.getSigma1PtY();
1038-
if (dcaXYResMC > 0. && currentQOverPtMC > 0.) {
1039-
sigma1PtY *= ((dcaXYResData / dcaXYResMC) * (currentQOverPtData / currentQOverPtMC));
1038+
if (dcaXYResMC > 0. && smearQOverPtMC > 0.) {
1039+
sigma1PtY *= ((dcaXYResData / dcaXYResMC) * (smearQOverPtData / smearQOverPtMC));
10401040
trackParCov.setCov(sigma1PtY, 10);
10411041
}
10421042

10431043
// if(sd0zo>0. && spt1o>0.) covar[11]*=(sd0zn/sd0zo)*(spt1n/spt1o);//zpt
10441044
sigma1PtZ = trackParCov.getSigma1PtZ();
1045-
if (dcaZResMC > 0. && currentQOverPtMC > 0.) {
1046-
sigma1PtZ *= ((dcaZResData / dcaZResMC) * (currentQOverPtData / currentQOverPtMC));
1045+
if (dcaZResMC > 0. && smearQOverPtMC > 0.) {
1046+
sigma1PtZ *= ((dcaZResData / dcaZResMC) * (smearQOverPtData / smearQOverPtMC));
10471047
trackParCov.setCov(sigma1PtZ, 11);
10481048
}
10491049

10501050
// if(spt1o>0.) covar[12]*=(spt1n/spt1o);//sinPhipt
10511051
sigma1PtSnp = trackParCov.getSigma1PtSnp();
1052-
if (currentQOverPtMC > 0.) {
1053-
sigma1PtSnp *= (currentQOverPtData / currentQOverPtMC);
1052+
if (smearQOverPtMC > 0.) {
1053+
sigma1PtSnp *= (smearQOverPtData / smearQOverPtMC);
10541054
trackParCov.setCov(sigma1PtSnp, 12);
10551055
}
10561056

10571057
// if(spt1o>0.) covar[13]*=(spt1n/spt1o);//tanTpt
10581058
sigma1PtTgl = trackParCov.getSigma1PtTgl();
1059-
if (currentQOverPtMC > 0.) {
1060-
sigma1PtTgl *= (currentQOverPtData / currentQOverPtMC);
1059+
if (smearQOverPtMC > 0.) {
1060+
sigma1PtTgl *= (smearQOverPtData / smearQOverPtMC);
10611061
trackParCov.setCov(sigma1PtTgl, 13);
10621062
}
10631063

10641064
// if(spt1o>0.) covar[14]*=(spt1n/spt1o)*(spt1n/spt1o);//ptpt
10651065
sigma1Pt2 = trackParCov.getSigma1Pt2();
1066-
if (currentQOverPtMC > 0.) {
1067-
sigma1Pt2 *= (currentQOverPtData / currentQOverPtMC) * (currentQOverPtData / currentQOverPtMC);
1066+
if (smearQOverPtMC > 0.) {
1067+
sigma1Pt2 *= (smearQOverPtData / smearQOverPtMC) * (smearQOverPtData / smearQOverPtMC);
10681068
trackParCov.setCov(sigma1Pt2, 14);
10691069
}
10701070
} // ---> track cov matrix elements for 1/Pt ends here

0 commit comments

Comments
 (0)