AsgExternal/Asg_Test/cmake/Asg_TestEnvironmentConfig.cmake.in

@@ -6,9 +6,18 @@
 # 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 ASG_TEST_FILE_DATA         @ASG_TEST_FILE_DATA@
+   FORCESET ASG_TEST_FILE_MC           @ASG_TEST_FILE_MC@
+   FORCESET ASG_TEST_FILE_MC_FASTSIM   @ASG_TEST_FILE_MC_FASTSIM@
+   FORCESET ASG_TEST_FILE_LITE_DATA    @ASG_TEST_FILE_LITE_DATA@
+   FORCESET ASG_TEST_FILE_LITE_MC      @ASG_TEST_FILE_LITE_MC@
+   FORCESET ASG_TEST_FILE_LITE_MC_FASTSIM @ASG_TEST_FILE_LITE_MC_FASTSIM@
+   FORCESET ASG_TEST_FILE_RUN3_DATA    @ASG_TEST_FILE_RUN3_DATA@
+   FORCESET ASG_TEST_FILE_RUN3_MC      @ASG_TEST_FILE_RUN3_MC@
+   FORCESET ASG_TEST_FILE_RUN3_MC_FASTSIM   @ASG_TEST_FILE_RUN3_MC_FASTSIM@
+   FORCESET ASG_TEST_FILE_LITE_RUN3_DATA    @ASG_TEST_FILE_LITE_RUN3_DATA@
+   FORCESET ASG_TEST_FILE_LITE_RUN3_MC      @ASG_TEST_FILE_LITE_RUN3_MC@
+   FORCESET ASG_TEST_FILE_LITE_RUN3_MC_FASTSIM  @ASG_TEST_FILE_LITE_RUN3_MC_FASTSIM@
    FORCESET ROOTCORE_TEST_FILE @ROOTCORE_TEST_FILE@
    FORCESET ROOTCORE_TEST_DATA @ROOTCORE_TEST_DATA@ )
 

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
+/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/ASG/DAOD_PHYS/p6479/data18_13TeV.00348885.physics_Main.deriv.DAOD_PHYS.r13286_p4910_p6479/DAOD_PHYS.41578717._000168.pool.root.1

AsgExternal/Asg_Test/cmt/TestFileLiteData.txt

+/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/ASG/DAOD_PHYSLITE/p6479/data18_13TeV.00348885.physics_Main.deriv.DAOD_PHYSLITE.r13286_p4910_p6479/DAOD_PHYSLITE.41578717._000256.pool.root.1

AsgExternal/Asg_Test/cmt/TestFileLiteMC.txt

+/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/ASG/DAOD_PHYSLITE/p6490/mc20_13TeV.410470.PhPy8EG_A14_ttbar_hdamp258p75_nonallhad.deriv.DAOD_PHYSLITE.e6337_s3681_r13167_r13146_p6490/DAOD_PHYSLITE.41651753._000007.pool.root.1

AsgExternal/Asg_Test/cmt/TestFileLiteMCFastSim.txt

+/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/ASG/DAOD_PHYSLITE/p6490/mc20_13TeV.410470.PhPy8EG_A14_ttbar_hdamp258p75_nonallhad.deriv.DAOD_PHYSLITE.e6337_e5984_a907_r14861_r14919_p6490/DAOD_PHYSLITE.41651843._000008.pool.root.1

AsgExternal/Asg_Test/cmt/TestFileLiteR3Data.txt

+/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/ASG/DAOD_PHYSLITE/p6482/data23_13p6TeV.00456749.physics_Main.deriv.DAOD_PHYSLITE.r15774_p6304_p6482/DAOD_PHYSLITE.41588921._000002.pool.root.1

AsgExternal/Asg_Test/cmt/TestFileLiteR3MC.txt

+/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/ASG/DAOD_PHYSLITE/p6491/mc23_13p6TeV.601229.PhPy8EG_A14_ttbar_hdamp258p75_SingleLep.deriv.DAOD_PHYSLITE.e8514_e8528_s4162_s4114_r15540_r15516_p6491/DAOD_PHYSLITE.41633384._000941.pool.root.1

AsgExternal/Asg_Test/cmt/TestFileLiteR3MCFastSim.txt

+/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/ASG/DAOD_PHYSLITE/p6491/mc23_13p6TeV.522036.aMCPy8EG_NNPDF30NLO_A14N23LO_ttZqq_run3.deriv.DAOD_PHYSLITE.e8558_e8528_a911_s4114_r15224_r15225_p6491/DAOD_PHYSLITE.41633196._000004.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
+/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/ASG/DAOD_PHYS/p6490/mc20_13TeV.410470.PhPy8EG_A14_ttbar_hdamp258p75_nonallhad.deriv.DAOD_PHYS.e6337_s3681_r13167_r13146_p6490/DAOD_PHYS.41651753._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/TestFileMCFastSim.txt

+/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/ASG/DAOD_PHYS/p6490/mc20_13TeV.410470.PhPy8EG_A14_ttbar_hdamp258p75_nonallhad.deriv.DAOD_PHYS.e6337_e5984_a907_r14861_r14919_p6490/DAOD_PHYS.41651843._000006.pool.root.1

AsgExternal/Asg_Test/cmt/TestFileR3Data.txt

+/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/ASG/DAOD_PHYS/p6482/data23_13p6TeV.00456749.physics_Main.deriv.DAOD_PHYS.r15774_p6304_p6482/DAOD_PHYS.41588921._000003.pool.root.1

AsgExternal/Asg_Test/cmt/TestFileR3MC.txt

+/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/ASG/DAOD_PHYS/p6491/mc23_13p6TeV.601229.PhPy8EG_A14_ttbar_hdamp258p75_SingleLep.deriv.DAOD_PHYS.e8514_e8528_s4162_s4114_r15540_r15516_p6491/DAOD_PHYS.41633384._000880.pool.root.1

AsgExternal/Asg_Test/cmt/TestFileR3MCFastSim.txt

+/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/ASG/DAOD_PHYS/p6491/mc23_13p6TeV.522036.aMCPy8EG_NNPDF30NLO_A14N23LO_ttZqq_run3.deriv.DAOD_PHYS.e8558_e8528_a911_s4114_r15224_r15225_p6491/DAOD_PHYS.41633196._000006.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/ATLAS_CHECK_THREAD_SAFETY

+AtlasGeometryCommon/BeamPipeGeoModel

AtlasGeometryCommon/BeamPipeGeoModel/BeamPipeGeoModel/BeamPipeDetectorManager.h

 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 */
 
-#ifndef BeamPipeDetectorManager_h
-#define BeamPipeDetectorManager_h 1
+#ifndef BEAMPIPEGEOMODEL_BEAMPIPEDETECTORMANAGER_H
+#define BEAMPIPEGEOMODEL_BEAMPIPEDETECTORMANAGER_H
 
 #include "GeoModelKernel/GeoVPhysVol.h"
 #include "GeoModelKernel/GeoVDetectorManager.h"
@@ -27,15 +27,14 @@ class BeamPipeDetectorManager : public GeoVDetectorManager
   virtual PVConstLink getTreeTop(unsigned int i) const;
 
   // Add a Tree top:
-  void addTreeTop(PVLink);
+  void addTreeTop(const PVConstLink&);
 
  private:  
 
   const BeamPipeDetectorManager & operator=(const BeamPipeDetectorManager &right);
   BeamPipeDetectorManager(const BeamPipeDetectorManager &right);
   
-  std::vector<PVLink> m_volume;  
-
+  std::vector<PVConstLink> m_volume;  
 };
 
 #ifndef GAUDI_NEUTRAL

AtlasGeometryCommon/BeamPipeGeoModel/CMakeLists.txt

-################################################################################
-# Package: BeamPipeGeoModel
-################################################################################
+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( BeamPipeGeoModel )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Database/RDBAccessSvc
-                          DetectorDescription/GeoModel/GeoModelUtilities
-                          PRIVATE
-                          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 )
+find_package( GeoModel COMPONENTS GeoModelKernel )
 
 # 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} ${GEOMODEL_LIBRARIES} GeoModelUtilities StoreGateLib 
-                   PRIVATE_LINK_LIBRARIES SGTools AthenaKernel GaudiKernel )
+		   INCLUDE_DIRS ${GEOMODEL_INCLUDE_DIRS}
+                   LINK_LIBRARIES ${GEOMODEL_LIBRARIES} AthenaKernel GeoModelUtilities
+                   PRIVATE_LINK_LIBRARIES GaudiKernel GeoModelInterfaces RDBAccessSvcLib SGTools StoreGateLib )
 
 atlas_add_component( BeamPipeGeoModel
                      src/components/*.cxx
-                     INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS}
-                     LINK_LIBRARIES ${Boost_LIBRARIES} ${CORAL_LIBRARIES} ${GEOMODEL_LIBRARIES} GeoModelUtilities SGTools StoreGateLib GaudiKernel BeamPipeGeoModelLib )
+                     LINK_LIBRARIES BeamPipeGeoModelLib )
 
+# Test(s) in the package:
 atlas_add_test( BeamPipeGMConfig_test
                 SCRIPT test/BeamPipeGMConfig_test.py
-                PROPERTIES TIMEOUT 300 )
+                POST_EXEC_SCRIPT nopost.sh )
 
 # Install files from the package:
-atlas_install_python_modules( python/*.py )
-atlas_install_scripts( test/*.py )
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
+atlas_install_scripts( test/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )

AtlasGeometryCommon/BeamPipeGeoModel/python/BeamPipeGMConfig.py

 # Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
-from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
 from AtlasGeoModel.GeoModelConfig import GeoModelCfg
+from AthenaConfiguration.ComponentFactory import CompFactory
 
 def BeamPipeGeometryCfg(flags):
-    result,gms=GeoModelCfg(flags)
-    from BeamPipeGeoModel.BeamPipeGeoModelConf import BeamPipeDetectorTool
-    gms.DetectorTools += [ BeamPipeDetectorTool() ]
-    result.addService(gms)
+    result=GeoModelCfg(flags)
+    BeamPipeDetectorTool=CompFactory.BeamPipeDetectorTool
+    result.getPrimary().DetectorTools += [ BeamPipeDetectorTool() ]
     return result