Adaptatiton for Kingmaker sandboxing

.github/workflows/checks.yml

@@ -1,8 +1,6 @@
 name: Checks
 
 on:
-  workflow_run:
-    workflows: ["build_unittest_container"]
   push:
     branches:
       - main
@@ -12,6 +10,7 @@ on:
 
 # Settings go here!
 env:
+  ENV_NAME: env
   BUILD_TYPE: Release
   ANALYSIS: unittest
   CONFIG: unittest_config
@@ -25,188 +24,172 @@ env:
   TWO_FRIENDS_CONFIG: unittest_friends_2
   FRIEND_SHIFTS: "nominal,jesUncTotalUp,jesUncTotalDown,tauMuFakeEsDown"
 
+# This ensures every step runs in a login shell, automatically activating conda
+defaults:
+  run:
+    shell: bash -el {0}
+
 jobs:
   build_project:
     runs-on: ubuntu-24.04
     container:
-      image: ghcr.io/kit-cms/crown-crown-unittest:pr-334
+      image: kingmakerimages/kingmaker_standalone:V1
       options: --user 0 # run as root
 
     steps:
       - name: Clone project
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           ssh-key: ${{ secrets.CERN_GITLAB_PRIVATE_KEY }}
           submodules: "recursive"
           ssh-strict: "false"
           ssh-known-hosts: "[gitlab.cern.ch]:7999 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAubVS0czgKaPkC5cfB75CI3XjgWBv7pj2ILiZezVf8okkCAYr+bf4w6VrH2pyv3NRUW5Mm8U/3zoSNcrYIqhFFpz6R62/3xt8hMrPKJKstbt1lSIr8QhEyD24SJEKugMi560BWRPkTzXrrFgxz0X4vuKKytpvihRsccZ7F1JaX76UCWEJ3Xr2BFCEnnN6gj9nvFr4gvSMneunWVLGw2KcHwS1OJfnWBlp3fB0rYWSxZAoVjcjZjvv3hioEftaTapff2PkdQIX//N9Cc555FzdmMzixTvU5j/i+QvjxWVbEBNSKI6te6udC4fYUZMePs2QQnqw9mXUQtaQtw+HV7utuw=="
 
-      - name: Mark git directory as safe
-        run: git config --global --add safe.directory ${{github.workspace}}
+      - name: Mark all git directories as safe
+        run: git config --global --add safe.directory '*'
 
       - name: Create Build Environment
-        shell: bash
-        run: cmake -E make_directory ${{github.workspace}}/build
+        run: cmake -E make_directory build
 
       - name: adding a system path
         run: echo "$HOME/.local/bin" >> $GITHUB_PATH
 
       - name: Configure CMake
-        shell: bash
-        run: cd ${{github.workspace}}/build && cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DANALYSIS=$ANALYSIS -DCONFIG=$CONFIG -DSAMPLES=$SAMPLES -DERAS=$ERAS -DSCOPES=$SCOPES -DSHIFTS=$SHIFTS -DOPTIMIZED=false -DONNXRUNTIME_INCLUDE_DIR=/opt/onnxruntime
+        run: |
+          cd build
+          cmake .. \
+            -DCMAKE_BUILD_TYPE=$BUILD_TYPE \
+            -DANALYSIS=$ANALYSIS \
+            -DCONFIG=$CONFIG \
+            -DSAMPLES=$SAMPLES \
+            -DERAS=$ERAS \
+            -DSCOPES=$SCOPES \
+            -DSHIFTS=$SHIFTS \
+            -DOPTIMIZED=false
 
       - name: Build
-        shell: bash
-        run: cd ${{github.workspace}}/build && make install -j 2
+        run: make -C build install -j$(nproc)
 
       - name: Test
-        shell: bash
-        run: cd ${{github.workspace}}/build && ctest -V --label-regex "ntuple.*."
+        run: ctest --test-dir build -V --label-regex "ntuple.*."
 
   build_single_friend:
     runs-on: ubuntu-24.04
     container:
-      image: ghcr.io/kit-cms/crown-crown-unittest:pr-334
+      image: kingmakerimages/kingmaker_standalone:V1
       options: --user 0 # run as root
 
     steps:
-
       - name: Clone project
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           ssh-key: ${{ secrets.CERN_GITLAB_PRIVATE_KEY }}
           submodules: "recursive"
           ssh-strict: "false"
           ssh-known-hosts: "[gitlab.cern.ch]:7999 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAubVS0czgKaPkC5cfB75CI3XjgWBv7pj2ILiZezVf8okkCAYr+bf4w6VrH2pyv3NRUW5Mm8U/3zoSNcrYIqhFFpz6R62/3xt8hMrPKJKstbt1lSIr8QhEyD24SJEKugMi560BWRPkTzXrrFgxz0X4vuKKytpvihRsccZ7F1JaX76UCWEJ3Xr2BFCEnnN6gj9nvFr4gvSMneunWVLGw2KcHwS1OJfnWBlp3fB0rYWSxZAoVjcjZjvv3hioEftaTapff2PkdQIX//N9Cc555FzdmMzixTvU5j/i+QvjxWVbEBNSKI6te6udC4fYUZMePs2QQnqw9mXUQtaQtw+HV7utuw=="
 
-      - name: Mark git directory as safe
-        run: git config --global --add safe.directory ${{github.workspace}}
+      - name: Mark all git directories as safe
+        run: git config --global --add safe.directory '*'
 
       - name: Create Build Environment
-        shell: bash
-        run: cmake -E make_directory ${{github.workspace}}/build
+        run: cmake -E make_directory build
 
       - name: adding a system path
         run: echo "$HOME/.local/bin" >> $GITHUB_PATH
 
       - name: Configure CMake
-        shell: bash
-        run: cd ${{github.workspace}}/build && cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DANALYSIS=$ANALYSIS -DCONFIG=$SINGLE_FRIEND_CONFIG -DSAMPLES=$SAMPLES -DERAS=$ERAS -DSCOPES=$SINGLE_FRIEND_SCOPES -DSHIFTS=$FRIEND_SHIFTS -DOPTIMIZED=false -DQUANTITIESMAP="dummy" -DONNXRUNTIME_INCLUDE_DIR=/opt/onnxruntime
+        run: |
+          cd build
+          cmake .. \
+            -DCMAKE_BUILD_TYPE=$BUILD_TYPE \
+            -DANALYSIS=$ANALYSIS \
+            -DCONFIG=$SINGLE_FRIEND_CONFIG \
+            -DSAMPLES=$SAMPLES \
+            -DERAS=$ERAS \
+            -DSCOPES=$SINGLE_FRIEND_SCOPES \
+            -DSHIFTS=$FRIEND_SHIFTS \
+            -DOPTIMIZED=false \
+            -DQUANTITIESMAP="dummy"
 
       - name: Build
-        shell: bash
-        run: cd ${{github.workspace}}/build && make install -j 2
+        run: make -C build install -j$(nproc)
 
       - name: Test
-        shell: bash
-        run: cd ${{github.workspace}}/build && ctest -V --label-regex "single_friend.*."
+        run: ctest --test-dir build -V --label-regex "single_friend.*."
 
   build_two_friends:
     runs-on: ubuntu-24.04
     container:
-      image: ghcr.io/kit-cms/crown-crown-unittest:pr-334
+      image: kingmakerimages/kingmaker_standalone:V1
       options: --user 0 # run as root
 
     steps:
       - name: Clone project
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           ssh-key: ${{ secrets.CERN_GITLAB_PRIVATE_KEY }}
           submodules: "recursive"
           ssh-strict: "false"
           ssh-known-hosts: "[gitlab.cern.ch]:7999 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAubVS0czgKaPkC5cfB75CI3XjgWBv7pj2ILiZezVf8okkCAYr+bf4w6VrH2pyv3NRUW5Mm8U/3zoSNcrYIqhFFpz6R62/3xt8hMrPKJKstbt1lSIr8QhEyD24SJEKugMi560BWRPkTzXrrFgxz0X4vuKKytpvihRsccZ7F1JaX76UCWEJ3Xr2BFCEnnN6gj9nvFr4gvSMneunWVLGw2KcHwS1OJfnWBlp3fB0rYWSxZAoVjcjZjvv3hioEftaTapff2PkdQIX//N9Cc555FzdmMzixTvU5j/i+QvjxWVbEBNSKI6te6udC4fYUZMePs2QQnqw9mXUQtaQtw+HV7utuw=="
 
-      - name: Mark git directory as safe
-        run: git config --global --add safe.directory ${{github.workspace}}
-
-      - name: Create Build Environment
-        shell: bash
-        run: cmake -E make_directory ${{github.workspace}}/build
-
-      - name: adding a system path
-        run: echo "$HOME/.local/bin" >> $GITHUB_PATH
+      - name: Mark all directories as safe
+        run: git config --global --add safe.directory '*'
 
       - name: Configure CMake
-        shell: bash
-        run: cd ${{github.workspace}}/build && cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DANALYSIS=$ANALYSIS -DCONFIG=$TWO_FRIENDS_CONFIG -DSAMPLES=$SAMPLES -DERAS=$ERAS -DSCOPES=$TWO_FRIENDS_SCOPES -DSHIFTS=$FRIEND_SHIFTS -DOPTIMIZED=false -DQUANTITIESMAP="dummy" -DONNXRUNTIME_INCLUDE_DIR=/opt/onnxruntime
+        run: |
+          mkdir -p build
+          cd build
+          cmake .. \
+            -DCMAKE_BUILD_TYPE=$BUILD_TYPE \
+            -DANALYSIS=$ANALYSIS \
+            -DCONFIG=$TWO_FRIENDS_CONFIG \
+            -DSAMPLES=$SAMPLES \
+            -DERAS=$ERAS \
+            -DSCOPES=$TWO_FRIENDS_SCOPES \
+            -DSHIFTS=$FRIEND_SHIFTS \
+            -DOPTIMIZED=false \
+            -DQUANTITIESMAP="dummy"
 
       - name: Build
-        shell: bash
-        run: cd ${{github.workspace}}/build && make install -j 2
+        run: make -C build install -j$(nproc)
 
       - name: Test
-        shell: bash
-        run: cd ${{github.workspace}}/build && ctest -V --label-regex "two_friends.*."
-
+        run: ctest --test-dir build -V --label-regex "two_friends.*."
 
-  python_format:
+  code_formatting:
     runs-on: ubuntu-24.04
     container:
-      image: ghcr.io/kit-cms/crown-crown-unittest:pr-334
-      options: --user 0 # run as root
-
+      image: kingmakerimages/kingmaker_standalone:V1
+      options: --user 0
     steps:
-      - name: apt update
-        run: apt-get -y update
-
-      - name: Install missing software
-        run: apt-get install -y git python3-pip && pip install black==23.3.0 --break-system-packages
-
-      - uses: actions/checkout@v2
-
-      - name: Check Python formatting
-        shell: bash
-        run: cd $GITHUB_WORKSPACE && bash checks/python-formatting.sh
-
-  cpp_format:
-    runs-on: ubuntu-24.04
-    container:
-      image: ghcr.io/kit-cms/crown-crown-unittest:pr-334
-      options: --user 0 # run as root
-
-    steps:
-      - name: apt update
-        run: apt-get -y update
-
-      - name: Install missing software
-        run: apt-get install -y git python3-pip && pip install clang-format --break-system-packages
-
-      - uses: actions/checkout@v2
-
-      - name: Check C++ formatting
-        shell: bash
-        run: cd $GITHUB_WORKSPACE && bash checks/cpp-formatting.sh
+      - name: Clone project
+        uses: actions/checkout@v4
+      - name: Run all formatting checks
+        run: |
+          git config --global --add safe.directory '*'
+          bash ./checks/run-all-checks.sh
 
   docs:
     runs-on: ubuntu-24.04
     container:
-      image: ghcr.io/kit-cms/crown-crown-unittest:pr-334
-      options: --user 0 # run as root
-
+      image: kingmakerimages/kingmaker_standalone:V1
+      options: --user 0
     steps:
-      - name: apt update
-        run: apt-get -y update
-
-      - name: Install missing software
-        run: apt-get install -y git cmake make doxygen python3-pip
-
-      - name: install docs related packages
-        run: pip install breathe==4.36 sphinx==8.1.3 sphinx_rtd_theme==3.0.2 --break-system-packages
-
-      - uses: actions/checkout@v2
+      - name: Clone project
+        uses: actions/checkout@v4
 
       - name: Create Build Environment
-        shell: bash
         run: cmake -E make_directory ${{github.workspace}}/build
 
       - name: Configure CMake
-        shell: bash
-        run: cd ${{github.workspace}}/build && cmake $GITHUB_WORKSPACE/docs
+        run: |
+          cd ${{github.workspace}}/build
+          cmake $GITHUB_WORKSPACE/docs
 
       - name: Build docs
-        shell: bash
-        run: cd ${{github.workspace}}/build && make
+        run: |
+          cd ${{github.workspace}}/build
+          make
 
       - name: Publish
-        shell: bash
-        run: echo "TODO"
+        run: echo "TODO"

.gitignore

@@ -5,6 +5,7 @@ build*/
 log/
 logs/
 generation_logs/
+.cache/*
 # ignore all analysis in the config folder apart from the unittest and the template
 analysis_configurations/*
 !analysis_configurations/quantities

CMakeLists.txt

@@ -29,15 +29,6 @@ message(
 )
 message(STATUS "")
 
-message(STATUS "Finding Packages")
-# add the different dependencies
-include(AddBaseDependencies)
-include(AddRoot)
-include(AddLogging)
-include(AddCorrectionlib)
-include(AddOnnxruntime)
-include(ConfigurePython)
-
 # installdir
 if(NOT DEFINED INSTALLDIR)
   message(
@@ -48,15 +39,26 @@ if(NOT DEFINED INSTALLDIR)
 endif()
 set(GENERATE_CPP_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
 
+message(STATUS "Finding Packages")
+# add the different dependencies
+include(AddBaseDependencies)
+include(AddRoot)
+include(AddDicts)
+include(AddLogging)
+include(AddCorrectionlib)
+include(AddOnnxruntime)
+include(ConfigurePython)
+
 # crownlib setup
 include(ConfigureCrownlib)
-if (BUILD_CROWNLIB_ONLY)
+if(BUILD_CROWNLIB_ONLY)
   # exit if only crownlib is being built
   return()
 endif()
 # run the code generation
 include(CodeGeneration)
 
+message(STATUS "Next is Build")
 # run the build
 include(Build)
 

analysis_configurations/unittest/producers/embedding.py

@@ -2,7 +2,6 @@
 from ..quantities import output as q
 from ..quantities import nanoAOD as nanoAOD
 
-
 EmbeddingGenWeight = Producer(
     name="EmbeddingGenWeight",
     call="event::quantity::Rename<Float_t>({df}, {output}, {input})",