From 9ea347e19fda29717472cd29bd6973e98632a1b4 Mon Sep 17 00:00:00 2001
From: scott snyder <sss@karma>
Date: Tue, 17 Sep 2019 15:40:50 +0200
Subject: [PATCH 1/2] TrackCaloClusterRecTools: Remove #define private.

Remove non-standard use of #define private.
---
 .../ParticleToCaloExtrapolationTool.h                    | 6 +++---
 .../src/ParticleToCaloExtrapolationTool.cxx              | 9 +++++----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/Reconstruction/TrackCaloClusterRec/TrackCaloClusterRecTools/TrackCaloClusterRecTools/ParticleToCaloExtrapolationTool.h b/Reconstruction/TrackCaloClusterRec/TrackCaloClusterRecTools/TrackCaloClusterRecTools/ParticleToCaloExtrapolationTool.h
index a10f0d43e28..f256923927c 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 b64a0089bf6..57c769798de 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 );
     }      
-- 
GitLab


From c8f2813474dcba45ae5ac0e34c6a5bcaefd77c08 Mon Sep 17 00:00:00 2001
From: scott snyder <sss@karma>
Date: Tue, 17 Sep 2019 15:40:34 +0200
Subject: [PATCH 2/2] TrkParametersBase: Add
 CurvilinearParametersT::setcIdentifier().

To allow removing a #define private in TrackCaloClusterRecTools.
---
 .../TrkParametersBase/CurvilinearParametersT.h                | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Tracking/TrkEvent/TrkParametersBase/TrkParametersBase/CurvilinearParametersT.h b/Tracking/TrkEvent/TrkParametersBase/TrkParametersBase/CurvilinearParametersT.h
index c8db11361a0..5ff1b9fc7f3 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; 
-- 
GitLab