.gitignore

+# Ignore the most common extra files that can
+# be produced while developing
+*~
+*.sw?
+#*
+.DS_Store
+.pydevproject
+.project
+*.pyc
+.asetup*
+.cproject
+*.kdevelop
+#Binary formats
+*.so*
+*.out
+*.exe*
+*.a
+*.la
+*.lib
+*.root
+tmp.*

AsgExternal/Asg_Test/CMakeLists.txt

+# $Id: CMakeLists.txt 782126 2016-11-03 13:55:04Z krasznaa $
+
+# The name of the package:
+atlas_subdir( Asg_Test )
+
+# Read in the settings of the package from the files under cmt/:
+file( READ ${CMAKE_CURRENT_SOURCE_DIR}/cmt/ReleaseSeries.txt
+   ROOTCORE_RELEASE_SERIES )
+string( STRIP "${ROOTCORE_RELEASE_SERIES}" ROOTCORE_RELEASE_SERIES )
+file( READ ${CMAKE_CURRENT_SOURCE_DIR}/cmt/TestFileData.txt
+   ASG_TEST_FILE_DATA )
+string( STRIP "${ASG_TEST_FILE_DATA}" ASG_TEST_FILE_DATA )
+file( READ ${CMAKE_CURRENT_SOURCE_DIR}/cmt/TestFileMC.txt
+   ASG_TEST_FILE_MC )
+string( STRIP "${ASG_TEST_FILE_MC}" ASG_TEST_FILE_MC )
+file( READ ${CMAKE_CURRENT_SOURCE_DIR}/cmt/TestFileMCAFII.txt
+   ASG_TEST_FILE_MC_AFII )
+string( STRIP "${ASG_TEST_FILE_MC_AFII}" ASG_TEST_FILE_MC_AFII )
+set( ROOTCORE_TEST_FILE ${ASG_TEST_FILE_MC} )
+get_filename_component( ROOTCORE_TEST_DATA ${ROOTCORE_TEST_FILE} PATH )
+
+# Create the CMake file that will be used to generate the environment config:
+configure_file( 
+   ${CMAKE_CURRENT_SOURCE_DIR}/cmake/Asg_TestEnvironmentConfig.cmake.in
+   ${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/Asg_TestEnvironmentConfig.cmake
+   @ONLY )
+set( Asg_TestEnvironment_DIR
+   ${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}
+   CACHE PATH "Location of Asg_TestEnvironmentConfig.cmake" FORCE )
+
+# Now find it:
+find_package( Asg_TestEnvironment )

AsgExternal/Asg_Test/cmake/Asg_TestEnvironmentConfig.cmake.in

+# $Id: Asg_TestEnvironmentConfig.cmake.in 782126 2016-11-03 13:55:04Z krasznaa $
+#
+# File configuring the ASG environment variables.
+#
+
+# Set the environment variables:
+set( ASG_TESTENVIRONMENT_ENVIRONMENT
+   FORCESET ROOTCORE_RELEASE_SERIES @ROOTCORE_RELEASE_SERIES@
+   FORCESET ASG_TEST_FILE_DATA    @ASG_TEST_FILE_DATA@
+   FORCESET ASG_TEST_FILE_MC      @ASG_TEST_FILE_MC@
+   FORCESET ASG_TEST_FILE_MC_AFII @ASG_TEST_FILE_MC_AFII@
+   FORCESET ROOTCORE_TEST_FILE @ROOTCORE_TEST_FILE@
+   FORCESET ROOTCORE_TEST_DATA @ROOTCORE_TEST_DATA@ )
+
+# Signal that the module was found:
+set( ASG_TESTENVIRONMENT_FOUND TRUE )

AsgExternal/Asg_Test/cmt/ReleaseSeries.txt

+25

AsgExternal/Asg_Test/cmt/TestFileData.txt

+/afs/cern.ch/atlas/project/PAT/xAODs/r9264/data16_13TeV.00311321.physics_Main.recon.AOD.r9264/AOD.11038520._000001.pool.root.1

AsgExternal/Asg_Test/cmt/TestFileMC.txt

+/afs/cern.ch/atlas/project/PAT/xAODs/r9315/mc16_13TeV.410501.PowhegPythia8EvtGen_A14_ttbar_hdamp258p75_nonallhad.merge.AOD.e5458_s3126_r9364_r9315/AOD.11182705._000001.pool.root.1

AsgExternal/Asg_Test/cmt/TestFileMCAFII.txt

+/afs/cern.ch/user/a/asgbase/patspace/xAODs/a818/mc15_13TeV.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.merge.AOD.e3698_a766_a818_r7676/AOD.07919492._000100.pool.root.1

AsgExternal/Asg_Test/cmt/setup_external.RootCore.csh

+Asg_Test_Dir=`dirname $1`
+setenv ROOTCORE_RELEASE_SERIES `cat $Asg_Test_Dir/ReleaseSeries.txt`
+setenv ASG_TEST_FILE_DATA `cat $Asg_Test_Dir/TestFileData.txt`
+setenv ASG_TEST_FILE_MC `cat $Asg_Test_Dir/TestFileMC.txt`
+setenv ASG_TEST_FILE_MC_AFII `cat $Asg_Test_Dir/TestFileMCAFII.txt`
+setenv ROOTCORE_TEST_FILE `cat $Asg_Test_Dir/TestFileMC.txt`
+setenv ROOTCORE_TEST_DATA "`dirname $ROOTCORE_TEST_FILE | xargs dirname`"

AsgExternal/Asg_Test/cmt/setup_external.RootCore.sh

+Asg_Test_Dir=`dirname $1`
+export ROOTCORE_RELEASE_SERIES=`cat $Asg_Test_Dir/ReleaseSeries.txt`
+export ASG_TEST_FILE_DATA=`cat $Asg_Test_Dir/TestFileData.txt`
+export ASG_TEST_FILE_MC=`cat $Asg_Test_Dir/TestFileMC.txt`
+export ASG_TEST_FILE_MC_AFII=`cat $Asg_Test_Dir/TestFileMCAFII.txt`
+export ROOTCORE_TEST_FILE=`cat $Asg_Test_Dir/TestFileMC.txt`
+export ROOTCORE_TEST_DATA="`dirname $ROOTCORE_TEST_FILE | xargs dirname`"

AtlasGeometryCommon/BeamPipeGeoModel/BeamPipeGeoModel/BeamPipeDetectorManager.h

@@ -39,7 +39,7 @@ class BeamPipeDetectorManager : public GeoVDetectorManager
 };
 
 #ifndef GAUDI_NEUTRAL
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
 CLASS_DEF(BeamPipeDetectorManager, 119561103, 1)
 #endif
 

AtlasGeometryCommon/BeamPipeGeoModel/CMakeLists.txt

@@ -7,30 +7,30 @@ atlas_subdir( BeamPipeGeoModel )
 
 # Declare the package's dependencies:
 atlas_depends_on_subdirs( PUBLIC
-                          Database/AthenaPOOL/RDBAccessSvc
-                          DetectorDescription/GeoModel/GeoModelKernel
+                          Database/RDBAccessSvc
                           DetectorDescription/GeoModel/GeoModelUtilities
                           PRIVATE
-                          Control/CLIDSvc
                           Control/SGTools
                           Control/StoreGate
+                          Control/AthenaKernel
                           DetectorDescription/GeoModel/GeoModelInterfaces
                           GaudiKernel )
 
 # External dependencies:
 find_package( Boost COMPONENTS filesystem thread system )
 find_package( CORAL COMPONENTS CoralBase CoralKernel RelationalAccess )
+find_package( GeoModel )
 
 # Component(s) in the package:
 atlas_add_library( BeamPipeGeoModelLib
                    src/*.cxx
                    PUBLIC_HEADERS BeamPipeGeoModel
-                   INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS}
-                   LINK_LIBRARIES ${Boost_LIBRARIES} ${CORAL_LIBRARIES} GeoModelKernel GeoModelUtilities StoreGateLib SGtests
-                   PRIVATE_LINK_LIBRARIES SGTools GaudiKernel )
+                   INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS} 
+                   LINK_LIBRARIES ${Boost_LIBRARIES} ${CORAL_LIBRARIES} ${GEOMODEL_LIBRARIES} GeoModelUtilities StoreGateLib 
+                   PRIVATE_LINK_LIBRARIES SGTools AthenaKernel GaudiKernel )
 
 atlas_add_component( BeamPipeGeoModel
                      src/components/*.cxx
                      INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS}
-                     LINK_LIBRARIES ${Boost_LIBRARIES} ${CORAL_LIBRARIES} GeoModelKernel GeoModelUtilities SGTools StoreGateLib SGtests GaudiKernel BeamPipeGeoModelLib )
+                     LINK_LIBRARIES ${Boost_LIBRARIES} ${CORAL_LIBRARIES} ${GEOMODEL_LIBRARIES} GeoModelUtilities SGTools StoreGateLib GaudiKernel BeamPipeGeoModelLib )
 

AtlasGeometryCommon/BeamPipeGeoModel/cmt/requirements

-package BeamPipeGeoModel
-
-use AtlasPolicy       AtlasPolicy-*
-use GeoModelKernel    GeoModelKernel-*    DetectorDescription/GeoModel
-use GeoModelUtilities GeoModelUtilities-* DetectorDescription/GeoModel
-use RDBAccessSvc      RDBAccessSvc-*      Database/AthenaPOOL
-use CLIDSvc           CLIDSvc-*           Control
-
-library BeamPipeGeoModel
-apply_pattern dual_use_library files=*.cxx
-
-private
-use CLIDSvc              CLIDSvc-*           Control
-use SGTools              SGTools-*           Control
-use StoreGate            StoreGate-*         Control
-use GaudiInterface       GaudiInterface-*    External
-use GeoModelInterfaces   GeoModelInterfaces-* DetectorDescription/GeoModel
\ No newline at end of file

AtlasGeometryCommon/BeamPipeGeoModel/src/BeamPipeDetectorFactory.cxx

@@ -2,7 +2,7 @@
   Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 */
 
-#include "BeamPipeGeoModel/BeamPipeDetectorFactory.h"
+#include "BeamPipeDetectorFactory.h"
 
 
 #include "GeoModelInterfaces/AbsMaterialManager.h"
@@ -15,6 +15,8 @@
 #include "GeoModelKernel/GeoPhysVol.h"  
 #include "GeoModelKernel/GeoFullPhysVol.h"  
 #include "GeoModelKernel/GeoTransform.h"  
+#include "GeoModelKernel/GeoDefinitions.h"  
+#include "GeoModelKernel/Units.h"  
 
 #include "StoreGate/StoreGateSvc.h"
 
@@ -25,6 +27,9 @@
 #include "RDBAccessSvc/IRDBRecordset.h"
 #include "RDBAccessSvc/IRDBAccessSvc.h"
 
+#include "AthenaKernel/getMessageSvc.h"
+#include "GaudiKernel/MsgStream.h"
+
 #include <iomanip>
 #include <vector>
 
@@ -35,7 +40,7 @@ BeamPipeDetectorFactory::BeamPipeDetectorFactory(StoreGateSvc *detStore,
    m_materialManager(0),
    m_detectorStore(detStore),
    m_access(pAccess),
-   m_centralRegionZMax(1500*CLHEP::mm)
+   m_centralRegionZMax(1500*GeoModelKernelUnits::mm)
 {}
 
 BeamPipeDetectorFactory::~BeamPipeDetectorFactory()
@@ -64,8 +69,8 @@ void BeamPipeDetectorFactory::create(GeoPhysVol *world)
   // It is split into 3 sections. 
   // left, right and central. This is to allow different truth scoring in the different regions.
   
-  m_centralRegionZMax = 1500 * CLHEP::mm; // For backward compatibility in DB.
-  if (bpipeGeneral->size() != 0) m_centralRegionZMax = (*bpipeGeneral)[0]->getDouble("CENTRALZMAX") * CLHEP::mm;
+  m_centralRegionZMax = 1500 * GeoModelKernelUnits::mm; // For backward compatibility in DB.
+  if (bpipeGeneral->size() != 0) m_centralRegionZMax = (*bpipeGeneral)[0]->getDouble("CENTRALZMAX") * GeoModelKernelUnits::mm;
 
   EnvelopeShapes envelopes;
 
@@ -99,16 +104,16 @@ void BeamPipeDetectorFactory::create(GeoPhysVol *world)
   double beamy = 0.0;
   double beamz = 0.0;
   if (bpipePosition->size() != 0) {
-    beamx = (*bpipePosition)[0]->getDouble("POSX") * CLHEP::mm;
-    beamy = (*bpipePosition)[0]->getDouble("POSY") * CLHEP::mm;
-    beamz = (*bpipePosition)[0]->getDouble("POSZ") * CLHEP::mm;
+    beamx = (*bpipePosition)[0]->getDouble("POSX") * GeoModelKernelUnits::mm;
+    beamy = (*bpipePosition)[0]->getDouble("POSY") * GeoModelKernelUnits::mm;
+    beamz = (*bpipePosition)[0]->getDouble("POSZ") * GeoModelKernelUnits::mm;
   }
 
   // Only shift the central section
 
   // Central
   world->add(tag);
-  world->add(new GeoTransform(HepGeom::Translate3D(beamx,beamy,beamz)));
+  world->add(new GeoTransform(GeoTrf::Translate3D(beamx,beamy,beamz)));
   world->add(pvMotherCentral);
   m_detectorManager->addTreeTop(pvMotherCentral);                                                                  //
 
@@ -119,7 +124,7 @@ void BeamPipeDetectorFactory::create(GeoPhysVol *world)
 
   // FwdMinus
   world->add(tag);
-  world->add(new GeoTransform(HepGeom::RotateY3D(180*CLHEP::degree)));
+  world->add(new GeoTransform(GeoTrf::RotateY3D(180*GeoModelKernelUnits::degree)));
   world->add(pvMotherFwdMinus);
   m_detectorManager->addTreeTop(pvMotherFwdMinus);
 
@@ -145,12 +150,12 @@ void BeamPipeDetectorFactory::addSections(GeoPhysVol* parent, int region)
   for (unsigned int itemp=0; itemp<bpipeSections->size(); itemp++)
   {
     std::string material = (*bpipeSections)[itemp]->getString("MATERIAL");
-    double rMin1 = (*bpipeSections)[itemp]->getDouble("RMIN1") * CLHEP::mm;
-    double rMax1 = (*bpipeSections)[itemp]->getDouble("RMAX1") * CLHEP::mm;
-    double rMin2 = (*bpipeSections)[itemp]->getDouble("RMIN2") * CLHEP::mm;
-    double rMax2 = (*bpipeSections)[itemp]->getDouble("RMAX2") * CLHEP::mm;
-    double z = (*bpipeSections)[itemp]->getDouble("Z") * CLHEP::mm;
-    double dZ = (*bpipeSections)[itemp]->getDouble("DZ") * CLHEP::mm;
+    double rMin1 = (*bpipeSections)[itemp]->getDouble("RMIN1") * GeoModelKernelUnits::mm;
+    double rMax1 = (*bpipeSections)[itemp]->getDouble("RMAX1") * GeoModelKernelUnits::mm;
+    double rMin2 = (*bpipeSections)[itemp]->getDouble("RMIN2") * GeoModelKernelUnits::mm;
+    double rMax2 = (*bpipeSections)[itemp]->getDouble("RMAX2") * GeoModelKernelUnits::mm;
+    double z = (*bpipeSections)[itemp]->getDouble("Z") * GeoModelKernelUnits::mm;
+    double dZ = (*bpipeSections)[itemp]->getDouble("DZ") * GeoModelKernelUnits::mm;
     int secNum = (*bpipeSections)[itemp]->getInt("SECNUM");
       
     double zmin = z - dZ;
@@ -201,7 +206,7 @@ void BeamPipeDetectorFactory::addSections(GeoPhysVol* parent, int region)
       shape = new GeoCons(rMin1,rMin2,
 			  rMax1,rMax2,
 			  dZnew,
-			  0*CLHEP::deg,360*CLHEP::deg);
+			  0*GeoModelKernelUnits::deg,360*GeoModelKernelUnits::deg);
       isTube = false;
     }
 
@@ -215,9 +220,10 @@ void BeamPipeDetectorFactory::addSections(GeoPhysVol* parent, int region)
 
     GeoLogVol* lvSection = new GeoLogVol(name,shape,mat);
     GeoPhysVol* pvSection = new GeoPhysVol(lvSection);
+    pvSection->ref();
     
     // Determine if this is a geometry where the first section can act as the mother of the following
-    // sections. The following sections are only added to this if their ave CLHEP::radius is within the CLHEP::radial
+    // sections. The following sections are only added to this if their ave GeoModelKernelUnits::radius is within the GeoModelKernelUnits::radial
     // extent and their ave z is within the z extent. 
     // As soon as one section fails to meet this the latter sections are not considered.
     if(secNum==1) {
@@ -236,16 +242,20 @@ void BeamPipeDetectorFactory::addSections(GeoPhysVol* parent, int region)
 	     
 
     GeoTransform* tfSection = 0;
-    if (znew != 0 && (secNum==1 || !addToFirstSection)) tfSection = new GeoTransform(HepGeom::TranslateZ3D(znew));
+    if (znew != 0 && (secNum==1 || !addToFirstSection)) tfSection = new GeoTransform(GeoTrf::TranslateZ3D(znew));
     GeoNameTag* ntSection = new GeoNameTag(name);
+    ntSection->ref();
 
     if (addToFirstSection && secNum!=1) {
       if (!pvMotherSection) {
-	std::cout << "Unexpected condition when building beam pipe." << std::endl;
+        MsgStream gLog(Athena::getMessageSvc(), "BeamPipeDetectorFactory");
+        gLog << MSG::ERROR << "Logic error building beam pipe." << endmsg;
+      }
+      else {
+        //std::cout << "Placing section " << secNum << " in Section1" << std::endl;
+        pvMotherSection->add(ntSection);
+        pvMotherSection->add(pvSection);
       }
-      //std::cout << "Placing section " << secNum << " in Section1" << std::endl;
-      pvMotherSection->add(ntSection);
-      pvMotherSection->add(pvSection);
     } else {
       //std::cout << "Placing section " << secNum << " in mother envelope" << std::endl;
       parent->add(ntSection);
@@ -259,16 +269,19 @@ void BeamPipeDetectorFactory::addSections(GeoPhysVol* parent, int region)
       GeoTransform* tfSectionRot = 0;
       if (isTube) { 
 	// No need for rotation.
-	tfSectionRot = new GeoTransform(HepGeom::TranslateZ3D(-znew));
+	tfSectionRot = new GeoTransform(GeoTrf::TranslateZ3D(-znew));
       } else {
 	// For cone we need to rotate around Y axis.
-	tfSectionRot = new GeoTransform(HepGeom::TranslateZ3D(-znew)*HepGeom::RotateY3D(180*CLHEP::deg));
+	tfSectionRot = new GeoTransform(GeoTrf::TranslateZ3D(-znew)*GeoTrf::RotateY3D(180*GeoModelKernelUnits::deg));
       }
       parent->add(ntSection);
       parent->add(tfSectionRot);
       parent->add(pvSection);
     }
-  }  
+
+    pvSection->unref();
+    ntSection->unref();
+  }
 }
 
 const BeamPipeDetectorManager * BeamPipeDetectorFactory::getDetectorManager() const
@@ -292,8 +305,8 @@ BeamPipeDetectorFactory::makeEnvelope(IRDBRecordset_ptr bpipeEnvelope)
   std::vector<EnvelopeEntry> fwdEntry;
 
   for (unsigned int i=0; i<bpipeEnvelope->size(); i++) {
-    double z = (*bpipeEnvelope)[i]->getDouble("Z") * CLHEP::mm;
-    double r = (*bpipeEnvelope)[i]->getDouble("R") * CLHEP::mm;
+    double z = (*bpipeEnvelope)[i]->getDouble("Z") * GeoModelKernelUnits::mm;
+    double r = (*bpipeEnvelope)[i]->getDouble("R") * GeoModelKernelUnits::mm;
     EnvelopeEntry entry(z,r);
     if (z < m_centralRegionZMax) {
       centralEntry.push_back(entry);
@@ -316,7 +329,7 @@ BeamPipeDetectorFactory::makeEnvelope(IRDBRecordset_ptr bpipeEnvelope)
     envelopes.centralShape  = new GeoTube(0, rFwd, m_centralRegionZMax);
   } else {
     // This case probably will never get used and is untested.
-    GeoPcon* pcone = new GeoPcon(0, 360*CLHEP::deg);
+    GeoPcon* pcone = new GeoPcon(0, 360*GeoModelKernelUnits::deg);
 
     pcone->addPlane(-m_centralRegionZMax,0,rFwd);
     for (int i=centralEntry.size()-1; i>=0; i--) {  
@@ -336,12 +349,12 @@ BeamPipeDetectorFactory::makeEnvelope(IRDBRecordset_ptr bpipeEnvelope)
   
   // forward
   {
-    GeoPcon* pcone = new GeoPcon(0, 360*CLHEP::deg);
+    GeoPcon* pcone = new GeoPcon(0, 360*GeoModelKernelUnits::deg);
     pcone->addPlane(m_centralRegionZMax,0,rFwd);
     if (fwdEntry.size() == 0) { 
       // Unlikely case but for completeness
       // we make small fwd region if everything is in central region.
-      pcone->addPlane(m_centralRegionZMax+0.1*CLHEP::mm,0,rFwd);
+      pcone->addPlane(m_centralRegionZMax+0.1*GeoModelKernelUnits::mm,0,rFwd);
     }
     for (unsigned int i=0; i<fwdEntry.size(); i++) {  
       double z = fwdEntry[i].z();
@@ -360,12 +373,12 @@ BeamPipeDetectorFactory::EnvelopeShapes
 BeamPipeDetectorFactory::makeEnvelopeOld(IRDBRecordset_ptr atlasMother)
 {
 
-  double iir = (*atlasMother)[0]->getDouble("IDETIR")*CLHEP::cm;
-  double cir = (*atlasMother)[0]->getDouble("CALOIR")*CLHEP::cm;
-  double mir = (*atlasMother)[0]->getDouble("MUONIR")*CLHEP::cm;
-  double totlen = (*atlasMother)[0]->getDouble("ZMAX")*CLHEP::cm;
-  double ilen = (*atlasMother)[0]->getDouble("IDETZMX")*CLHEP::cm;
-  double clen = (*atlasMother)[0]->getDouble("CALOZMX")*CLHEP::cm;
+  double iir = (*atlasMother)[0]->getDouble("IDETIR")*GeoModelKernelUnits::cm;
+  double cir = (*atlasMother)[0]->getDouble("CALOIR")*GeoModelKernelUnits::cm;
+  double mir = (*atlasMother)[0]->getDouble("MUONIR")*GeoModelKernelUnits::cm;
+  double totlen = (*atlasMother)[0]->getDouble("ZMAX")*GeoModelKernelUnits::cm;
+  double ilen = (*atlasMother)[0]->getDouble("IDETZMX")*GeoModelKernelUnits::cm;
+  double clen = (*atlasMother)[0]->getDouble("CALOZMX")*GeoModelKernelUnits::cm;
 
   // Central Section.
   GeoTube * bpipeCentralShape = new GeoTube(0, iir, m_centralRegionZMax);
@@ -375,7 +388,7 @@ BeamPipeDetectorFactory::makeEnvelopeOld(IRDBRecordset_ptr atlasMother)
 
   // Right section (+ve z)
 
-  GeoPcon* bpipeEnvPcone = new GeoPcon(0, 360*CLHEP::deg);
+  GeoPcon* bpipeEnvPcone = new GeoPcon(0, 360*GeoModelKernelUnits::deg);
   bpipeEnvPcone->addPlane(m_centralRegionZMax,0,iir);
   bpipeEnvPcone->addPlane(ilen,0,iir);
   bpipeEnvPcone->addPlane(ilen,0,cir); 

AtlasGeometryCommon/BeamPipeGeoModel/BeamPipeGeoModel/BeamPipeDetectorFactory.h → AtlasGeometryCommon/BeamPipeGeoModel/src/BeamPipeDetectorFactory.h

@@ -19,7 +19,7 @@ class BeamPipeDetectorFactory : public GeoVDetectorFactory
  public:
   
   // Constructor:
-  BeamPipeDetectorFactory(StoreGateSvc *pDetStore,
+  BeamPipeDetectorFactory(StoreGateSvc  *pDetStore,
 			  IRDBAccessSvc *pAccess);
   
   // Destructor:

AtlasGeometryCommon/BeamPipeGeoModel/src/BeamPipeDetectorTool.cxx

@@ -2,11 +2,11 @@
   Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 */
 
-#include "BeamPipeGeoModel/BeamPipeDetectorTool.h"
-#include "BeamPipeGeoModel/BeamPipeDetectorFactory.h" 
+#include "BeamPipeDetectorTool.h"
+#include "BeamPipeDetectorFactory.h" 
 #include "BeamPipeGeoModel/BeamPipeDetectorManager.h" 
 
-#include "GeoModelInterfaces/IGeoModelSvc.h"
+#include "GeoModelInterfaces/IGeoDbTagSvc.h"
 #include "GeoModelUtilities/GeoModelExperiment.h"
 #include "GaudiKernel/IService.h"
 #include "GaudiKernel/ISvcLocator.h"
@@ -15,7 +15,7 @@
 #include "StoreGate/StoreGateSvc.h"
 
 #include "RDBAccessSvc/IRDBAccessSvc.h"
-#include "CLIDSvc/tools/ClassID_traits.h"
+#include "AthenaKernel/ClassID_traits.h"
 #include "SGTools/DataProxy.h"
 
 BeamPipeDetectorTool::BeamPipeDetectorTool( const std::string& type, 
@@ -31,30 +31,30 @@ BeamPipeDetectorTool::~BeamPipeDetectorTool()
 }
 
 
-StatusCode BeamPipeDetectorTool::create( StoreGateSvc* detStore )
+StatusCode BeamPipeDetectorTool::create()
 { 
   MsgStream log(msgSvc(), name()); 
 
-  log << MSG::INFO << "Building Beam Pipe" << endreq;
+  log << MSG::INFO << "Building Beam Pipe" << endmsg;
 
-  IGeoModelSvc *geoModel;
-  StatusCode sc = service ("GeoModelSvc",geoModel);
+  IGeoDbTagSvc *geoDbTag;
+  StatusCode sc = service ("GeoDbTagSvc",geoDbTag);
   if (sc.isFailure()) {
-    log << MSG::FATAL << "Could not locate GeoModelSvc" << endreq;
+    log << MSG::FATAL << "Could not locate GeoDbTagSvc" << endmsg;
     return StatusCode::FAILURE;
   }
     
 
-  std::string atlasVersion = geoModel->atlasVersion();
+  std::string atlasVersion = geoDbTag->atlasVersion();
   if(atlasVersion == "AUTO")
     atlasVersion = "ATLAS-00";
   std::string versionNode = "ATLAS";
 
   GeoModelExperiment * theExpt; 
-  if (StatusCode::SUCCESS != detStore->retrieve( theExpt, "ATLAS" )) { 
+  if (StatusCode::SUCCESS != detStore()->retrieve( theExpt, "ATLAS" )) { 
     log << MSG::ERROR 
 	<< "Could not find GeoModelExperiment ATLAS" 
-	<< endreq; 
+	<< endmsg; 
     return (StatusCode::FAILURE); 
   } 
 
@@ -65,34 +65,34 @@ StatusCode BeamPipeDetectorTool::create( StoreGateSvc* detStore )
     IRDBAccessSvc* raccess = 0;
     sc = service("RDBAccessSvc",raccess);
     if (sc.isFailure()) {
-      log << MSG::FATAL << "Could not locate RDBAccessSvc" << endreq;
+      log << MSG::FATAL << "Could not locate RDBAccessSvc" << endmsg;
       return StatusCode::FAILURE;
     }
 
     // Check we have the beampipe and print its version
     // Print the  version tag:
     std::string beampipeVersionTag;
-    beampipeVersionTag = raccess->getChildTag("BeamPipe", atlasVersion,versionNode, false);
-    log << MSG::DEBUG << "Beampipe Version: " << beampipeVersionTag << endreq;
+    beampipeVersionTag = raccess->getChildTag("BeamPipe", atlasVersion,versionNode);
+    log << MSG::DEBUG << "Beampipe Version: " << beampipeVersionTag << endmsg;
 
 
     if (beampipeVersionTag.empty()) { 
-      log << MSG::INFO << "No BeamPipe Version. Beam pipe will not be built." << endreq;
+      log << MSG::INFO << "No BeamPipe Version. Beam pipe will not be built." << endmsg;
       
     } else {
       
-      BeamPipeDetectorFactory theBeamPipeFactory(detStore,raccess);
+      BeamPipeDetectorFactory theBeamPipeFactory(detStore().operator->(),raccess);
       theBeamPipeFactory.setTagNode(atlasVersion,versionNode);
       theBeamPipeFactory.create(world);
 
       m_manager = theBeamPipeFactory.getDetectorManager();
       theExpt->addManager(m_manager);
-      sc = detStore->record(m_manager,
+      sc = detStore()->record(m_manager,
 			    m_manager->getName());
     
 
       if (sc.isFailure()) {
-	log << MSG::ERROR << "Could not register BeamPipe detector manager" << endreq;
+	log << MSG::ERROR << "Could not register BeamPipe detector manager" << endmsg;
 	return (StatusCode::FAILURE); 
       }
     }
@@ -101,11 +101,11 @@ StatusCode BeamPipeDetectorTool::create( StoreGateSvc* detStore )
   return StatusCode::FAILURE;
 }
 
-StatusCode BeamPipeDetectorTool::clear(StoreGateSvc* detStore)
+StatusCode BeamPipeDetectorTool::clear()
 {
-  SG::DataProxy* _proxy = detStore->proxy(ClassID_traits<BeamPipeDetectorManager>::ID(),m_manager->getName());
-  if(_proxy) {
-    _proxy->reset();
+  SG::DataProxy* proxy = detStore()->proxy(ClassID_traits<BeamPipeDetectorManager>::ID(),m_manager->getName());
+  if(proxy) {
+    proxy->reset();
     m_manager = 0;
   }
   return StatusCode::SUCCESS;

AtlasGeometryCommon/BeamPipeGeoModel/BeamPipeGeoModel/BeamPipeDetectorTool.h → AtlasGeometryCommon/BeamPipeGeoModel/src/BeamPipeDetectorTool.h

@@ -16,10 +16,10 @@ class BeamPipeDetectorTool : public GeoModelTool
   BeamPipeDetectorTool( const std::string& type, const std::string& name, const IInterface* parent );
 
   // Standard Destructor
-  virtual ~BeamPipeDetectorTool();
+  virtual ~BeamPipeDetectorTool() override final;
 
-  virtual StatusCode create( StoreGateSvc* detStore );
-  virtual StatusCode clear(StoreGateSvc* detStore);
+  virtual StatusCode create() override final;
+  virtual StatusCode clear() override final;
  private:
   const BeamPipeDetectorManager* m_manager;
 };

AtlasGeometryCommon/BeamPipeGeoModel/src/components/BeamPipeGeoModel_entries.cxx

-#include "BeamPipeGeoModel/BeamPipeDetectorTool.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
+#include "../BeamPipeDetectorTool.h"
 
-DECLARE_TOOL_FACTORY(BeamPipeDetectorTool)
+DECLARE_COMPONENT( BeamPipeDetectorTool )
 
-DECLARE_FACTORY_ENTRIES(BeamPipeGeoModel) {
-    DECLARE_ALGTOOL  ( BeamPipeDetectorTool )
-}

AtlasGeometryCommon/BeamPipeGeoModel/src/components/BeamPipeGeoModel_load.cxx

-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(BeamPipeGeoModel)
-

AtlasGeometryCommon/CavernInfraGeoModel/CMakeLists.txt

@@ -7,10 +7,8 @@ atlas_subdir( CavernInfraGeoModel )
 
 # Declare the package's dependencies:
 atlas_depends_on_subdirs( PUBLIC
-                          Control/CLIDSvc
-                          Control/SGTools
-                          Database/AthenaPOOL/RDBAccessSvc
-                          DetectorDescription/GeoModel/GeoModelKernel
+                          Control/AthenaKernel
+                          Database/RDBAccessSvc
                           DetectorDescription/GeoModel/GeoModelUtilities
                           PRIVATE
                           Control/StoreGate
@@ -19,15 +17,16 @@ atlas_depends_on_subdirs( PUBLIC
 
 # External dependencies:
 find_package( Boost COMPONENTS filesystem thread system )
-find_package( CLHEP )
+find_package( Eigen )
 find_package( CORAL COMPONENTS CoralBase CoralKernel RelationalAccess )
+find_package( GeoModel )
 
 # Component(s) in the package:
 atlas_add_component( CavernInfraGeoModel
                      src/*.cxx
                      src/components/*.cxx
                      INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
-                     LINK_LIBRARIES ${Boost_LIBRARIES} ${CORAL_LIBRARIES} ${CLHEP_LIBRARIES} SGTools GeoModelKernel GeoModelUtilities StoreGateLib SGtests GaudiKernel )
+                     LINK_LIBRARIES ${Boost_LIBRARIES} ${CORAL_LIBRARIES} ${CLHEP_LIBRARIES} ${GEOMODEL_LIBRARIES} GeoModelUtilities StoreGateLib SGtests GaudiKernel )
 
 # Install files from the package:
 atlas_install_headers( CavernInfraGeoModel )

AtlasGeometryCommon/CavernInfraGeoModel/CavernInfraGeoModel/CavernInfraDetectorManager.h

@@ -35,7 +35,7 @@ class CavernInfraDetectorManager : public GeoVDetectorManager
 };
 
 #ifndef GAUDI_NEUTRAL
-#include "CLIDSvc/CLASS_DEF.h" 
+#include "AthenaKernel/CLASS_DEF.h" 
 CLASS_DEF(CavernInfraDetectorManager, 1500000300, 1)
 #endif