.devcontainer/devcontainer.json

@@ -20,8 +20,8 @@
                 "python.linting.flake8Enabled": true,
                 "python.linting.flake8Args": [
                     "--isolated",
-                    "--select=ATL,F,E101,E7,E9,W6",
-                    "--ignore=E701,E702,E704,E741",
+                    "--select=ATL,B,F,E101,E7,E9,W6",
+                    "--ignore=B006,B007,B019,E701,E702,E704,E741",
                     "--enable-extensions=ATL902"
                 ]
             },

.gitignore

@@ -24,3 +24,6 @@
 *.root
 tmp.*
 *.pkl
+.cache
+compile_commands.json
+docs/html/*

.vscode/settings.json

@@ -18,8 +18,8 @@
     ],
     "flake8.args": [
         "--isolated",
-        "--select=ATL,F,E101,E7,E9,W6", // note that equals sign is required by VS Code
-        "--ignore=E701,E702,E704,E741",
+        "--select=ATL,B,F,E101,E7,E9,W6", // note that equals sign is required by VS Code
+        "--ignore=B006,B007,B019,E701,E702,E704,E741",
         "--enable-extensions=ATL902"
     ],
 }

AsgExternal/Asg_Test/CMakeLists.txt

-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 
 # The name of the package:
 atlas_subdir( Asg_Test )
@@ -14,9 +14,9 @@ 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 )
+file( READ ${CMAKE_CURRENT_SOURCE_DIR}/cmt/TestFileMCFastSim.txt
+   ASG_TEST_FILE_MC_FASTSIM )
+string( STRIP "${ASG_TEST_FILE_MC_FASTSIM}" ASG_TEST_FILE_MC_FASTSIM )
 
 file( READ ${CMAKE_CURRENT_SOURCE_DIR}/cmt/TestFileLiteData.txt
    ASG_TEST_FILE_LITE_DATA )
@@ -24,20 +24,29 @@ string( STRIP "${ASG_TEST_FILE_LITE_DATA}" ASG_TEST_FILE_LITE_DATA )
 file( READ ${CMAKE_CURRENT_SOURCE_DIR}/cmt/TestFileLiteMC.txt
    ASG_TEST_FILE_LITE_MC )
 string( STRIP "${ASG_TEST_FILE_LITE_MC}" ASG_TEST_FILE_LITE_MC )
-file( READ ${CMAKE_CURRENT_SOURCE_DIR}/cmt/TestFileLiteMCAFII.txt
-   ASG_TEST_FILE_LITE_MC_AFII )
-string( STRIP "${ASG_TEST_FILE_LITE_MC_AFII}" ASG_TEST_FILE_LITE_MC_AFII )
-
-# currently don't have a full set of Run 3 test input files
-#file( READ ${CMAKE_CURRENT_SOURCE_DIR}/cmt/TestFileR3Data.txt
-#   ASG_TEST_FILE_RUN3_DATA )
-#string( STRIP "${ASG_TEST_FILE_RUN3_DATA}" ASG_TEST_FILE_RUN3_DATA )
+file( READ ${CMAKE_CURRENT_SOURCE_DIR}/cmt/TestFileLiteMCFastSim.txt
+   ASG_TEST_FILE_LITE_MC_FASTSIM )
+string( STRIP "${ASG_TEST_FILE_LITE_MC_FASTSIM}" ASG_TEST_FILE_LITE_MC_FASTSIM )
+
+file( READ ${CMAKE_CURRENT_SOURCE_DIR}/cmt/TestFileR3Data.txt
+   ASG_TEST_FILE_RUN3_DATA )
+string( STRIP "${ASG_TEST_FILE_RUN3_DATA}" ASG_TEST_FILE_RUN3_DATA )
 file( READ ${CMAKE_CURRENT_SOURCE_DIR}/cmt/TestFileR3MC.txt
    ASG_TEST_FILE_RUN3_MC )
 string( STRIP "${ASG_TEST_FILE_RUN3_MC}" ASG_TEST_FILE_RUN3_MC )
-#file( READ ${CMAKE_CURRENT_SOURCE_DIR}/cmt/TestFileR3MCAFII.txt
-#   ASG_TEST_FILE_RUN3_MC_AFII )
-#string( STRIP "${ASG_TEST_FILE_RUN3_MC_AFII}" ASG_TEST_FILE_RUN3_MC_AFII )
+ file( READ ${CMAKE_CURRENT_SOURCE_DIR}/cmt/TestFileR3MCFastSim.txt
+   ASG_TEST_FILE_RUN3_MC_FASTSIM )
+string( STRIP "${ASG_TEST_FILE_RUN3_MC_FASTSIM}" ASG_TEST_FILE_RUN3_MC_FASTSIM )
+
+file( READ ${CMAKE_CURRENT_SOURCE_DIR}/cmt/TestFileLiteR3Data.txt
+   ASG_TEST_FILE_LITE_RUN3_DATA )
+string( STRIP "${ASG_TEST_FILE_LITE_RUN3_DATA}" ASG_TEST_FILE_LITE_RUN3_DATA )
+file( READ ${CMAKE_CURRENT_SOURCE_DIR}/cmt/TestFileLiteR3MC.txt
+   ASG_TEST_FILE_LITE_RUN3_MC )
+string( STRIP "${ASG_TEST_FILE_LITE_RUN3_MC}" ASG_TEST_FILE_LITE_RUN3_MC )
+file( READ ${CMAKE_CURRENT_SOURCE_DIR}/cmt/TestFileLiteR3MCFastSim.txt
+   ASG_TEST_FILE_LITE_RUN3_MC_FASTSIM )
+string( STRIP "${ASG_TEST_FILE_LITE_RUN3_MC_FASTSIM}" ASG_TEST_FILE_LITE_RUN3_MC_FASTSIM )
 
 set( ROOTCORE_TEST_FILE ${ASG_TEST_FILE_MC} )
 

AsgExternal/Asg_Test/cmake/Asg_TestEnvironmentConfig.cmake.in

@@ -8,11 +8,16 @@ 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_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_AFII @ASG_TEST_FILE_LITE_MC_AFII@
+   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

-/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/ASG/DAOD_PHYS/p5169/data18_13TeV.00348885.physics_Main.deriv.DAOD_PHYS.r13286_p4910_p5169/DAOD_PHYS.29445515._000301.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/2023-01-08T2101/data18_13TeV.00357772.physics_Main.deriv.DAOD_PHYSLITE.r13286_p4910_2023-01-08T2101/100events_data18.DAOD_PHYSLITE.pool.root
+/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/2023-01-08T2101/mc20_13TeV.410470.PhPy8EG_A14_ttbar_hdamp258p75_nonallhad.deriv.DAOD_PHYSLITE.e6337_s3681_r13145_2023-01-08T2101/100events_ttbar.FullSim.DAOD_PHYSLITE.pool.root
+/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/TestFileLiteMCAFII.txt

-/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/ASG/DAOD_PHYSLITE/2023-01-08T2101/mc20_13TeV.410470.PhPy8EG_A14_ttbar_hdamp258p75_nonallhad.deriv.DAOD_PHYSLITE.e6337_a899_r13145_2023-01-08T2101/100events_ttbar.AFII.DAOD_PHYSLITE.pool.root

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

-/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/ASG/DAOD_PHYS/p5169/mc20_13TeV.410470.PhPy8EG_A14_ttbar_hdamp258p75_nonallhad.deriv.DAOD_PHYS.e6337_s3681_r13167_p5169/DAOD_PHYS.29445530._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

-/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/ASG/DAOD_PHYS/p5169/mc20_13TeV.410470.PhPy8EG_A14_ttbar_hdamp258p75_nonallhad.deriv.DAOD_PHYS.e6337_a899_r13167_p5169/DAOD_PHYS.29445540._000002.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/p5169/mc21_13p6TeV.601237.PhPy8EG_A14_ttbar_hdamp258p75_allhad.deriv.DAOD_PHYS.e8357_s3775_r13504_p5169/DAOD_PHYS.29453689._001003.pool.root.1
+/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

AtlasGeometryCommon/BeamPipeGeoModel/BeamPipeGeoModel/BeamPipeDetectorManager.h

 /*
-  Copyright (C) 2002-2022 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,7 +27,7 @@ class BeamPipeDetectorManager : public GeoVDetectorManager
   virtual PVConstLink getTreeTop(unsigned int i) const;
 
   // Add a Tree top:
-  void addTreeTop(PVConstLink);
+  void addTreeTop(const PVConstLink&);
 
  private:  
 
@@ -35,7 +35,6 @@ class BeamPipeDetectorManager : public GeoVDetectorManager
   BeamPipeDetectorManager(const BeamPipeDetectorManager &right);
   
   std::vector<PVConstLink> m_volume;  
-
 };
 
 #ifndef GAUDI_NEUTRAL