Hide unused variables

Author: shahor02

DataFormats/Reconstruction/include/ReconstructionDataFormats/TrackUtils.h

@@ -162,12 +162,12 @@ GPUd() value_T BetheBlochSolidOpt(value_T bg)
   // The default values for the kp* parameters are for silicon.
   // The returned value is in [GeV/(g/cm^2)].
   //
+  //  constexpr value_T rho = 2.33;
+  //  constexpr value_T meanI = 173e-9;
   constexpr value_T mK = 0.307075e-3; // [GeV*cm^2/g]
   constexpr value_T me = 0.511e-3;    // [GeV/c^2]
-  constexpr value_T rho = 2.33;
   constexpr value_T kp1 = 0.20 * 2.303;
   constexpr value_T kp2 = 3.00 * 2.303;
-  constexpr value_T meanI = 173e-9;
   constexpr value_T meanZA = 0.49848;
   constexpr value_T lhwI = -1.7175226;         // gpu::CAMath::Log(28.816 * 1e-9 * gpu::CAMath::Sqrt(rho * meanZA) / meanI);
   constexpr value_T log2muTomeanI = 8.6839805; // gpu::CAMath::Log( 2. * me / meanI);

DataFormats/Reconstruction/src/TrackParametrization.cxx

@@ -780,7 +780,10 @@ GPUd() bool TrackParametrization<value_T>::correctForELoss(value_t xrho, bool an
     }
     int charge2 = getAbsCharge() * getAbsCharge();
     value_t p = getP(), p0 = p, p2 = p * p, e2 = p2 + getPID().getMass2(), massInv = 1. / m, bg = p * massInv;
-    value_t e = gpu::CAMath::Sqrt(e2), ekin = e - m, dedx1 = getdEdxBBOpt(bg), dedx = dedx1, dedxDer = 0.;
+    value_t e = gpu::CAMath::Sqrt(e2), ekin = e - m, dedx = getdEdxBBOpt(bg);
+#ifdef _BB_NONCONST_CORR_
+    value_t dedxDer = 0., dedx1 = dedx;
+#endif
     if (charge2 != 1) {
       dedx *= charge2;
     }

DataFormats/Reconstruction/src/TrackParametrizationWithError.cxx

@@ -1015,7 +1015,10 @@ GPUd() bool TrackParametrizationWithError<value_T>::correctForMaterial(value_t x
   value_t p = this->getP(), p0 = p, p02 = p * p, e2 = p02 + this->getPID().getMass2(), massInv = 1. / m, bg = p * massInv, dETot = 0.;
   value_t e = gpu::CAMath::Sqrt(e2), e0 = e;
   if (m > 0 && xrho != 0.f) {
-    value_t ekin = e - m, dedx1 = this->getdEdxBBOpt(bg), dedx = dedx1, dedxDer = 0.;
+    value_t ekin = e - m, dedx = this->getdEdxBBOpt(bg);
+#ifdef _BB_NONCONST_CORR_
+    value_t dedxDer = 0., dedx1 = dedx;
+#endif
     if (charge2 != 1) {
       dedx *= charge2;
     }