diff --git a/reco/L1/L1Algo/L1TrackParFit.cxx b/reco/L1/L1Algo/L1TrackParFit.cxx
index 9b17a2e81a968ef3ed4dad525b895225a7d1897e..cc9291a50f06d682567509e7ea433f345f40a2b1 100644
--- a/reco/L1/L1Algo/L1TrackParFit.cxx
+++ b/reco/L1/L1Algo/L1TrackParFit.cxx
@@ -6,9 +6,6 @@
 
 #include "L1Fit.h"
 
-const fvec PipeRadThick   = 7.87e-3f;      // 0.7 mm Aluminium
-const fvec TargetRadThick = 3.73e-2f * 2;  // 250 mum Gold
-
 
 #define cnst const fvec
 
@@ -803,7 +800,7 @@ void L1TrackParFit::L1AddPipeMaterial(fvec qp0, fvec w)
   //  static const fscal logRadThick=log(RadThick);
   //const fscal RadThick=0.0009f;//0.5/18.76;
 
-  const fscal logRadThick = log(PipeRadThick[0]);
+  const fscal logRadThick = log(fPipeRadThick[0]);
   fvec tx                 = ftx;
   fvec ty                 = fty;
   fvec txtx               = ftx * ftx;
@@ -817,7 +814,7 @@ void L1TrackParFit::L1AddPipeMaterial(fvec qp0, fvec w)
   cnst c1 = 0.0136f, c2 = c1 * 0.038f, c3 = c2 * 0.5f, c4 = -c3 / 2.0f, c5 = c3 / 3.0f, c6 = -c3 / 4.0f;
   fvec s0 = (c1 + c2 * fvec(logRadThick) + c3 * h + h2 * (c4 + c5 * h + c6 * h2)) * qp0t;
   //fvec a = ( (ONE+mass2*qp0*qp0t)*RadThick*s0*s0 );
-  fvec a = ((t + fMass2 * qp0 * qp0t) * PipeRadThick * s0 * s0);
+  fvec a = ((t + fMass2 * qp0 * qp0t) * fPipeRadThick * s0 * s0);
 
   C22 += w * txtx1 * a;
   C32 += w * tx * ty * a;
@@ -825,7 +822,7 @@ void L1TrackParFit::L1AddPipeMaterial(fvec qp0, fvec w)
 }
 
 
-void L1TrackParFit::L1AddMaterial(fvec radThick, fvec qp0, fvec w)
+void L1TrackParFit::L1AddMaterial(const fvec& radThick, fvec qp0, fvec w)
 {
   cnst ONE = 1.;
 
diff --git a/reco/L1/L1Algo/L1TrackParFit.h b/reco/L1/L1Algo/L1TrackParFit.h
index 907ce9a9815030f64a246e044ec67cd877e489a0..cc352282d6df6af4d827929574f47bdc61429ab1 100644
--- a/reco/L1/L1Algo/L1TrackParFit.h
+++ b/reco/L1/L1Algo/L1TrackParFit.h
@@ -22,6 +22,9 @@ public:
   fvec fMass  = 0.10565800;     // muon mass
   fvec fMass2 = fMass * fMass;  // mass squared
 
+  fvec fPipeRadThick {7.87e-3f};        // 0.7 mm Aluminium  // TODO:
+  fvec fTargetRadThick {3.73e-2f * 2};  // 250 mum Gold      // TODO:
+
   L1TrackParFit()
     : fx(0.)
     , fy(0.)
@@ -130,7 +133,7 @@ public:
 
   void L1AddMaterial(const L1MaterialInfo& info, fvec qp0, fvec w);
 
-  void L1AddMaterial(fvec radThick, fvec qp0, fvec w = 1);
+  void L1AddMaterial(const fvec& radThick, fvec qp0, fvec w = 1);
 
   void L1AddThickMaterial(fvec radThick, fvec qp0, fvec w, fvec thickness, bool fDownstream);
   void L1AddPipeMaterial(fvec qp0, fvec w = 1);
@@ -143,7 +146,6 @@ public:
   //  L1FieldRegion &F
   //  );
 
-
 } _fvecalignment;
 
 // =============================================================================================