.devcontainer/Dockerfile

-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration
 
-# Start from the base CERN CentOS 7 image.
-FROM cern/cc7-base:latest
+# Start from the base CERN Alma 9 image.
+FROM cern/alma9-base:latest
 
 # Perform the image setup as root.
 USER root
 WORKDIR /root
 
 # Install some additional packages.
-RUN yum -y install which sclo-git212 wget tar atlas-devel libuuid-devel texinfo \
-           python2-pip redhat-lsb-core libX11-devel libXpm-devel libXft-devel  \
+RUN yum -y install which git wget tar atlas-devel libuuid-devel texinfo \
+           libX11-devel libXpm-devel libXft-devel  \
            libXext-devel openssl-devel glibc-devel rpm-build libcurl-devel     \
-           mesa-libGL-devel libaio && \
+           mesa-libGL-devel libaio make expat-devel && \
     yum clean all
 
 # Set up the ATLAS user, and give it super user rights.
@@ -20,21 +20,17 @@ RUN echo '%wheel	ALL=(ALL)	NOPASSWD: ALL' >> /etc/sudoers && \
     usermod -aG wheel atlas
 
 # Copy the interactive environment setup scripts in place.
-COPY atlas_prompt.sh setup_atlas.sh enable_sclo_git212.sh /etc/profile.d/
+COPY atlas_prompt.sh setup_atlas.sh /etc/profile.d/
 # Add the message of the day instructions for the image.
 COPY motd /etc/
 
-# Install flake8 python linter
-RUN pip install flake8 six
-RUN scl enable sclo-git212 'pip install git+https://:@gitlab.cern.ch:8443/atlas/atlasexternals.git#subdirectory=External/flake8_atlas'
 
 # Switch to the ATLAS account.
 USER atlas
 WORKDIR /home/atlas
-RUN echo "cat /etc/motd" >> /home/atlas/.bashrc
+RUN echo 'cat /etc/motd' >> ~/.bashrc && \
+    echo 'source /etc/profile.d/setup_atlas.sh' >> ~/.bashrc
 
-# Add git to path, so that .gitconfig copy works properly
-ENV PATH="${PATH}:/opt/rh/sclo-git212/root/usr/bin/"
 
 # Set up the command to run when starting the image.
-CMD /bin/bash
+CMD ["/bin/bash", "-l"]

.devcontainer/devcontainer.json

 {
-    "name": "CentOS 7",
+    "name": "AlmaLinux 9 - ATLAS",
     "dockerFile": "Dockerfile",
 
     "runArgs": [
@@ -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"
                 ]
             },

.devcontainer/enable_sclo_git212.sh

-# Enable git 2.12 from Software Collections
-source scl_source enable sclo-git212

.devcontainer/motd

@@ -8,5 +8,5 @@ your build, set up your build environment as usual (using
 setupATLAS and asetup), and then set up your build like:
 
 cmake -DATLAS_PACKAGE_FILTER_FILE=some_filter_file.txt \
-   /workspace/athena/Projects/WorkDir/
+   /workspaces/athena/Projects/WorkDir/
 

.gitignore

@@ -26,3 +26,4 @@ tmp.*
 *.pkl
 .cache
 compile_commands.json
+docs/html/*

.vscode/c_cpp_properties.json

@@ -10,8 +10,11 @@
             "cStandard": "c11",
             "cppStandard": "c++20",
             "intelliSenseMode": "gcc-x64",
-            "compileCommands": "${workspaceFolder}/../build/compile_commands.json"
+            "compileCommands": [
+                "${workspaceFolder}/../build/compile_commands.json"
+            ],
+            "configurationProvider": "ms-vscode.cmake-tools"
         }
     ],
     "version": 4
-}
+}
\ No newline at end of file

.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/p5855/data18_13TeV.00348885.physics_Main.deriv.DAOD_PHYS.r13286_p4910_p5855/DAOD_PHYS.34857549._000345.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/p5855/mc20_13TeV.410470.PhPy8EG_A14_ttbar_hdamp258p75_nonallhad.deriv.DAOD_PHYS.e6337_s3681_r13167_p5855/DAOD_PHYS.34865530._000740.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/p5855/mc20_13TeV.410470.PhPy8EG_A14_ttbar_hdamp258p75_nonallhad.deriv.DAOD_PHYS.e6337_a907_r14861_p5855/DAOD_PHYS.35068879._000214.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