From 86a14d6cd5abae2e6c9694448641369bdde4fb61 Mon Sep 17 00:00:00 2001
From: Nicolas Koehler <nicolas.koehler@cern.ch>
Date: Tue, 27 Oct 2020 18:36:01 +0000
Subject: [PATCH] fix some ifdefs and remove commented code

---
 .../src/MuonTruthNtupleBranch.cxx             |  2 -
 .../MuonCondSvc/src/CscCoolStrSvc.h           |  3 +-
 .../src/RpcDetectorStatusDbTool.cxx           |  8 +-
 .../MuonReadoutGeometry/CscDetectorElement.h  |  6 +-
 .../MuonReadoutGeometry/CscReadoutElement.h   |  9 +--
 .../MuonReadoutGeometry/GlobalUtilities.h     | 22 +-----
 .../MuonReadoutGeometry/MMReadoutElement.h    |  6 +-
 .../MuonReadoutGeometry/MdtDetectorElement.h  |  9 +--
 .../MuonReadoutGeometry/MdtReadoutElement.h   | 12 +--
 .../MuonReadoutGeometry/MuonChannelDesign.h   |  6 +-
 .../MuonClusterReadoutElement.h               | 11 +--
 .../MuonReadoutGeometry/MuonDetectorElement.h |  6 +-
 .../MuonReadoutGeometry/MuonPadDesign.h       |  6 +-
 .../MuonReadoutGeometry/MuonReadoutElement.h  |  6 +-
 .../MuonReadoutGeometry/MuonStripDesign.h     |  8 +-
 .../MuonReadoutGeometry/RpcDetectorElement.h  |  6 +-
 .../MuonReadoutGeometry/RpcReadoutElement.h   |  6 +-
 .../MuonReadoutGeometry/RpcReadoutSet.h       | 11 +--
 .../MuonReadoutGeometry/TgcDetectorElement.h  |  6 +-
 .../MuonReadoutGeometry/TgcReadoutElement.h   | 11 +--
 .../MuonReadoutGeometry/TgcReadoutParams.h    |  6 +-
 .../MuonReadoutGeometry/sTgcReadoutElement.h  |  6 +-
 .../MuonRDO/MuonRDO/RpcPadContainer.h         |  2 +-
 .../MuonRDO/src/CscRawDataContainer.cxx       | 14 +---
 .../MuonRDO/src/RpcPadContainer.cxx           | 75 +------------------
 .../MuonRDO/src/TgcRdoContainer.cxx           | 14 +---
 .../src/MuonTruthAssociationAlg.cxx           |  1 -
 .../src/MuonCreatorTool.cxx                   |  2 +-
 .../TrigMuonEF/src/TrigMuonEFFSRoiMaker.cxx   |  6 +-
 29 files changed, 71 insertions(+), 215 deletions(-)

diff --git a/MuonSpectrometer/MuonCalib/MuonCalibNtuple/src/MuonTruthNtupleBranch.cxx b/MuonSpectrometer/MuonCalib/MuonCalibNtuple/src/MuonTruthNtupleBranch.cxx
index 5a9061b99d6..b33a3f85155 100644
--- a/MuonSpectrometer/MuonCalib/MuonCalibNtuple/src/MuonTruthNtupleBranch.cxx
+++ b/MuonSpectrometer/MuonCalib/MuonCalibNtuple/src/MuonTruthNtupleBranch.cxx
@@ -33,8 +33,6 @@ namespace MuonCalib {
       return false;
     }
 
-    //    TrackRecord truth( const_cast<TrackRecord&>(ctruth) ); //Looks nasty, but TrackRecord.Get*() const is not defined=
-
     // copy values 
     m_kinEnergy[m_index] = truth.kinEnergy();
     m_gPosX[m_index] = truth.position().x();
diff --git a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/src/CscCoolStrSvc.h b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/src/CscCoolStrSvc.h
index 494469bf69a..2b90dca2e85 100755
--- a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/src/CscCoolStrSvc.h
+++ b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/src/CscCoolStrSvc.h
@@ -172,8 +172,7 @@ namespace MuonCalib {
 
     ServiceHandle<Muon::IMuonIdHelperSvc> m_idHelperSvc {this, "MuonIdHelperSvc", "Muon::MuonIdHelperSvc/MuonIdHelperSvc"};
 
-    //maximum channel and chamber hashes (num of each -1). These are set
-    //with a const_cast from the id helper
+    //maximum channel and chamber hashes (num of each -1)
     unsigned int m_maxChamberHash; 
     const unsigned int m_maxChanHash; 
 
diff --git a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondTool/src/RpcDetectorStatusDbTool.cxx b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondTool/src/RpcDetectorStatusDbTool.cxx
index 168de59bec0..8815bf3abb8 100644
--- a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondTool/src/RpcDetectorStatusDbTool.cxx
+++ b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondTool/src/RpcDetectorStatusDbTool.cxx
@@ -252,13 +252,7 @@ StatusCode RpcDetectorStatusDbTool::loadRpcDqStatus(IOVSVC_CALLBACK_ARGS_P(I,key
     //m_RPC_PanelMeanClusterSizeMap.insert(std::make_pair(chamberId,MeanClusterSizeMap));
     m_RPC_PanelMeanClusterSizeMap[chamberId]=MeanClusterSizeMap;
 
-    if( m_debug )  m_log << MSG::DEBUG << "Size of  RPC_PanelMeanClusterSizeMap " << m_RPC_PanelMeanClusterSizeMap.size() << "; in panel " <<  channum << " SMeanClusterSizeMap " << SMeanClusterSizeMap << " MeanClusterSizeMap " << MeanClusterSizeMap << endmsg;     
-    //std::cout<<"Here DBversion="<<DBversion<<std::endl;
-    //std::cout<<"info_panel size  = "<<info_panel.size()<<std::endl;
-    //for(unsigned int ii=0; ii<info_panel.size();ii++){       
-    //  char* ch_tmp1= const_cast<char*>(info_panel[ii].c_str());       
-    //  m_log << MSG::INFO << " info_panel " <<ii<<" "<< ch_tmp1 << endmsg;
-    //}
+    if( m_debug )  m_log << MSG::DEBUG << "Size of  RPC_PanelMeanClusterSizeMap " << m_RPC_PanelMeanClusterSizeMap.size() << "; in panel " <<  channum << " SMeanClusterSizeMap " << SMeanClusterSizeMap << " MeanClusterSizeMap " << MeanClusterSizeMap << endmsg;
     if( DBversion>2 ){
       char * SFracClusterSize1Map_a=const_cast<char*>(info_panel[19].c_str());
       char * SFracClusterSize1Map_b=const_cast<char*>(info_panel[20].c_str());
diff --git a/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/MuonReadoutGeometry/CscDetectorElement.h b/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/MuonReadoutGeometry/CscDetectorElement.h
index 5bb08e6f1cc..54b6885042f 100644
--- a/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/MuonReadoutGeometry/CscDetectorElement.h
+++ b/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/MuonReadoutGeometry/CscDetectorElement.h
@@ -7,8 +7,8 @@
  -------------------------------------------------------
  ***************************************************************************/
 
-#ifndef MUONGEOMODEL_CSCDETECTORELEMENT_H
-#define MUONGEOMODEL_CSCDETECTORELEMENT_H
+#ifndef MUONREADOUTGEOMETRY_CSCDETECTORELEMENT_H
+#define MUONREADOUTGEOMETRY_CSCDETECTORELEMENT_H
 
 #include "Identifier/IdentifierHash.h"
 #include "Identifier/Identifier.h"
@@ -80,4 +80,4 @@ private:
 
 } // namespace MuonGM
 
-#endif // MUONGEOMODEL_CSCDETECTORELEMENT_H
+#endif // MUONREADOUTGEOMETRY_CSCDETECTORELEMENT_H
diff --git a/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/MuonReadoutGeometry/CscReadoutElement.h b/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/MuonReadoutGeometry/CscReadoutElement.h
index 09e475194a7..68b24400ee6 100644
--- a/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/MuonReadoutGeometry/CscReadoutElement.h
+++ b/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/MuonReadoutGeometry/CscReadoutElement.h
@@ -7,11 +7,8 @@
  -----------------------------------------
 ***************************************************************************/
 
-//<doc><file>	$Id: CscReadoutElement.h,v 1.3 2009-03-03 00:27:38 dwright Exp $
-//<version>	$Name: not supported by cvs2svn $
-
-#ifndef MUONGEOMODEL_CSCREADOUTELEMENT_H
-# define MUONGEOMODEL_CSCREADOUTELEMENT_H
+#ifndef MUONREADOUTGEOMETRY_CSCREADOUTELEMENT_H
+#define MUONREADOUTGEOMETRY_CSCREADOUTELEMENT_H
 
 #include "MuonReadoutGeometry/MuonClusterReadoutElement.h"
 #include "MuonReadoutGeometry/MuonDetectorManager.h"
@@ -354,4 +351,4 @@ namespace MuonGM {
 } // namespace MuonGM
 
 
-#endif // MUONGEOMODEL_CSCREADOUTELEMENT_H
+#endif // MUONREADOUTGEOMETRY_CSCREADOUTELEMENT_H
diff --git a/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/MuonReadoutGeometry/GlobalUtilities.h b/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/MuonReadoutGeometry/GlobalUtilities.h
index 2011551d0ae..360650a3c28 100644
--- a/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/MuonReadoutGeometry/GlobalUtilities.h
+++ b/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/MuonReadoutGeometry/GlobalUtilities.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
 /***************************************************************************
@@ -7,30 +7,16 @@
  -----------------------------------------
  ***************************************************************************/
 
-//<doc><file>	$Id: GlobalUtilities.h,v 1.1.1.1 2009-02-23 21:17:26 dwright Exp $
-//<version>	$Name: not supported by cvs2svn $
+#ifndef MUONREADOUTGEOMETRY_GLOBALUTILITIES_H
+#define MUONREADOUTGEOMETRY_GLOBALUTILITIES_H
 
-#ifndef MUONGEOMODEL_GLOBALUTILITIES_H
-# define MUONGEOMODEL_GLOBALUTILITIES_H
-
-//<<<<<< INCLUDES                                                       >>>>>>
 #include <string>
 
-//<<<<<< PUBLIC DEFINES                                                 >>>>>>
-//<<<<<< PUBLIC CONSTANTS                                               >>>>>>
-//<<<<<< PUBLIC TYPES                                                   >>>>>>
-//<<<<<< PUBLIC VARIABLES                                               >>>>>>
-//<<<<<< PUBLIC FUNCTIONS                                               >>>>>>
-//<<<<<< CLASS DECLARATIONS                                             >>>>>>
-
-
 namespace MuonGM 
 {
     std::string buildString(int i, int ncha);
     int strtoint(std::string str, unsigned int istart, unsigned int length);
     int stationPhiTGC(std::string stName, int fi, int zi_input, std::string geometry_version);
-    
-    
 }
 
-#endif // MUONGEOMODEL_GLOBALUTILITIES_H
+#endif // MUONREADOUTGEOMETRY_GLOBALUTILITIES_H
diff --git a/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/MuonReadoutGeometry/MMReadoutElement.h b/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/MuonReadoutGeometry/MMReadoutElement.h
index 3f33043c2b9..21a8ab00739 100644
--- a/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/MuonReadoutGeometry/MMReadoutElement.h
+++ b/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/MuonReadoutGeometry/MMReadoutElement.h
@@ -2,8 +2,8 @@
   Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
-#ifndef MUONGEOMODEL_MMREADOUTELEMENT_H
-#define MUONGEOMODEL_MMREADOUTELEMENT_H
+#ifndef MUONREADOUTGEOMETRY_MMREADOUTELEMENT_H
+#define MUONREADOUTGEOMETRY_MMREADOUTELEMENT_H
 
 #include "MuonReadoutGeometry/MuonClusterReadoutElement.h"
 #include "MuonReadoutGeometry/MuonDetectorManager.h"
@@ -282,4 +282,4 @@ namespace MuonGM {
 
 } // namespace MuonGM
 
-#endif // MUONGEOMODEL_STGCREADOUTELEMENT_H
+#endif // MUONREADOUTGEOMETRY_MMREADOUTELEMENT_H
diff --git a/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/MuonReadoutGeometry/MdtDetectorElement.h b/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/MuonReadoutGeometry/MdtDetectorElement.h
index a8f6438deef..bf59569a7f5 100644
--- a/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/MuonReadoutGeometry/MdtDetectorElement.h
+++ b/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/MuonReadoutGeometry/MdtDetectorElement.h
@@ -7,9 +7,6 @@
  -----------------------------------------
  ***************************************************************************/
 
-//<doc><file>	$Id: MdtDetectorElement.h 
-//<version>	$Name: not supported by cvs2svn $
-
 //!  A MdtDetectorElement Class
 /*!
   MdtDetectorElements are as granular as offline mdt data collections 
@@ -19,8 +16,8 @@
   methods will delegate the job to the appropriate MdtReadoutElement.  
 */
 
-#ifndef MDTGEOMODEL_MDTDETECTORELEMENT_H
-# define MDTGEOMODEL_MDTDETECTORELEMENT_H
+#ifndef MUONREADOUTGEOMETRY_MDTDETECTORELEMENT_H
+#define MUONREADOUTGEOMETRY_MDTDETECTORELEMENT_H
 
 #include <string>
 #include "MuonReadoutGeometry/MuonDetectorElement.h"
@@ -111,4 +108,4 @@ private:
 
 } // namespace MuonGM
 
-#endif // MDTGEOMODEL_MDTDETECTORELEMENT_H
+#endif // MUONREADOUTGEOMETRY_MDTDETECTORELEMENT_H
diff --git a/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/MuonReadoutGeometry/MdtReadoutElement.h b/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/MuonReadoutGeometry/MdtReadoutElement.h
index 8475f273cf4..4fb8f9a62d0 100644
--- a/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/MuonReadoutGeometry/MdtReadoutElement.h
+++ b/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/MuonReadoutGeometry/MdtReadoutElement.h
@@ -2,14 +2,8 @@
   Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
-/***************************************************************************
- Mdt Readout Element properties
- -----------------------------------------
-
-*/
-
-#ifndef MUONGEOMODEL_MDTREADOUTELEMENT_H
-# define MUONGEOMODEL_MDTREADOUTELEMENT_H
+#ifndef MUONREADOUTGEOMETRY_MDTREADOUTELEMENT_H
+#define MUONREADOUTGEOMETRY_MDTREADOUTELEMENT_H
 
 #include "MuonReadoutGeometry/MuonReadoutElement.h"
 #include "MuonReadoutGeometry/MuonDetectorManager.h"
@@ -323,4 +317,4 @@ inline std::vector<const Trk::Surface*> MdtReadoutElement::surfaces() const {
 
 } // namespace MuonGM
 
-#endif // MUONGEOMODEL_MDTREADOUTELEMENT_H
+#endif // MUONREADOUTGEOMETRY_MDTREADOUTELEMENT_H
diff --git a/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/MuonReadoutGeometry/MuonChannelDesign.h b/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/MuonReadoutGeometry/MuonChannelDesign.h
index d611d4f9f07..88e3e07cf58 100644
--- a/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/MuonReadoutGeometry/MuonChannelDesign.h
+++ b/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/MuonReadoutGeometry/MuonChannelDesign.h
@@ -7,8 +7,8 @@
  ----------------------------------------------------------------------
 ***************************************************************************/
 
-#ifndef MUONTRACKINGGEOMETRY_MUONCHANNELDESIGN_H
-#define MUONTRACKINGGEOMETRY_MUONCHANNELDESIGN_H
+#ifndef MUONREADOUTGEOMETRY_MUONCHANNELDESIGN_H
+#define MUONREADOUTGEOMETRY_MUONCHANNELDESIGN_H
 
 #include "GeoPrimitives/GeoPrimitives.h"
 #include "GaudiKernel/MsgStream.h"
@@ -457,4 +457,4 @@ namespace MuonGM {
   }
 
 }
-#endif // MUONTRACKINGGEOMETRY_MUONCHANNELDESIGN_H
+#endif // MUONREADOUTGEOMETRY_MUONCHANNELDESIGN_H
diff --git a/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/MuonReadoutGeometry/MuonClusterReadoutElement.h b/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/MuonReadoutGeometry/MuonClusterReadoutElement.h
index c854f9830c9..7be4db808ea 100644
--- a/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/MuonReadoutGeometry/MuonClusterReadoutElement.h
+++ b/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/MuonReadoutGeometry/MuonClusterReadoutElement.h
@@ -2,13 +2,8 @@
   Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
-/***************************************************************************
-Muon Cluster Readout Element properties
- -----------------------------------------
-***************************************************************************/
-
-#ifndef MUONGEOMODEL_MUONCLUSTERREADOUTELEMENT_H
-#define MUONGEOMODEL_MUONCLUSTERREADOUTELEMENT_H
+#ifndef MUONREADOUTGEOMETRY_MUONCLUSTERREADOUTELEMENT_H
+#define MUONREADOUTGEOMETRY_MUONCLUSTERREADOUTELEMENT_H
 
 #include "GeoPrimitives/GeoPrimitives.h"
 #include "MuonReadoutGeometry/MuonReadoutElement.h"
@@ -234,4 +229,4 @@ namespace MuonGM {
   }
 
 }
-#endif // MUONGEOMODEL_MUONCLUSTERREADOUTELEMENT_H
+#endif // MUONREADOUTGEOMETRY_MUONCLUSTERREADOUTELEMENT_H
diff --git a/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/MuonReadoutGeometry/MuonDetectorElement.h b/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/MuonReadoutGeometry/MuonDetectorElement.h
index 98589b4ae09..4f3ceee67b5 100644
--- a/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/MuonReadoutGeometry/MuonDetectorElement.h
+++ b/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/MuonReadoutGeometry/MuonDetectorElement.h
@@ -16,8 +16,8 @@
   methods will delegate the job to the appropriate MuonReadoutElement.  
 */
 
-#ifndef MUONGEOMODEL_MUONDETECTORELEMENT_H
-# define MUONGEOMODEL_MUONDETECTORELEMENT_H
+#ifndef MUONREADOUTGEOMETRY_MUONDETECTORELEMENT_H
+#define MUONREADOUTGEOMETRY_MUONDETECTORELEMENT_H
 
 #include <string>
 #include "TrkDetElementBase/TrkDetElementBase.h"
@@ -84,4 +84,4 @@ const MuonDetectorManager* MuonDetectorElement::manager() const
  
 } // namespace MuonGM
 
-#endif // MUONGEOMODEL_MUONDETECTORELEMENT_H
+#endif // MUONREADOUTGEOMETRY_MUONDETECTORELEMENT_H
diff --git a/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/MuonReadoutGeometry/MuonPadDesign.h b/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/MuonReadoutGeometry/MuonPadDesign.h
index 21ad68890b6..f064af59c3e 100644
--- a/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/MuonReadoutGeometry/MuonPadDesign.h
+++ b/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/MuonReadoutGeometry/MuonPadDesign.h
@@ -7,8 +7,8 @@
  ----------------------------------------------------------------------
 ***************************************************************************/
 
-#ifndef MUONTRACKINGGEOMETRY_MUONPADDESIGN_H
-#define MUONTRACKINGGEOMETRY_MUONPADDESIGN_H
+#ifndef MUONREADOUTGEOMETRY_MUONPADDESIGN_H
+#define MUONREADOUTGEOMETRY_MUONPADDESIGN_H
 
 #include "GeoPrimitives/GeoPrimitives.h"
 
@@ -179,4 +179,4 @@ namespace MuonGM {
   }
 
 }
-#endif // MUONTRACKINGGEOMETRY_MUONPADDESIGN_H
+#endif // MUONREADOUTGEOMETRY_MUONPADDESIGN_H
diff --git a/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/MuonReadoutGeometry/MuonReadoutElement.h b/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/MuonReadoutGeometry/MuonReadoutElement.h
index 3e88b926e6c..70a238fde67 100644
--- a/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/MuonReadoutGeometry/MuonReadoutElement.h
+++ b/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/MuonReadoutGeometry/MuonReadoutElement.h
@@ -7,8 +7,8 @@
  -----------------------------------------
  ***************************************************************************/
 
-#ifndef MUONGEOMODEL_MUONREADOUTELEMENT_H
-# define MUONGEOMODEL_MUONREADOUTELEMENT_H
+#ifndef MUONREADOUTGEOMETRY_MUONREADOUTELEMENT_H
+#define MUONREADOUTGEOMETRY_MUONREADOUTELEMENT_H
 
 #include <string>
 #include "TrkDetElementBase/TrkDetElementBase.h"
@@ -272,4 +272,4 @@ inline const Amg::Transform3D & MuonReadoutElement::defTransform() const
 } // namespace MuonGM
 
 
-#endif // MUONGEOMODEL_MUONREADOUTELEMENT_H
+#endif // MUONREADOUTGEOMETRY_MUONREADOUTELEMENT_H
diff --git a/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/MuonReadoutGeometry/MuonStripDesign.h b/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/MuonReadoutGeometry/MuonStripDesign.h
index ccdc9ad8397..043c8931e6f 100644
--- a/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/MuonReadoutGeometry/MuonStripDesign.h
+++ b/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/MuonReadoutGeometry/MuonStripDesign.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
 /***************************************************************************
@@ -7,8 +7,8 @@
  -----------------------------------------
 ***************************************************************************/
 
-#ifndef MUONGEOMODEL_MUONSTRIPDESIGN_H
-#define MUONGEOMODEL_MUONSTRIPDESIGN_H
+#ifndef MUONREADOUTGEOMETRY_MUONSTRIPDESIGN_H
+#define MUONREADOUTGEOMETRY_MUONSTRIPDESIGN_H
 
 #include "GeoPrimitives/GeoPrimitives.h"
 
@@ -69,4 +69,4 @@ namespace MuonGM {
   }
 
 }
-#endif // MUONGEOMODEL_MUONSQUARECLUSTERDETECTORDESCRIPTOR_H
+#endif // MUONREADOUTGEOMETRY_MUONSTRIPDESIGN_H
diff --git a/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/MuonReadoutGeometry/RpcDetectorElement.h b/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/MuonReadoutGeometry/RpcDetectorElement.h
index 126fe925fc8..bac3e09ba28 100644
--- a/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/MuonReadoutGeometry/RpcDetectorElement.h
+++ b/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/MuonReadoutGeometry/RpcDetectorElement.h
@@ -7,8 +7,8 @@
  -------------------------------------------------------
 ***************************************************************************/
 
-#ifndef MUONGEOMODEL_RPCDETECTORELEMENT_H
-# define MUONGEOMODEL_RPCDETECTORELEMENT_H
+#ifndef MUONREADOUTGEOMETRY_RPCDETECTORELEMENT_H
+#define MUONREADOUTGEOMETRY_RPCDETECTORELEMENT_H
 
 #include "Identifier/IdentifierHash.h"
 #include "Identifier/Identifier.h"
@@ -88,4 +88,4 @@ namespace MuonGM {
 
 } // namespace MuonGM
 
-#endif // MUONGEOMODEL_RPCDETECTORELEMENT_H
+#endif // MUONREADOUTGEOMETRY_RPCDETECTORELEMENT_H
diff --git a/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/MuonReadoutGeometry/RpcReadoutElement.h b/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/MuonReadoutGeometry/RpcReadoutElement.h
index e62ee4cd267..7bf2dc60965 100644
--- a/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/MuonReadoutGeometry/RpcReadoutElement.h
+++ b/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/MuonReadoutGeometry/RpcReadoutElement.h
@@ -7,8 +7,8 @@
  -----------------------------------------
 ***************************************************************************/
 
-#ifndef MUONGEOMODEL_RPCREADOUTELEMENT_H
-# define MUONGEOMODEL_RPCREADOUTELEMENT_H
+#ifndef MUONREADOUTGEOMETRY_RPCREADOUTELEMENT_H
+#define MUONREADOUTGEOMETRY_RPCREADOUTELEMENT_H
 
 #include "MuonReadoutGeometry/MuonClusterReadoutElement.h"
 #include "MuonReadoutGeometry/MuonDetectorManager.h"
@@ -384,4 +384,4 @@ namespace MuonGM {
 
 } // namespace MuonGM
 
-#endif // MUONGEOMODEL_RPCREADOUTELEMENT_H
+#endif // MUONREADOUTGEOMETRY_RPCREADOUTELEMENT_H
diff --git a/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/MuonReadoutGeometry/RpcReadoutSet.h b/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/MuonReadoutGeometry/RpcReadoutSet.h
index 301c2052be7..c0d0c0be568 100644
--- a/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/MuonReadoutGeometry/RpcReadoutSet.h
+++ b/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/MuonReadoutGeometry/RpcReadoutSet.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
 /***************************************************************************
@@ -7,11 +7,8 @@
  -------------------------------------------------------
  ***************************************************************************/
 
-//<doc><file>	$Id: RpcReadoutSet.h,v 1.3 2009-03-03 00:27:38 dwright Exp $
-//<version>	$Name: not supported by cvs2svn $
-
-#ifndef MUONGEOMODEL_RPCREADOUTSET_H
-# define MUONGEOMODEL_RPCREADOUTSET_H
+#ifndef MUONREADOUTGEOMETRY_RPCREADOUTSET_H
+#define MUONREADOUTGEOMETRY_RPCREADOUTSET_H
 
 #include "MuonIdHelpers/RpcIdHelper.h"
 #include "Identifier/Identifier.h"
@@ -49,4 +46,4 @@ private:
 
 } // namespace MuonGM
 
-#endif // MUONGEOMODEL_RPCREADOUTSET_H
+#endif // MUONREADOUTGEOMETRY_RPCREADOUTSET_H
diff --git a/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/MuonReadoutGeometry/TgcDetectorElement.h b/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/MuonReadoutGeometry/TgcDetectorElement.h
index ed54ef6e4dd..9d0e3f13cf6 100644
--- a/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/MuonReadoutGeometry/TgcDetectorElement.h
+++ b/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/MuonReadoutGeometry/TgcDetectorElement.h
@@ -7,8 +7,8 @@
  -------------------------------------------------------
  ***************************************************************************/
 
-#ifndef MUONGEOMODEL_TGCDETECTORELEMENT_H
-#define MUONGEOMODEL_TGCDETECTORELEMENT_H
+#ifndef MUONREADOUTGEOMETRY_TGCDETECTORELEMENT_H
+#define MUONREADOUTGEOMETRY_TGCDETECTORELEMENT_H
 
 #include "Identifier/IdentifierHash.h"
 #include "Identifier/Identifier.h"
@@ -78,4 +78,4 @@ private:
 
 } // namespace MuonGM
 
-#endif // MUONGEOMODEL_TGCDETECTORELEMENT_H
+#endif // MUONREADOUTGEOMETRY_TGCDETECTORELEMENT_H
diff --git a/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/MuonReadoutGeometry/TgcReadoutElement.h b/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/MuonReadoutGeometry/TgcReadoutElement.h
index 8929b74356d..a308265df25 100644
--- a/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/MuonReadoutGeometry/TgcReadoutElement.h
+++ b/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/MuonReadoutGeometry/TgcReadoutElement.h
@@ -2,13 +2,8 @@
   Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
-/***************************************************************************
- Tgc Readout Element properties
- -----------------------------------------
-***************************************************************************/
-
-#ifndef MUONGEOMODEL_TGCREADOUTELEMENT_H
-# define MUONGEOMODEL_TGCREADOUTELEMENT_H
+#ifndef MUONREADOUTGEOMETRY_TGCREADOUTELEMENT_H
+#define MUONREADOUTGEOMETRY_TGCREADOUTELEMENT_H
 
 #include "MuonReadoutGeometry/MuonClusterReadoutElement.h"
 #include "MuonReadoutGeometry/MuonDetectorManager.h"
@@ -408,4 +403,4 @@ namespace MuonGM {
 
 } // namespace MuonGM
 
-#endif // MUONGEOMODEL_TGCREADOUTELEMENT_H
+#endif // MUONREADOUTGEOMETRY_TGCREADOUTELEMENT_H
diff --git a/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/MuonReadoutGeometry/TgcReadoutParams.h b/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/MuonReadoutGeometry/TgcReadoutParams.h
index c7959aca21b..1688c821a94 100644
--- a/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/MuonReadoutGeometry/TgcReadoutParams.h
+++ b/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/MuonReadoutGeometry/TgcReadoutParams.h
@@ -2,8 +2,8 @@
   Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
-#ifndef MUONGEOMODEL_TGCREADOUTPARAMS_H
-#define MUONGEOMODEL_TGCREADOUTPARAMS_H
+#ifndef MUONREADOUTGEOMETRY_TGCREADOUTPARAMS_H
+#define MUONREADOUTGEOMETRY_TGCREADOUTPARAMS_H
 
 // ******************************************************************************
 // class TgcReadoutParams
@@ -131,4 +131,4 @@ const std::string TgcReadoutParams::GetName() const
 }
 } // namespace MuonGM
 
-#endif // MUONGEOMODEL_TGCREADOUTPARAMS_H
+#endif // MUONREADOUTGEOMETRY_TGCREADOUTPARAMS_H
diff --git a/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/MuonReadoutGeometry/sTgcReadoutElement.h b/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/MuonReadoutGeometry/sTgcReadoutElement.h
index df6421468c7..e041edf6746 100644
--- a/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/MuonReadoutGeometry/sTgcReadoutElement.h
+++ b/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/MuonReadoutGeometry/sTgcReadoutElement.h
@@ -2,8 +2,8 @@
   Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
-#ifndef MUONGEOMODEL_STGCREADOUTELEMENT_H
-#define MUONGEOMODEL_STGCREADOUTELEMENT_H
+#ifndef MUONREADOUTGEOMETRY_STGCREADOUTELEMENT_H
+#define MUONREADOUTGEOMETRY_STGCREADOUTELEMENT_H
 
 #include "MuonReadoutGeometry/MuonClusterReadoutElement.h"
 #include "MuonReadoutGeometry/MuonDetectorManager.h"
@@ -351,4 +351,4 @@ namespace MuonGM {
 
 } // namespace MuonGM
 
-#endif // MUONGEOMODEL_STGCREADOUTELEMENT_H
+#endif // MUONREADOUTGEOMETRY_STGCREADOUTELEMENT_H
diff --git a/MuonSpectrometer/MuonRDO/MuonRDO/RpcPadContainer.h b/MuonSpectrometer/MuonRDO/MuonRDO/RpcPadContainer.h
index 6e77bec928a..f75b2e977f7 100755
--- a/MuonSpectrometer/MuonRDO/MuonRDO/RpcPadContainer.h
+++ b/MuonSpectrometer/MuonRDO/MuonRDO/RpcPadContainer.h
@@ -29,7 +29,7 @@ public:
    RpcPadContainer(unsigned int hashmax) ; 
    RpcPadContainer(RpcPad_Cache* cache) ; 
 
-  ~RpcPadContainer() ; 
+  ~RpcPadContainer()=default; 
 
   typedef RpcPad::size_type size_type ; 
   typedef IdentifiableContainer<RpcPad> MyBase; 
diff --git a/MuonSpectrometer/MuonRDO/src/CscRawDataContainer.cxx b/MuonSpectrometer/MuonRDO/src/CscRawDataContainer.cxx
index da7669a8f31..5d6c55e9dcc 100755
--- a/MuonSpectrometer/MuonRDO/src/CscRawDataContainer.cxx
+++ b/MuonSpectrometer/MuonRDO/src/CscRawDataContainer.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "MuonRDO/CscRawDataContainer.h"
@@ -51,16 +51,4 @@ const CLID& CscRawDataContainer::classID()
 // Insert a RawData
 void CscRawDataContainer::push_back(CscRawData * /*rawData*/)
 {
-  // uint16_t collectionId = rawData->identify();
-  // 
-  // // find CscRawData
-  // MyBase::const_iterator it = MyBase::indexFind(collectionId);
-  // if(it!=MyBase::end())
-  //   {
-  //     const CscRawDataCollection * const_coll = *it;
-  //     CscRawDataCollection * coll = const_cast<CscRawDataCollection *>(const_coll);
-  //     coll->push_back(rawData); 
-  //   } 
-  // else std::cout << "CscRawDataContainer::ERROR : RawData ID not found, ID = " 
-  //         << collectionId << std::endl;
 }
diff --git a/MuonSpectrometer/MuonRDO/src/RpcPadContainer.cxx b/MuonSpectrometer/MuonRDO/src/RpcPadContainer.cxx
index 1f0eb8831db..dc1579a7556 100755
--- a/MuonSpectrometer/MuonRDO/src/RpcPadContainer.cxx
+++ b/MuonSpectrometer/MuonRDO/src/RpcPadContainer.cxx
@@ -1,9 +1,7 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
-// MuonDigitContainer.cxx
-
 #include "GaudiKernel/Bootstrap.h"
 #include "GaudiKernel/ISvcLocator.h"
 #include "GaudiKernel/IMessageSvc.h"
@@ -15,92 +13,27 @@
 #include <cassert>
 #include <iostream>
 
-
-using std::ostream;
-using std::endl;
-
-//**********************************************************************
-// Local definitions
-//**********************************************************************
-
-//**********************************************************************
-// Member functions.
-//**********************************************************************
-
-
-//**********************************************************************
-
-// Default constructor.
-
 RpcPadContainer::RpcPadContainer( unsigned int hashmax)
 : IdentifiableContainer<RpcPad>(hashmax) 
 {
-  // std::cout<<"RpcPadContainer ctor ["<<this<<"]"<<std::endl;
 }
 
 RpcPadContainer::RpcPadContainer( RpcPad_Cache* cache)
 : IdentifiableContainer<RpcPad>(cache) 
 {
-  // std::cout<<"RpcPadContainer ctor ["<<this<<"]"<<std::endl;
 }
 
-//**********************************************************************
-
-// Destructor.
-
-RpcPadContainer::~RpcPadContainer() {
-  // std::cout<<"RpcPadContainer dtor ["<<this<<"]"<<std::endl;
-
-}
-
-//**********************************************************************
-/// Convert identifier to idhash
-//unsigned int 
-//RpcPadContainer::idToHash(unsigned int id) const
-//{
-//    return (hashFcn()(Identifier(id)));
-//}
-
-//**********************************************************************
-//RpcPadIdHash&
-//RpcPadContainer::hashFcn() const
-//{
-//    static RpcPadIdHash hashFcn;
-//    return(hashFcn);
-//}
-
-
 //**********************************************************************
 
 const CLID& RpcPadContainer::classID()
 {
   return ClassID_traits<RpcPadContainer>::ID();       
-  //    static const CLID CLID_RpcPadContainer= 4190; 
-  //    return  CLID_RpcPadContainer ; 
 }
 
 
 // Insert a pad.
 
 void RpcPadContainer::push_back(RpcCoinMatrix* /*cm*/) {
-
-  // IMessageSvc*  msgSvc;
-  // ISvcLocator* svcLoc = Gaudi::svcLocator( );
-  // svcLoc->service( "MessageSvc", msgSvc );
-  // MsgStream log(msgSvc, "MuonDigitContainer" );
-  // 
-  // Identifier padId = cm->identify(); 
-  // 
-  // MyBase::const_iterator it = MyBase::indexFind(padId);
-  // if(it!=MyBase::end()) {
-  //   const RpcPad* const_pad = (*it)  ;
-  //   RpcPad * pad = const_cast<RpcPad*>(const_pad);
-  //   pad->push_back(cm); 
-  //  } else
-  //  {
-  //    log << MSG::ERROR <<" RpcPadContainer: Pad does not exist "<<endmsg;
-  //  } 
-  //  return ; 
 }
 
 //**********************************************************************
@@ -125,8 +58,8 @@ RpcPadContainer::size_type RpcPadContainer::pad_size() const {
 
 // Output stream.
 
-ostream& operator<<(ostream& lhs, const RpcPadContainer& rhs) {
-  lhs << "RpcPadContainer has " << rhs.pad_size() << " pads:" << endl;
+std::ostream& operator<<(std::ostream& lhs, const RpcPadContainer& rhs) {
+  lhs << "RpcPadContainer has " << rhs.pad_size() << " pads:" << std::endl;
   typedef SelectAllObject<RpcPadContainer> SELECTOR; 
   SELECTOR sel(&rhs);
   SELECTOR::const_iterator it = sel.begin(); 
@@ -138,7 +71,7 @@ ostream& operator<<(ostream& lhs, const RpcPadContainer& rhs) {
       if ( first ) {
         first = false;
       } else {
-        lhs << endl;
+        lhs << std::endl;
       }
       lhs << "  " << *it;
   }
diff --git a/MuonSpectrometer/MuonRDO/src/TgcRdoContainer.cxx b/MuonSpectrometer/MuonRDO/src/TgcRdoContainer.cxx
index e91962cd477..b7ea639f5be 100755
--- a/MuonSpectrometer/MuonRDO/src/TgcRdoContainer.cxx
+++ b/MuonSpectrometer/MuonRDO/src/TgcRdoContainer.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "GaudiKernel/Bootstrap.h"
@@ -56,16 +56,4 @@ TgcRdoContainer::hashFcn()
 // Insert a RawData
 void TgcRdoContainer::push_back(TgcRawData * /*rawData*/)
 {
-  // uint16_t rawDataId = TgcRdo::identifyRawData(*rawData);
-  // 
-  // // find TgcRdo
-  // MyBase::const_iterator it = MyBase::indexFind(rawDataId);
-  // if(it!=MyBase::end())
-  //   {
-  //     const TgcRdo * const_rdo = *it;
-  //     TgcRdo * rdo = const_cast<TgcRdo *>(const_rdo);
-  //     rdo->push_back(rawData); 
-  //   } 
-  // 
-  // return ; 
 }
diff --git a/MuonSpectrometer/MuonTruthAlgs/src/MuonTruthAssociationAlg.cxx b/MuonSpectrometer/MuonTruthAlgs/src/MuonTruthAssociationAlg.cxx
index 1f227127002..132131130a1 100644
--- a/MuonSpectrometer/MuonTruthAlgs/src/MuonTruthAssociationAlg.cxx
+++ b/MuonSpectrometer/MuonTruthAlgs/src/MuonTruthAssociationAlg.cxx
@@ -72,7 +72,6 @@ StatusCode MuonTruthAssociationAlg::execute()
       tp = muon->trackParticle(xAOD::Muon::InnerDetectorTrackParticle);
     } 
     else{
-      //tp = const_cast<xAOD::TrackParticle*>(muon->primaryTrackParticle());
       tp=muon->primaryTrackParticle();
     }
     
diff --git a/Reconstruction/MuonIdentification/MuonCombinedBaseTools/src/MuonCreatorTool.cxx b/Reconstruction/MuonIdentification/MuonCombinedBaseTools/src/MuonCreatorTool.cxx
index bb80fadef15..bb34569c351 100644
--- a/Reconstruction/MuonIdentification/MuonCombinedBaseTools/src/MuonCreatorTool.cxx
+++ b/Reconstruction/MuonIdentification/MuonCombinedBaseTools/src/MuonCreatorTool.cxx
@@ -1131,7 +1131,7 @@ namespace MuonCombined {
             continue;
           }
           alreadyIncluded.insert(trackHash(primaryTag->primaryTrack()));
-	  //create a copy for ambi processing to avoid const_cast
+	  //create a copy for ambi processing
 	  //all we care about in the end is getting the right candidates anyway
 	  //muonTracks takes ownership of the memory
           Trk::Track* tmpTrack=new Trk::Track(*primaryTag->primaryTrack());
diff --git a/Trigger/TrigAlgorithms/TrigMuonEF/src/TrigMuonEFFSRoiMaker.cxx b/Trigger/TrigAlgorithms/TrigMuonEF/src/TrigMuonEFFSRoiMaker.cxx
index 51ad86961d5..f5c67a3c1a0 100644
--- a/Trigger/TrigAlgorithms/TrigMuonEF/src/TrigMuonEFFSRoiMaker.cxx
+++ b/Trigger/TrigAlgorithms/TrigMuonEF/src/TrigMuonEFFSRoiMaker.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "TrigMuonEFFSRoiMaker.h"
@@ -241,10 +241,6 @@ HLT::ErrorCode TrigMuonEFFSRoiMaker::hltExecute(std::vector<std::vector<HLT::Tri
 	xAOD::MuonContainer* outputContainer = new xAOD::MuonContainer(1);
 	xAOD::MuonAuxContainer auxCont;
 	outputContainer->setStore(&auxCont);
-	// using deep copy for now 
-	// maybe better to use ConstDataVector<MuonContainer> - but need to be able to attach to trigger element
-	//ConstDataVector<xAOD::MuonContainer>* outputContainer = new ConstDataVector<xAOD::MuonContainer>(1, SG::VIEW_ELEMENTS);
-	//(*outputContainer)[0] = const_cast<xAOD::Muon*>(muon);
 
 	// deep copy the muon
 	xAOD::Muon* muoncopy = new xAOD::Muon();
-- 
GitLab