Skip to content

Commit d8daecc

Browse files
joonsukbaejoonsukbae
committed
Rename currentQOverPt -> smearQOverPt per review
1 parent 535bb8e commit d8daecc

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
@@ -736,23 +736,23 @@ struct TrackTuner : o2::framework::ConfigurableGroup {
736736
dcaZResData = evalGraph(ptMC, grDcaZResVsPtPionData[phiBin].get());
737737

738738
// Local Q/Pt resolution: either the constant configurable value, or evaluated per-track from graphs
739-
double currentQOverPtMC = qOverPtMC;
740-
double currentQOverPtData = qOverPtData;
739+
double smearQOverPtMC = qOverPtMC;
740+
double smearQOverPtData = qOverPtData;
741741
if (updateCurvature || updateCurvatureIU) {
742-
if ((currentQOverPtMC < 0) || (currentQOverPtData < 0)) {
742+
if ((smearQOverPtMC < 0) || (smearQOverPtData < 0)) {
743743
/// check that input graphs for q/pt smearing are correctly retrieved
744744
if (!grOneOverPtPionData.get() || !grOneOverPtPionMC.get()) {
745745
LOG(fatal) << "### q/pt smearing: input graphs not correctly retrieved. Aborting.";
746746
}
747-
currentQOverPtMC = std::max(0.0, evalGraph(ptMC, grOneOverPtPionMC.get()));
748-
currentQOverPtData = std::max(0.0, evalGraph(ptMC, grOneOverPtPionData.get()));
747+
smearQOverPtMC = std::max(0.0, evalGraph(ptMC, grOneOverPtPionMC.get()));
748+
smearQOverPtData = std::max(0.0, evalGraph(ptMC, grOneOverPtPionData.get()));
749749
if (debugInfo) {
750750
LOG(info) << "### q/pt graph-based smearing: pT=" << ptMC
751-
<< " sigma(1/pT)_MC=" << currentQOverPtMC
752-
<< " sigma(1/pT)_Data=" << currentQOverPtData
753-
<< " ratio(Data/MC)=" << (currentQOverPtMC > 0. ? currentQOverPtData / currentQOverPtMC : -1.);
751+
<< " sigma(1/pT)_MC=" << smearQOverPtMC
752+
<< " sigma(1/pT)_Data=" << smearQOverPtData
753+
<< " ratio(Data/MC)=" << (smearQOverPtMC > 0. ? smearQOverPtData / smearQOverPtMC : -1.);
754754
}
755-
} // currentQOverPtMC, currentQOverPtData block ends here
755+
} // smearQOverPtMC, smearQOverPtData block ends here
756756
} // updateCurvature, updateCurvatureIU block ends here
757757

758758
if (updateTrackDCAs) {
@@ -821,44 +821,44 @@ struct TrackTuner : o2::framework::ConfigurableGroup {
821821
// double dpt1o =pt1o-pt1mc;
822822
deltaQpt = trackParQPtMCRec - trackParQPtMC;
823823
// double dpt1n =dpt1o *(spt1o >0. ? (spt1n /spt1o ) : 1.);
824-
deltaQptTuned = deltaQpt * (currentQOverPtMC > 0. ? (currentQOverPtData / currentQOverPtMC) : 1.);
824+
deltaQptTuned = deltaQpt * (smearQOverPtMC > 0. ? (smearQOverPtData / smearQOverPtMC) : 1.);
825825
// double pt1n = pt1mc+dpt1n;
826826
trackParQPtTuned = trackParQPtMC + deltaQptTuned;
827827
trackParCov.setQ2Pt(trackParQPtTuned);
828828

829829
// updating track cov matrix elements for 1/Pt at innermost update point
830830
// if(sd0rpo>0. && spt1o>0.)covar[10]*=(sd0rpn/sd0rpo)*(spt1n/spt1o);//ypt
831831
sigma1PtY = trackParCov.getSigma1PtY();
832-
if (dcaXYResMC > 0. && currentQOverPtMC > 0.) {
833-
sigma1PtY *= ((dcaXYResData / dcaXYResMC) * (currentQOverPtData / currentQOverPtMC));
832+
if (dcaXYResMC > 0. && smearQOverPtMC > 0.) {
833+
sigma1PtY *= ((dcaXYResData / dcaXYResMC) * (smearQOverPtData / smearQOverPtMC));
834834
trackParCov.setCov(sigma1PtY, 10);
835835
}
836836

837837
// if(sd0zo>0. && spt1o>0.) covar[11]*=(sd0zn/sd0zo)*(spt1n/spt1o);//zpt
838838
sigma1PtZ = trackParCov.getSigma1PtZ();
839-
if (dcaZResMC > 0. && currentQOverPtMC > 0.) {
840-
sigma1PtZ *= ((dcaZResData / dcaZResMC) * (currentQOverPtData / currentQOverPtMC));
839+
if (dcaZResMC > 0. && smearQOverPtMC > 0.) {
840+
sigma1PtZ *= ((dcaZResData / dcaZResMC) * (smearQOverPtData / smearQOverPtMC));
841841
trackParCov.setCov(sigma1PtZ, 11);
842842
}
843843

844844
// if(spt1o>0.) covar[12]*=(spt1n/spt1o);//sinPhipt
845845
sigma1PtSnp = trackParCov.getSigma1PtSnp();
846-
if (currentQOverPtMC > 0.) {
847-
sigma1PtSnp *= (currentQOverPtData / currentQOverPtMC);
846+
if (smearQOverPtMC > 0.) {
847+
sigma1PtSnp *= (smearQOverPtData / smearQOverPtMC);
848848
trackParCov.setCov(sigma1PtSnp, 12);
849849
}
850850

851851
// if(spt1o>0.) covar[13]*=(spt1n/spt1o);//tanTpt
852852
sigma1PtTgl = trackParCov.getSigma1PtTgl();
853-
if (currentQOverPtMC > 0.) {
854-
sigma1PtTgl *= (currentQOverPtData / currentQOverPtMC);
853+
if (smearQOverPtMC > 0.) {
854+
sigma1PtTgl *= (smearQOverPtData / smearQOverPtMC);
855855
trackParCov.setCov(sigma1PtTgl, 13);
856856
}
857857

858858
// if(spt1o>0.) covar[14]*=(spt1n/spt1o)*(spt1n/spt1o);//ptpt
859859
sigma1Pt2 = trackParCov.getSigma1Pt2();
860-
if (currentQOverPtMC > 0.) {
861-
sigma1Pt2 *= (currentQOverPtData / currentQOverPtMC) * (currentQOverPtData / currentQOverPtMC);
860+
if (smearQOverPtMC > 0.) {
861+
sigma1Pt2 *= (smearQOverPtData / smearQOverPtMC) * (smearQOverPtData / smearQOverPtMC);
862862
trackParCov.setCov(sigma1Pt2, 14);
863863
}
864864
} // updateCurvatureIU block ends here
@@ -954,7 +954,7 @@ struct TrackTuner : o2::framework::ConfigurableGroup {
954954
}
955955
deltaQpt = trackParQPtMCRec - trackParQPtMC;
956956
// double dpt1n =dpt1o *(spt1o >0. ? (spt1n /spt1o ) : 1.);
957-
deltaQptTuned = deltaQpt * (currentQOverPtMC > 0. ? (currentQOverPtData / currentQOverPtMC) : 1.);
957+
deltaQptTuned = deltaQpt * (smearQOverPtMC > 0. ? (smearQOverPtData / smearQOverPtMC) : 1.);
958958
// double pt1n = pt1mc+dpt1n;
959959
trackParQPtTuned = trackParQPtMC + deltaQptTuned;
960960
trackParCov.setQ2Pt(trackParQPtTuned);
@@ -1015,36 +1015,36 @@ struct TrackTuner : o2::framework::ConfigurableGroup {
10151015
if ((updateCurvature) && (!updateCurvatureIU)) {
10161016
// if(sd0rpo>0. && spt1o>0.)covar[10]*=(sd0rpn/sd0rpo)*(spt1n/spt1o);//ypt
10171017
sigma1PtY = trackParCov.getSigma1PtY();
1018-
if (dcaXYResMC > 0. && currentQOverPtMC > 0.) {
1019-
sigma1PtY *= ((dcaXYResData / dcaXYResMC) * (currentQOverPtData / currentQOverPtMC));
1018+
if (dcaXYResMC > 0. && smearQOverPtMC > 0.) {
1019+
sigma1PtY *= ((dcaXYResData / dcaXYResMC) * (smearQOverPtData / smearQOverPtMC));
10201020
trackParCov.setCov(sigma1PtY, 10);
10211021
}
10221022

10231023
// if(sd0zo>0. && spt1o>0.) covar[11]*=(sd0zn/sd0zo)*(spt1n/spt1o);//zpt
10241024
sigma1PtZ = trackParCov.getSigma1PtZ();
1025-
if (dcaZResMC > 0. && currentQOverPtMC > 0.) {
1026-
sigma1PtZ *= ((dcaZResData / dcaZResMC) * (currentQOverPtData / currentQOverPtMC));
1025+
if (dcaZResMC > 0. && smearQOverPtMC > 0.) {
1026+
sigma1PtZ *= ((dcaZResData / dcaZResMC) * (smearQOverPtData / smearQOverPtMC));
10271027
trackParCov.setCov(sigma1PtZ, 11);
10281028
}
10291029

10301030
// if(spt1o>0.) covar[12]*=(spt1n/spt1o);//sinPhipt
10311031
sigma1PtSnp = trackParCov.getSigma1PtSnp();
1032-
if (currentQOverPtMC > 0.) {
1033-
sigma1PtSnp *= (currentQOverPtData / currentQOverPtMC);
1032+
if (smearQOverPtMC > 0.) {
1033+
sigma1PtSnp *= (smearQOverPtData / smearQOverPtMC);
10341034
trackParCov.setCov(sigma1PtSnp, 12);
10351035
}
10361036

10371037
// if(spt1o>0.) covar[13]*=(spt1n/spt1o);//tanTpt
10381038
sigma1PtTgl = trackParCov.getSigma1PtTgl();
1039-
if (currentQOverPtMC > 0.) {
1040-
sigma1PtTgl *= (currentQOverPtData / currentQOverPtMC);
1039+
if (smearQOverPtMC > 0.) {
1040+
sigma1PtTgl *= (smearQOverPtData / smearQOverPtMC);
10411041
trackParCov.setCov(sigma1PtTgl, 13);
10421042
}
10431043

10441044
// if(spt1o>0.) covar[14]*=(spt1n/spt1o)*(spt1n/spt1o);//ptpt
10451045
sigma1Pt2 = trackParCov.getSigma1Pt2();
1046-
if (currentQOverPtMC > 0.) {
1047-
sigma1Pt2 *= (currentQOverPtData / currentQOverPtMC) * (currentQOverPtData / currentQOverPtMC);
1046+
if (smearQOverPtMC > 0.) {
1047+
sigma1Pt2 *= (smearQOverPtData / smearQOverPtMC) * (smearQOverPtData / smearQOverPtMC);
10481048
trackParCov.setCov(sigma1Pt2, 14);
10491049
}
10501050
} // ---> track cov matrix elements for 1/Pt ends here

0 commit comments

Comments
 (0)