diff --git a/Common/Tools/TrackTuner.h b/Common/Tools/TrackTuner.h
index 9a04b51be04..01ca6930d89 100644
--- a/Common/Tools/TrackTuner.h
+++ b/Common/Tools/TrackTuner.h
@@ -755,19 +755,24 @@ struct TrackTuner : o2::framework::ConfigurableGroup {
     dcaZResMC = evalGraph(ptMC, grDcaZResVsPtPionMC[phiBin].get());
     dcaZResData = evalGraph(ptMC, grDcaZResVsPtPionData[phiBin].get());
 
-    // For Q/Pt corrections, files on CCDB will be used if both qOverPtMC and qOverPtData are null
+    // Local Q/Pt resolution: either the constant configurable value, or evaluated per-track from graphs
+    double smearQOverPtMC = qOverPtMC;
+    double smearQOverPtData = qOverPtData;
     if (updateCurvature || updateCurvatureIU) {
-      if ((qOverPtMC < 0) || (qOverPtData < 0)) {
-        if (debugInfo) {
-          LOG(info) << "### q/pt smearing: qOverPtMC=" << qOverPtMC << ", qOverPtData=" << qOverPtData << ". One of them is negative. Retrieving then values from graphs from input .root file";
-        }
+      if ((smearQOverPtMC < 0) || (smearQOverPtData < 0)) {
         /// check that input graphs for q/pt smearing are correctly retrieved
         if (!grOneOverPtPionData.get() || !grOneOverPtPionMC.get()) {
           LOG(fatal) << "### q/pt smearing: input graphs not correctly retrieved. Aborting.";
         }
-        qOverPtMC = std::max(0.0, evalGraph(ptMC, grOneOverPtPionMC.get()));
-        qOverPtData = std::max(0.0, evalGraph(ptMC, grOneOverPtPionData.get()));
-      } // qOverPtMC, qOverPtData block ends here
+        smearQOverPtMC = std::max(0.0, evalGraph(ptMC, grOneOverPtPionMC.get()));
+        smearQOverPtData = std::max(0.0, evalGraph(ptMC, grOneOverPtPionData.get()));
+        if (debugInfo) {
+          LOG(info) << "### q/pt graph-based smearing: pT=" << ptMC
+                    << " sigma(1/pT)_MC=" << smearQOverPtMC
+                    << " sigma(1/pT)_Data=" << smearQOverPtData
+                    << " ratio(Data/MC)=" << (smearQOverPtMC > 0. ? smearQOverPtData / smearQOverPtMC : -1.);
+        }
+      } // smearQOverPtMC, smearQOverPtData block ends here
     } // updateCurvature, updateCurvatureIU block ends here
 
     if (updateTrackDCAs) {
@@ -836,7 +841,7 @@ struct TrackTuner : o2::framework::ConfigurableGroup {
       // double dpt1o =pt1o-pt1mc;
       deltaQpt = trackParQPtMCRec - trackParQPtMC;
       // double dpt1n =dpt1o *(spt1o >0. ? (spt1n /spt1o ) : 1.);
-      deltaQptTuned = deltaQpt * (qOverPtMC > 0. ? (qOverPtData / qOverPtMC) : 1.);
+      deltaQptTuned = deltaQpt * (smearQOverPtMC > 0. ? (smearQOverPtData / smearQOverPtMC) : 1.);
       // double pt1n  = pt1mc+dpt1n;
       trackParQPtTuned = trackParQPtMC + deltaQptTuned;
       trackParCov.setQ2Pt(trackParQPtTuned);
@@ -844,36 +849,36 @@ struct TrackTuner : o2::framework::ConfigurableGroup {
       // updating track cov matrix elements for 1/Pt at innermost update point
       //       if(sd0rpo>0. && spt1o>0.)covar[10]*=(sd0rpn/sd0rpo)*(spt1n/spt1o);//ypt
       sigma1PtY = trackParCov.getSigma1PtY();
-      if (dcaXYResMC > 0. && qOverPtMC > 0.) {
-        sigma1PtY *= ((dcaXYResData / dcaXYResMC) * (qOverPtData / qOverPtMC));
+      if (dcaXYResMC > 0. && smearQOverPtMC > 0.) {
+        sigma1PtY *= ((dcaXYResData / dcaXYResMC) * (smearQOverPtData / smearQOverPtMC));
         trackParCov.setCov(sigma1PtY, 10);
       }
 
       //       if(sd0zo>0. && spt1o>0.) covar[11]*=(sd0zn/sd0zo)*(spt1n/spt1o);//zpt
       sigma1PtZ = trackParCov.getSigma1PtZ();
-      if (dcaZResMC > 0. && qOverPtMC > 0.) {
-        sigma1PtZ *= ((dcaZResData / dcaZResMC) * (qOverPtData / qOverPtMC));
+      if (dcaZResMC > 0. && smearQOverPtMC > 0.) {
+        sigma1PtZ *= ((dcaZResData / dcaZResMC) * (smearQOverPtData / smearQOverPtMC));
         trackParCov.setCov(sigma1PtZ, 11);
       }
 
       //       if(spt1o>0.)             covar[12]*=(spt1n/spt1o);//sinPhipt
       sigma1PtSnp = trackParCov.getSigma1PtSnp();
-      if (qOverPtMC > 0.) {
-        sigma1PtSnp *= (qOverPtData / qOverPtMC);
+      if (smearQOverPtMC > 0.) {
+        sigma1PtSnp *= (smearQOverPtData / smearQOverPtMC);
         trackParCov.setCov(sigma1PtSnp, 12);
       }
 
       //       if(spt1o>0.)             covar[13]*=(spt1n/spt1o);//tanTpt
       sigma1PtTgl = trackParCov.getSigma1PtTgl();
-      if (qOverPtMC > 0.) {
-        sigma1PtTgl *= (qOverPtData / qOverPtMC);
+      if (smearQOverPtMC > 0.) {
+        sigma1PtTgl *= (smearQOverPtData / smearQOverPtMC);
         trackParCov.setCov(sigma1PtTgl, 13);
       }
 
       //       if(spt1o>0.)             covar[14]*=(spt1n/spt1o)*(spt1n/spt1o);//ptpt
       sigma1Pt2 = trackParCov.getSigma1Pt2();
-      if (qOverPtMC > 0.) {
-        sigma1Pt2 *= (qOverPtData / qOverPtMC) * (qOverPtData / qOverPtMC);
+      if (smearQOverPtMC > 0.) {
+        sigma1Pt2 *= (smearQOverPtData / smearQOverPtMC) * (smearQOverPtData / smearQOverPtMC);
         trackParCov.setCov(sigma1Pt2, 14);
       }
     } // updateCurvatureIU block ends here
@@ -969,7 +974,7 @@ struct TrackTuner : o2::framework::ConfigurableGroup {
       }
       deltaQpt = trackParQPtMCRec - trackParQPtMC;
       // double dpt1n =dpt1o *(spt1o >0. ? (spt1n /spt1o ) : 1.);
-      deltaQptTuned = deltaQpt * (qOverPtMC > 0. ? (qOverPtData / qOverPtMC) : 1.);
+      deltaQptTuned = deltaQpt * (smearQOverPtMC > 0. ? (smearQOverPtData / smearQOverPtMC) : 1.);
       // double pt1n  = pt1mc+dpt1n;
       trackParQPtTuned = trackParQPtMC + deltaQptTuned;
       trackParCov.setQ2Pt(trackParQPtTuned);
@@ -1030,36 +1035,36 @@ struct TrackTuner : o2::framework::ConfigurableGroup {
       if ((updateCurvature) && (!updateCurvatureIU)) {
         //       if(sd0rpo>0. && spt1o>0.)covar[10]*=(sd0rpn/sd0rpo)*(spt1n/spt1o);//ypt
         sigma1PtY = trackParCov.getSigma1PtY();
-        if (dcaXYResMC > 0. && qOverPtMC > 0.) {
-          sigma1PtY *= ((dcaXYResData / dcaXYResMC) * (qOverPtData / qOverPtMC));
+        if (dcaXYResMC > 0. && smearQOverPtMC > 0.) {
+          sigma1PtY *= ((dcaXYResData / dcaXYResMC) * (smearQOverPtData / smearQOverPtMC));
           trackParCov.setCov(sigma1PtY, 10);
         }
 
         //       if(sd0zo>0. && spt1o>0.) covar[11]*=(sd0zn/sd0zo)*(spt1n/spt1o);//zpt
         sigma1PtZ = trackParCov.getSigma1PtZ();
-        if (dcaZResMC > 0. && qOverPtMC > 0.) {
-          sigma1PtZ *= ((dcaZResData / dcaZResMC) * (qOverPtData / qOverPtMC));
+        if (dcaZResMC > 0. && smearQOverPtMC > 0.) {
+          sigma1PtZ *= ((dcaZResData / dcaZResMC) * (smearQOverPtData / smearQOverPtMC));
           trackParCov.setCov(sigma1PtZ, 11);
         }
 
         //       if(spt1o>0.)             covar[12]*=(spt1n/spt1o);//sinPhipt
         sigma1PtSnp = trackParCov.getSigma1PtSnp();
-        if (qOverPtMC > 0.) {
-          sigma1PtSnp *= (qOverPtData / qOverPtMC);
+        if (smearQOverPtMC > 0.) {
+          sigma1PtSnp *= (smearQOverPtData / smearQOverPtMC);
           trackParCov.setCov(sigma1PtSnp, 12);
         }
 
         //       if(spt1o>0.)             covar[13]*=(spt1n/spt1o);//tanTpt
         sigma1PtTgl = trackParCov.getSigma1PtTgl();
-        if (qOverPtMC > 0.) {
-          sigma1PtTgl *= (qOverPtData / qOverPtMC);
+        if (smearQOverPtMC > 0.) {
+          sigma1PtTgl *= (smearQOverPtData / smearQOverPtMC);
           trackParCov.setCov(sigma1PtTgl, 13);
         }
 
         //       if(spt1o>0.)             covar[14]*=(spt1n/spt1o)*(spt1n/spt1o);//ptpt
         sigma1Pt2 = trackParCov.getSigma1Pt2();
-        if (qOverPtMC > 0.) {
-          sigma1Pt2 *= (qOverPtData / qOverPtMC) * (qOverPtData / qOverPtMC);
+        if (smearQOverPtMC > 0.) {
+          sigma1Pt2 *= (smearQOverPtData / smearQOverPtMC) * (smearQOverPtData / smearQOverPtMC);
           trackParCov.setCov(sigma1Pt2, 14);
         }
       } // ---> track cov matrix elements for 1/Pt ends here