MuonSimEvent: CLIDSvc -> AthenaKernel

    
Update references to headers in CLIDSvc moved to AthenaKernel.
Also remove unneeded dependency on SGTools.

MuonSpectrometer/MuonSimEvent/CMakeLists.txt

@@ -7,8 +7,7 @@ atlas_subdir( MuonSimEvent )
 
 # Declare the package's dependencies:
 atlas_depends_on_subdirs( PUBLIC
-                          Control/CLIDSvc
-                          Control/SGTools
+                          Control/AthenaKernel
                           Database/AtlasSealCLHEP
                           DetectorDescription/GeoPrimitives
                           DetectorDescription/Identifier
@@ -26,12 +25,12 @@ atlas_add_library( MuonSimEvent
                    PUBLIC_HEADERS MuonSimEvent
                    INCLUDE_DIRS ${EIGEN_INCLUDE_DIRS}
                    PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
-                   LINK_LIBRARIES ${EIGEN_LIBRARIES} SGTools GeoPrimitives Identifier GeneratorObjects HitManagement MuonIdHelpersLib
+                   LINK_LIBRARIES ${EIGEN_LIBRARIES} AthenaKernel GeoPrimitives Identifier GeneratorObjects HitManagement MuonIdHelpersLib
                    PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} )
 
 atlas_add_dictionary( MuonSimEventDict
                       MuonSimEvent/MuonSimEventDict.h
                       MuonSimEvent/selection.xml
                       INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS}
-                      LINK_LIBRARIES ${ROOT_LIBRARIES} ${EIGEN_LIBRARIES} SGTools GeoPrimitives Identifier GeneratorObjects MuonIdHelpersLib HitManagement MuonSimEvent )
+                      LINK_LIBRARIES ${ROOT_LIBRARIES} ${EIGEN_LIBRARIES} AthenaKernel GeoPrimitives Identifier GeneratorObjects MuonIdHelpersLib HitManagement MuonSimEvent )
 

MuonSpectrometer/MuonSimEvent/MuonSimEvent/CSCSimHitCollection.h

 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef CSCSimHitCollection_H
@@ -8,19 +8,14 @@
 #include "MuonSimEvent/CSCSimHit.h"
 #include "HitManagement/AtlasHitsVector.h"
 #include "HitManagement/AthenaHitsVector.h"
-
-#ifndef __CINT__
-  #include "CLIDSvc/CLASS_DEF.h"
-#endif
+#include "AthenaKernel/CLASS_DEF.h"
 typedef AthenaHitsVector<CSCSimHit> CSCOldSimHitCollection;
 
 typedef AtlasHitsVector<CSCSimHit> CSCSimHitCollection;
 typedef AtlasHitsVector<CSCSimHit>::iterator CSCSimHitIterator;
 typedef AtlasHitsVector<CSCSimHit>::const_iterator CSCSimHitConstIterator;
 
-#ifndef __CINT__
 CLASS_DEF (CSCSimHitCollection, 4053, 1)
 CLASS_DEF (CSCOldSimHitCollection, 1333371890, 1)
-#endif
 
 #endif

MuonSpectrometer/MuonSimEvent/MuonSimEvent/GenericMuonSimHitCollection.h

 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef GenericMuonSimHitCollection_H
@@ -8,10 +8,7 @@
 #include "MuonSimEvent/GenericMuonSimHit.h"
 #include "HitManagement/AtlasHitsVector.h"
 #include "HitManagement/AthenaHitsVector.h"
-
-#ifndef __CINT__
-  #include "CLIDSvc/CLASS_DEF.h"
-#endif
+#include "AthenaKernel/CLASS_DEF.h"
 
 typedef AthenaHitsVector<GenericMuonSimHit> OldGenericMuonSimHitCollection;
 
@@ -19,10 +16,8 @@ typedef AtlasHitsVector<GenericMuonSimHit> GenericMuonSimHitCollection;
 typedef AtlasHitsVector<GenericMuonSimHit>::iterator GenericMuonSimHitIterator;
 typedef AtlasHitsVector<GenericMuonSimHit>::const_iterator GenericMuonSimHitConstIterator;
 
-#ifndef __CINT__
 CLASS_DEF( GenericMuonSimHitCollection , 1155807089 , 1 )
 CLASS_DEF( OldGenericMuonSimHitCollection , 97056587 , 1 )
-#endif
 
 #endif
 

MuonSpectrometer/MuonSimEvent/MuonSimEvent/MDTSimHitCollection.h

 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef MDTSimHitCollection_H
@@ -8,19 +8,14 @@
 #include "MuonSimEvent/MDTSimHit.h"
 #include "HitManagement/AtlasHitsVector.h"
 #include "HitManagement/AthenaHitsVector.h"
-
-#ifndef __CINT__
-  #include "CLIDSvc/CLASS_DEF.h"
-#endif
+#include "AthenaKernel/CLASS_DEF.h"
 typedef AthenaHitsVector<MDTSimHit> MDTOldSimHitCollection;
 
 typedef AtlasHitsVector<MDTSimHit> MDTSimHitCollection;
 typedef AtlasHitsVector<MDTSimHit>::iterator MDTSimHitIterator;
 typedef AtlasHitsVector<MDTSimHit>::const_iterator MDTSimHitConstIterator;
 
-#ifndef __CINT__
 CLASS_DEF (MDTSimHitCollection, 4054, 1)
 CLASS_DEF (MDTOldSimHitCollection, 1138135938, 1)
-#endif
 
 #endif

MuonSpectrometer/MuonSimEvent/MuonSimEvent/RPCSimHitCollection.h

 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef RPCSimHitCollection_H
@@ -8,10 +8,7 @@
 #include "MuonSimEvent/RPCSimHit.h"
 #include "HitManagement/AtlasHitsVector.h"
 #include "HitManagement/AthenaHitsVector.h"
-
-#ifndef __CINT__
-  #include "CLIDSvc/CLASS_DEF.h"
-#endif
+#include "AthenaKernel/CLASS_DEF.h"
 
 typedef AthenaHitsVector<RPCSimHit> RPCOldSimHitCollection;
 
@@ -19,9 +16,7 @@ typedef AtlasHitsVector<RPCSimHit> RPCSimHitCollection;
 typedef AtlasHitsVector<RPCSimHit>::iterator RPCSimHitIterator;
 typedef AtlasHitsVector<RPCSimHit>::const_iterator RPCSimHitConstIterator;
 
-#ifndef __CINT__
 CLASS_DEF (RPCSimHitCollection, 4051, 1)
 CLASS_DEF (RPCOldSimHitCollection, 1182697430, 1)
-#endif
 
 #endif

MuonSpectrometer/MuonSimEvent/MuonSimEvent/TGCSimHitCollection.h

 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef TGCSimHitCollection_H
@@ -8,10 +8,7 @@
 #include "MuonSimEvent/TGCSimHit.h"
 #include "HitManagement/AtlasHitsVector.h"
 #include "HitManagement/AthenaHitsVector.h"
-
-#ifndef __CINT__
-  #include "CLIDSvc/CLASS_DEF.h"
-#endif
+#include "AthenaKernel/CLASS_DEF.h"
 
 typedef AthenaHitsVector<TGCSimHit> TGCOldSimHitCollection;
 
@@ -19,9 +16,7 @@ typedef AtlasHitsVector<TGCSimHit> TGCSimHitCollection;
 typedef AtlasHitsVector<TGCSimHit>::iterator TGCSimHitIterator;
 typedef AtlasHitsVector<TGCSimHit>::const_iterator TGCSimHitConstIterator;
 
-#ifndef __CINT__
 CLASS_DEF (TGCSimHitCollection, 4052, 1)
 CLASS_DEF (TGCOldSimHitCollection, 1275808031, 1)
-#endif
 
 #endif

MuonSpectrometer/MuonSimEvent/MuonSimEvent/sTGCSimHitCollection.h

@@ -8,10 +8,7 @@
 #include "MuonSimEvent/sTGCSimHit.h"
 #include "HitManagement/AtlasHitsVector.h"
 #include "HitManagement/AthenaHitsVector.h"
-
-#ifndef __CINT__
-  #include "CLIDSvc/CLASS_DEF.h"
-#endif
+#include "AthenaKernel/CLASS_DEF.h"
 
 typedef AthenaHitsVector<sTGCSimHit> OldsTGCSimHitCollection;
 
@@ -19,10 +16,8 @@ typedef AtlasHitsVector<sTGCSimHit> sTGCSimHitCollection;
 typedef AtlasHitsVector<sTGCSimHit>::iterator sTGCSimHitIterator;
 typedef AtlasHitsVector<sTGCSimHit>::const_iterator sTGCSimHitConstIterator;
 
-#ifndef __CINT__
 CLASS_DEF( sTGCSimHitCollection , 20180530 , 1 )
 CLASS_DEF( OldsTGCSimHitCollection , 20180529 , 1 )
-#endif
 
 #endif