diff --git a/Reconstruction/TrackCaloClusterRec/TrackCaloClusterRecTools/TrackCaloClusterRecTools/ParticleToCaloExtrapolationTool.h b/Reconstruction/TrackCaloClusterRec/TrackCaloClusterRecTools/TrackCaloClusterRecTools/ParticleToCaloExtrapolationTool.h
index a10f0d43e2868000622d07f79ad52dfdbcf94488..f256923927ca917d85dc8bb6ed2799ad4688af28 100644
--- a/Reconstruction/TrackCaloClusterRec/TrackCaloClusterRecTools/TrackCaloClusterRecTools/ParticleToCaloExtrapolationTool.h
+++ b/Reconstruction/TrackCaloClusterRec/TrackCaloClusterRecTools/TrackCaloClusterRecTools/ParticleToCaloExtrapolationTool.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 /***************************************************************************
 ParticleToCaloExtrapolationTool.h  -  Description
@@ -13,9 +13,9 @@ authors : Noemi Calace
 #include "AthenaBaseComps/AthAlgTool.h"
 #include "GaudiKernel/ToolHandle.h"
 #include "GaudiKernel/ServiceHandle.h"
-#define private public
+//#define private public
 #include "xAODTracking/TrackParticle.h"
-#define public private
+//#define public private
 #include "TrackCaloClusterRecInterfaces/IParticleExtrapolationTool.h"
 #include "TrkEventPrimitives/ParticleHypothesis.h" 
 #include "xAODTracking/NeutralParticle.h"
diff --git a/Reconstruction/TrackCaloClusterRec/TrackCaloClusterRecTools/src/ParticleToCaloExtrapolationTool.cxx b/Reconstruction/TrackCaloClusterRec/TrackCaloClusterRecTools/src/ParticleToCaloExtrapolationTool.cxx
index b64a0089bf6768987adb01051a2020dabd09c76a..57c769798def91cba168e4ea0a57b9184ba3a5f0 100644
--- a/Reconstruction/TrackCaloClusterRec/TrackCaloClusterRecTools/src/ParticleToCaloExtrapolationTool.cxx
+++ b/Reconstruction/TrackCaloClusterRec/TrackCaloClusterRecTools/src/ParticleToCaloExtrapolationTool.cxx
@@ -1,16 +1,16 @@
 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 #include "TrackCaloClusterRecTools/ParticleToCaloExtrapolationTool.h"
 // forward declares
 #include "TrkSurfaces/PerigeeSurface.h"
 #include "TrkTrack/TrackStateOnSurface.h"
-#define private public
+//#define private public
 #include "TrkParameters/TrackParameters.h"
 #include "TrkExInterfaces/IExtrapolator.h"
 #include "TrkCaloExtension/CaloExtension.h"
 #include "TrkCaloExtension/CaloExtensionCollection.h"
-#define public private 
+//#define public private 
 #include "xAODTracking/TrackingPrimitives.h"
 #include "AtlasDetDescr/AtlasDetectorID.h"
 #include "TrkParametersIdentificationHelpers/TrackParametersIdHelper.h"
@@ -233,7 +233,8 @@ Trk::CaloExtension* ParticleToCaloExtrapolationTool::caloExtension( const Trk::T
         cpars = p.first->covariance() ? new Trk::CurvilinearParameters(p.first->position(),p.first->momentum(),p.first->charge(),new AmgSymMatrix(5)(*p.first->covariance()),id) : new Trk::CurvilinearParameters(p.first->position(),p.first->momentum(),p.first->charge(),nullptr,id);
         delete p.first;
       }else{
-        const_cast<Trk::CurvilinearParameters*>(cpars)->m_cIdentifier = id;
+        // FIXME: const_cast!!!
+        const_cast<Trk::CurvilinearParameters*>(cpars)->setcIdentifier (id);
       }
       caloLayers.push_back( cpars );
     }      
diff --git a/Tracking/TrkEvent/TrkParametersBase/TrkParametersBase/CurvilinearParametersT.h b/Tracking/TrkEvent/TrkParametersBase/TrkParametersBase/CurvilinearParametersT.h
index c8db11361a0cf1809026ea64eec0087d9d6c656e..5ff1b9fc7f3d45f36497574eda62fba9774f44d2 100644
--- a/Tracking/TrkEvent/TrkParametersBase/TrkParametersBase/CurvilinearParametersT.h
+++ b/Tracking/TrkEvent/TrkParametersBase/TrkParametersBase/CurvilinearParametersT.h
@@ -108,6 +108,10 @@ namespace Trk
     /** the curvilinear parameters identifier */
     unsigned int cIdentifier() const {return m_cIdentifier;}
 
+    void setcIdentifier (unsigned int cIdentifier)
+    { m_cIdentifier = cIdentifier; }
+
+
   protected:
     friend class MaterialEffectsEngine;
     virtual void updateParameters(const AmgVector(DIM)& updatedParameters,AmgSymMatrix(DIM)* updatedCovariance = 0) override;