.clang-format

+# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
+
+BasedOnStyle: Google
+Language: Cpp
+AllowShortBlocksOnASingleLine: false
+AllowShortCaseLabelsOnASingleLine: false
+AllowShortFunctionsOnASingleLine: Inline
+AllowShortIfStatementsOnASingleLine: false
+AllowShortLoopsOnASingleLine: false
+KeepEmptyLinesAtTheStartOfBlocks: true

.devcontainer/Dockerfile

@@ -8,7 +8,7 @@ USER root
 WORKDIR /root
 
 # Install some additional packages.
-RUN yum -y install which sclo-git25 wget tar atlas-devel libuuid-devel texinfo \
+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  \
            libXext-devel openssl-devel glibc-devel rpm-build libcurl-devel     \
            mesa-libGL-devel libaio && \
@@ -20,17 +20,21 @@ 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_git25.sh /etc/profile.d/
+COPY atlas_prompt.sh setup_atlas.sh enable_sclo_git212.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-git25 'pip install git+https://:@gitlab.cern.ch:8443/atlas/atlasexternals.git#subdirectory=External/flake8_atlas'
+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
+
+# 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 cat /etc/motd && /bin/bash
+CMD /bin/bash

.devcontainer/devcontainer.json

@@ -10,22 +10,27 @@
         "-v", "${localWorkspaceFolder}/../build:/workspaces/build:delegated"
     ],
 
-    "settings": {
-        "terminal.integrated.shell.linux": "/bin/bash",
-        "git.path": "/opt/rh/sclo-git25/root/usr/bin/git",
-        "python.envFile": "/workspaces/build/env.txt",
-        "python.linting.enabled": true,
-        "python.linting.pylintEnabled": false,
-        "python.linting.flake8Enabled": true,
-        "python.linting.flake8Args": [
-            "--select=ATL,F,E7,E9,W6",
-            "--enable-extension=ATL902"
-        ]
-    },
+    "customizations": {
+        "vscode": {
+            "settings": {
+                "terminal.integrated.shell.linux": "/bin/bash",
+                "python.envFile": "${workspaceFolder}/../build/env.txt",
+                "python.linting.enabled": true,
+                "python.linting.pylintEnabled": false,
+                "python.linting.flake8Enabled": true,
+                "python.linting.flake8Args": [
+                    "--isolated",
+                    "--select=ATL,B,F,E101,E7,E9,W6",
+                    "--ignore=B006,B007,B019,E701,E702,E704,E741",
+                    "--enable-extensions=ATL902"
+                ]
+            },
 
-    "extensions": [
-        "ms-vscode.cpptools",
-        "ms-python.python",
-        "twxs.cmake"
-    ]
+            "extensions": [
+                "ms-vscode.cpptools",
+                "ms-python.python",
+                "twxs.cmake"
+            ]
+        }
+    }
 }

.devcontainer/enable_sclo_git212.sh

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

.devcontainer/enable_sclo_git25.sh

-# Enable git 2.5 from Software Collections
-source scl_source enable sclo-git25

.gitignore

@@ -23,3 +23,7 @@
 *.lib
 *.root
 tmp.*
+*.pkl
+.cache
+compile_commands.json
+docs/html/*

.vscode/IDEHelperScripts/Setup.cmake

+# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
+
+message( STATUS "Preparing IDE helpers" )
+
+# Common prefix
+set( ATLAS_IDE_PREFIX "${CMAKE_BINARY_DIR}/ide_" )
+
+# Dump python environment variables
+set( ATLAS_DUMP_ENV_FILE "${CMAKE_BINARY_DIR}/env.txt" CACHE FILEPATH
+   "File containing dump of environment variables" )
+
+if( ATLAS_DUMP_ENV_FILE )
+   execute_process(
+      COMMAND "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/atlas_build_run.sh" printenv
+      COMMAND grep -w ^PYTHONPATH
+      OUTPUT_FILE "${ATLAS_DUMP_ENV_FILE}" )
+endif()
+
+# compiler
+execute_process(
+   COMMAND ${CMAKE_COMMAND} -E create_symlink "${CMAKE_CXX_COMPILER}" "${ATLAS_IDE_PREFIX}compiler"
+   OUTPUT_FILE "${ATLAS_IDE_PREFIX}compiler" )
+
+# python
+find_package( Python COMPONENTS Interpreter )
+execute_process(
+   COMMAND ${CMAKE_COMMAND} -E create_symlink "${Python_EXECUTABLE}" "${ATLAS_IDE_PREFIX}python"
+   OUTPUT_FILE "${ATLAS_IDE_PREFIX}python" )
+
+# flake8 wrapper
+configure_file( "${CMAKE_CURRENT_LIST_DIR}/flake8_wrapper.sh.in" "${ATLAS_IDE_PREFIX}flake8" @ONLY )
+# autopep8 wrapper
+configure_file( "${CMAKE_CURRENT_LIST_DIR}/autopep8_wrapper.sh.in" "${ATLAS_IDE_PREFIX}autopep8" @ONLY )
+
+# gdb wrappers
+set( ATLAS_IDE_ASETUP_CALL "asetup --restore" CACHE STRING
+   "asetup call for IDE helpers" )
+# singularity settings
+set( ATLAS_SINGULARITY_IMAGE "" CACHE PATH
+   "Use singularity wrapper" )
+set( ATLAS_SINGULARITY_ARGS "" CACHE STRING
+   "Singularity weapper args" )
+
+configure_file( "${CMAKE_CURRENT_LIST_DIR}/gdb_wrapper.sh.in" "${ATLAS_IDE_PREFIX}gdb_wrapper" @ONLY )
+if( ATLAS_SINGULARITY_IMAGE )
+   configure_file( "${CMAKE_CURRENT_LIST_DIR}/gdb_runner_singularity.sh.in" "${ATLAS_IDE_PREFIX}gdb_runner" @ONLY )
+else()
+   configure_file( "${CMAKE_CURRENT_LIST_DIR}/gdb_runner_plain.sh.in" "${ATLAS_IDE_PREFIX}gdb_runner" @ONLY )
+endif()

.vscode/IDEHelperScripts/autopep8_wrapper.sh.in

+#!/bin/bash
+
+"@CMAKE_BINARY_DIR@@CMAKE_FILES_DIRECTORY@/atlas_build_run.sh" "@Python_EXECUTABLE@" -m autopep8 "$@"

.vscode/IDEHelperScripts/flake8_wrapper.sh.in

+#!/bin/bash
+
+"@CMAKE_BINARY_DIR@@CMAKE_FILES_DIRECTORY@/atlas_build_run.sh" "@Python_EXECUTABLE@" -m flake8 "$@"

.vscode/IDEHelperScripts/gdb_runner_plain.sh.in

+#!/bin/bash
+
+echo "Running GDB wrapper at '@ATLAS_IDE_PREFIX@gdb_wrapper'"
+echo
+
+"@ATLAS_IDE_PREFIX@gdb_wrapper" "$@"

.vscode/IDEHelperScripts/gdb_runner_singularity.sh.in

+#!/bin/bash
+
+echo "Using singularity 'singularity exec @ATLAS_SINGULARITY_ARGS@ \"@ATLAS_SINGULARITY_IMAGE@\"'"
+echo "Running GDB wrapper at '@ATLAS_IDE_PREFIX@gdb_wrapper'"
+echo
+
+singularity exec @ATLAS_SINGULARITY_ARGS@ "@ATLAS_SINGULARITY_IMAGE@" "/bin/bash" "@ATLAS_IDE_PREFIX@gdb_wrapper" "$@"

.vscode/IDEHelperScripts/gdb_wrapper.sh.in

+#!/bin/bash
+
+args=("$@")
+
+set --
+
+export ATLAS_LOCAL_ROOT_BASE="/cvmfs/atlas.cern.ch/repo/ATLASLocalRootBase"
+source "${ATLAS_LOCAL_ROOT_BASE}/user/atlasLocalSetup.sh"
+
+echo
+binary_dir="@CMAKE_BINARY_DIR@"
+pushd "${binary_dir}" || exit
+@ATLAS_IDE_ASETUP_CALL@
+source "@ATLAS_PLATFORM@/setup.sh"
+popd || exit
+echo
+
+echo "Running gdb with args '${args[*]}'"
+
+gdb "${args[@]}"

.vscode/c_cpp_properties.json

@@ -6,12 +6,15 @@
                 "${workspaceFolder}/**"
             ],
             "defines": [],
-            "compilerPath": "${env:CXX}",
+            "compilerPath": "${workspaceFolder}/../build/ide_compiler",
             "cStandard": "c11",
-            "cppStandard": "c++17",
+            "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

 {
     "remote.SSH.defaultExtensions": [
         "ms-vscode.cpptools",
+        "ms-python.python",
         "twxs.cmake"
     ],
-    "remote.SSH.lockfilesInTmp": true
+    "remote.SSH.lockfilesInTmp": true,
+    "python.defaultInterpreterPath": "${workspaceFolder}/../build/ide_python",
+    "python.envFile": "${workspaceFolder}/../build/env.txt",
+    "[python]": {
+        "editor.defaultFormatter": "ms-python.autopep8"
+    },
+    "autopep8.path": [
+        "${workspaceFolder}/../build/ide_autopep8"
+    ],
+    "flake8.path": [
+        "${workspaceFolder}/../build/ide_flake8"
+    ],
+    "flake8.args": [
+        "--isolated",
+        "--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 )
@@ -7,16 +7,49 @@ atlas_subdir( Asg_Test )
 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 )
+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 )
+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/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/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} )
+
 get_filename_component( ROOTCORE_TEST_DATA ${ROOTCORE_TEST_FILE} PATH )
 
 # Create the CMake file that will be used to generate the environment config:

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

-/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/ASG/DAOD_PHYS/v1/data.DAOD_PHYS.pool.root
+/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