diff --git a/InnerDetector/InDetRecTools/InDetAmbiTrackSelectionTool/InDetAmbiTrackSelectionTool/InDetAmbiTrackSelectionTool.h b/InnerDetector/InDetRecTools/InDetAmbiTrackSelectionTool/InDetAmbiTrackSelectionTool/InDetAmbiTrackSelectionTool.h
index 0b6804f428eb7b09aba99f9ed0fea3397bb2282e..fe3331566b2f85c2d0f48b3cf01492e26e6c6257 100755
--- a/InnerDetector/InDetRecTools/InDetAmbiTrackSelectionTool/InDetAmbiTrackSelectionTool/InDetAmbiTrackSelectionTool.h
+++ b/InnerDetector/InDetRecTools/InDetAmbiTrackSelectionTool/InDetAmbiTrackSelectionTool/InDetAmbiTrackSelectionTool.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 ///////////////////////////////////////////////////////////////////
@@ -55,7 +55,7 @@ namespace InDet
       virtual const Trk::Track* getCleanedOutTrack(const Trk::Track*, const Trk::TrackScore score) ;
       virtual StatusCode registerPRDs(const Trk::Track* ptrTrack);
       virtual void reset();
-      virtual std::vector<const Trk::PrepRawData*> getPrdsOnTrack(const Trk::Track* ptrTrack);
+      virtual std::vector<const Trk::PrepRawData*> getPrdsOnTrack(const Trk::Track* ptrTrack) const;
       
       
     private:
@@ -98,7 +98,7 @@ inline void InDet::InDetAmbiTrackSelectionTool::reset()
 {
   m_assoTool->reset();
 }
-inline std::vector<const Trk::PrepRawData*> InDet::InDetAmbiTrackSelectionTool::getPrdsOnTrack(const Trk::Track* ptrTrack)
+inline std::vector<const Trk::PrepRawData*> InDet::InDetAmbiTrackSelectionTool::getPrdsOnTrack(const Trk::Track* ptrTrack) const
 {
   return m_assoTool->getPrdsOnTrack(*ptrTrack);
 }
diff --git a/InnerDetector/InDetRecTools/InDetAmbiTrackSelectionTool/InDetAmbiTrackSelectionTool/InDetDenseEnvAmbiTrackSelectionTool.h b/InnerDetector/InDetRecTools/InDetAmbiTrackSelectionTool/InDetAmbiTrackSelectionTool/InDetDenseEnvAmbiTrackSelectionTool.h
index 7955e476d87e16fb0a37d2f97a7f8e2109e5261f..b10da343e4cfc312556d479549fc684805d8b523 100755
--- a/InnerDetector/InDetRecTools/InDetAmbiTrackSelectionTool/InDetAmbiTrackSelectionTool/InDetDenseEnvAmbiTrackSelectionTool.h
+++ b/InnerDetector/InDetRecTools/InDetAmbiTrackSelectionTool/InDetAmbiTrackSelectionTool/InDetDenseEnvAmbiTrackSelectionTool.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 ///////////////////////////////////////////////////////////////////
@@ -70,7 +70,7 @@ namespace InDet
       virtual const Trk::Track* getCleanedOutTrack(const Trk::Track*, const Trk::TrackScore score) ;
       virtual StatusCode registerPRDs(const Trk::Track* ptrTrack);
       virtual void reset();
-      virtual std::vector<const Trk::PrepRawData*> getPrdsOnTrack(const Trk::Track* ptrTrack);
+      virtual std::vector<const Trk::PrepRawData*> getPrdsOnTrack(const Trk::Track* ptrTrack) const;
       
       
     private:
@@ -249,7 +249,7 @@ namespace InDet
           RIO.resize(nTSoS,0);
         };
         
-        int findIndexOfPreviousMeasurement( int currentIndex )
+        int findIndexOfPreviousMeasurement( int currentIndex ) const
         {
           int indexPreviousMeasurement = currentIndex-1;
           while(indexPreviousMeasurement >= 0){
@@ -398,7 +398,7 @@ inline void InDet::InDetDenseEnvAmbiTrackSelectionTool::reset()
 {
   m_assoTool->reset();
 }
-inline std::vector<const Trk::PrepRawData*> InDet::InDetDenseEnvAmbiTrackSelectionTool::getPrdsOnTrack(const Trk::Track* ptrTrack)
+inline std::vector<const Trk::PrepRawData*> InDet::InDetDenseEnvAmbiTrackSelectionTool::getPrdsOnTrack(const Trk::Track* ptrTrack) const
 {
   return m_assoTool->getPrdsOnTrack(*ptrTrack);
 }
diff --git a/MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonAmbiTrackSelectionTool/MuonAmbiTrackSelectionTool/MuonAmbiTrackSelectionTool.h b/MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonAmbiTrackSelectionTool/MuonAmbiTrackSelectionTool/MuonAmbiTrackSelectionTool.h
index 993286605a87405de440beb3b5a322e4203d9b29..c0b9cc60a1da626ad4bd08db22376ba05aa28d0f 100644
--- a/MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonAmbiTrackSelectionTool/MuonAmbiTrackSelectionTool/MuonAmbiTrackSelectionTool.h
+++ b/MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonAmbiTrackSelectionTool/MuonAmbiTrackSelectionTool/MuonAmbiTrackSelectionTool.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 ///////////////////////////////////////////////////////////////////
@@ -54,7 +54,7 @@ namespace Muon
     virtual const Trk::Track* getCleanedOutTrack(const Trk::Track*, const Trk::TrackScore score) ;
     virtual StatusCode registerPRDs(const Trk::Track* ptrTrack);
     virtual void reset();
-    virtual std::vector<const Trk::PrepRawData*> getPrdsOnTrack(const Trk::Track* ptrTrack);
+    virtual std::vector<const Trk::PrepRawData*> getPrdsOnTrack(const Trk::Track* ptrTrack) const;
       
       
   private:
@@ -85,7 +85,7 @@ inline void Muon::MuonAmbiTrackSelectionTool::reset()
 {
   m_assoTool->reset();
 }
-inline std::vector<const Trk::PrepRawData*> Muon::MuonAmbiTrackSelectionTool::getPrdsOnTrack(const Trk::Track* ptrTrack)
+inline std::vector<const Trk::PrepRawData*> Muon::MuonAmbiTrackSelectionTool::getPrdsOnTrack(const Trk::Track* ptrTrack) const
 {
   return m_assoTool->getPrdsOnTrack(*ptrTrack);
 }
diff --git a/Tracking/TrkTools/TrkToolInterfaces/TrkToolInterfaces/IAmbiTrackSelectionTool.h b/Tracking/TrkTools/TrkToolInterfaces/TrkToolInterfaces/IAmbiTrackSelectionTool.h
index 886b660e8b75b5f9a2d1f22d0b40345e7ce293cf..bd04b9e7551f4fd5389ff99239806772ca854f11 100755
--- a/Tracking/TrkTools/TrkToolInterfaces/TrkToolInterfaces/IAmbiTrackSelectionTool.h
+++ b/Tracking/TrkTools/TrkToolInterfaces/TrkToolInterfaces/IAmbiTrackSelectionTool.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 ///////////////////////////////////////////////////////////////////
@@ -42,7 +42,7 @@ namespace Trk
     */
     virtual StatusCode registerPRDs(const Trk::Track* ptrTrack) = 0;
     virtual void reset() = 0;
-    virtual std::vector<const Trk::PrepRawData*> getPrdsOnTrack(const Trk::Track* ptrTrack)=0;
+    virtual std::vector<const Trk::PrepRawData*> getPrdsOnTrack(const Trk::Track* ptrTrack) const =0;
   };
 
   inline const InterfaceID& Trk::IAmbiTrackSelectionTool::interfaceID()