gammasimtools 0.26.0__tar.gz → 0.27.1__tar.gz

{gammasimtools-0.26.0 → gammasimtools-0.27.1}/.env_template

@@ -2,8 +2,9 @@
 # Copy this file to '.env' and add the required
 # credentials for simulation model database access
 
-SIMTOOLS_CORSIKA_HE_INTERACTION=qgs3
+SIMTOOLS_CORSIKA_HE_INTERACTION=epos
 SIMTOOLS_CORSIKA_LE_INTERACTION=urqmd
+SIMTOOLS_CORSIKA_INTERACTION_TABLE_PATH=/workdir/external/simpipe/simulation_software/corsika7-interaction-tables/interaction-tables/
 SIMTOOLS_CORSIKA_PATH=/workdir/simulation_software/corsika7
 SIMTOOLS_DB_API_AUTHENTICATION_DATABASE=admin
 SIMTOOLS_DB_API_PORT=27017

{gammasimtools-0.26.0 → gammasimtools-0.27.1}/.github/workflows/CI-integrationtests.yml

@@ -1,6 +1,8 @@
 ---
 name: CI-integrationtests
 
+permissions: {}
+
 on:
   workflow_dispatch:
     inputs:
@@ -22,8 +24,6 @@ on:
         type: string
         default: '["7.0.0","6.0.2","5.0.0","6.0.2,6.1.1"]'
     secrets:
-      CLOUD_QGSJET3:
-        required: false
       DB_SERVER:
         required: false
       DB_API_USER:
@@ -42,9 +42,6 @@ on:
   release:
     types: [published]
 
-env:
-  CLOUD_URL: "https://syncandshare.desy.de/index.php/s/"
-
 jobs:
 
   test_building:
@@ -63,13 +60,41 @@ jobs:
           python -m pip install --upgrade pip build
           python -m build
 
+  prepare_interaction_tables:
+    name: download CORSIKA interaction tables
+    runs-on: ubuntu-latest
+    env:
+      IT_NAME: "corsika7-interaction-tables"
+      CORSIKA_TABLES: "v0.1.0"
+
+    steps:
+      - name: Clone CORSIKA interaction tables (exclude QGSJet tables)
+        run: |
+          REPO_URL=https://gitlab.cta-observatory.org/cta-computing/dpps/simpipe/simulation_software/${IT_NAME}
+          export GIT_LFS_SKIP_SMUDGE=1  # disable automatic downloading of all LFS files
+          git clone --depth 1 --branch "$CORSIKA_TABLES" "$REPO_URL" "$IT_NAME"
+          git lfs install
+          (cd "$IT_NAME" && git lfs pull --exclude="interaction-tables/qgsdat-II-04,interaction-tables/qgsdat-III")
+
+      - name: Upload CORSIKA interaction tables
+        uses: actions/upload-artifact@v6
+        with:
+          name: corsika-interaction-tables
+          path: ${{ env.IT_NAME }}
+          if-no-files-found: error
+          retention-days: 30
+
   integration_tests:
+    needs: prepare_interaction_tables
     runs-on: ubuntu-latest
     permissions:
       contents: read
     container:
       image: ${{ inputs.container_image || 'ghcr.io/gammasim/simtools-dev:latest' }}
       options: --user 0
+    env:
+      CONTAINER_IMAGE: ${{ inputs.container_image || 'ghcr.io/gammasim/simtools-dev:latest' }}
+      IT_NAME: "corsika7-interaction-tables"
 
     services:
       mongodb:
@@ -124,10 +149,17 @@ jobs:
             echo "SIMTOOLS_DB_SIMULATION_MODEL_VERSION=$SIMTOOLS_DB_SIMULATION_MODEL_VERSION"
             echo "SIMTOOLS_SIM_TELARRAY_PATH=$SIMTOOLS_SIM_TELARRAY_PATH"
             echo "SIMTOOLS_CORSIKA_PATH=$SIMTOOLS_CORSIKA_PATH"
+            echo "SIMTOOLS_CORSIKA_INTERACTION_TABLE_PATH=$SIMTOOLS_CORSIKA_INTERACTION_TABLE_PATH"
             echo "SIMTOOLS_CORSIKA_HE_INTERACTION=$SIMTOOLS_CORSIKA_HE_INTERACTION"
             echo "SIMTOOLS_CORSIKA_LE_INTERACTION=$SIMTOOLS_CORSIKA_LE_INTERACTION"
           } | tee .env >> "$GITHUB_ENV"
 
+      - name: Download CORSIKA interaction tables
+        uses: actions/download-artifact@v7
+        with:
+          name: corsika-interaction-tables
+          path: ${{ env.SIMTOOLS_CORSIKA_INTERACTION_TABLE_PATH }}/..
+
       - name: Extend PATH (sim_telarray)
         run: |
           [ -n "$SIMTOOLS_SIM_TELARRAY_PATH" ] && echo "$SIMTOOLS_SIM_TELARRAY_PATH" >> "$GITHUB_PATH"
@@ -173,16 +205,9 @@ jobs:
             --db_simulation_model_version ${{ env.SIMTOOLS_DB_SIMULATION_MODEL_VERSION }} \
             --branch "$SIMTOOLS_DB_SIMULATION_MODEL_BRANCH"
 
-      - name: Download QGSJet (prod images without tables)
-        if: contains(inputs.container_image, 'simtools-prod')
-        run: |
-          wget -nv -O - "${{ env.CLOUD_URL }}/${{ secrets.CLOUD_QGSJET3 }}/download" | \
-            bunzip2 > "${SIMTOOLS_CORSIKA_PATH}/qgsdat-III"
-
       - name: Integration tests
         shell: bash -l {0}
         run: |
           cat .env
-          simtools-print-version
           pytest --model_version=${{ matrix.model_version }} --color=yes --durations=20 \
             -n 4 --dist loadscope --retries 2 --retry-delay 5 --no-cov tests/integration_tests/

{gammasimtools-0.26.0 → gammasimtools-0.27.1}/.github/workflows/build-corsika-simtel-legacy.yml

@@ -2,17 +2,12 @@
 name: build-corsika-simtel-legacy
 # **legacy build** - will be deprecated in near future
 # Build and push CORSIKA / sim_telarray base images for different CPU architectures.
-# The no_opt (non-optimized) images are built as multi-platform images (x86_64 and arm64).
+# The generic (non-optimized) images are built as multi-platform images (x86_64 and arm64).
 #
 # The images are built and pushed when manually triggered (workflow_dispatch).
 
 on:
   workflow_dispatch:
-  pull_request:
-    paths:
-      - docker/Dockerfile-corsika-simtel
-  schedule:
-    - cron: '0 0 1 * *'  # Every 1st day of the month at 00:00 UTC (build only)
 
 env:
   REGISTRY: ghcr.io
@@ -36,7 +31,7 @@ jobs:
           wget --no-verbose ${{ env.CLOUD_URL }}/${{ secrets[format('CLOUD_SIMTEL_R_{0}', matrix.simtel_version)] }}/download -O corsika_simtelarray_${{ matrix.simtel_version }}.tar.gz
           wget --no-verbose ${{ env.CLOUD_URL }}/${{ secrets.CLOUD_AUTOCONF }}/download -O autoconf.tar.gz
       - name: Upload corsika-simtel-package
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v6
         with:
           name: corsika-simtelarray-package-${{ matrix.simtel_version }}
           path: |
@@ -54,7 +49,7 @@ jobs:
           wget --no-verbose ${{ env.CLOUD_URL }}/${{ secrets.CLOUD_QGSJET3 }}/download -O qgsdat-III.bz2
           wget --no-verbose ${{ env.CLOUD_URL }}/${{ secrets.CLOUD_AUTOCONF }}/download -O autoconf.tar.gz
       - name: Upload QGSJet files and autoconf
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v6
         with:
           name: upload-auxiliary-files
           path: |
@@ -74,12 +69,12 @@ jobs:
       matrix:
         version:
           # list of avx instructions: 'avx2', 'avx512f', 'sse4', 'avx'
-          - {simtel_version: '240205', corsika_version: '77500', bernlohr_version: '1.67', hadronic_model: 'qgs2', avx_flag: 'no_opt'}
-          - {simtel_version: '240927', corsika_version: '77550', bernlohr_version: '1.68', hadronic_model: 'qgs2', avx_flag: 'no_opt'}
+          - {simtel_version: '240205', corsika_version: '77500', bernlohr_version: '1.67', hadronic_model: 'qgs2', avx_flag: 'generic'}
+          - {simtel_version: '240927', corsika_version: '77550', bernlohr_version: '1.68', hadronic_model: 'qgs2', avx_flag: 'generic'}
           - {simtel_version: '240927', corsika_version: '77550', bernlohr_version: '1.68', hadronic_model: 'qgs2', avx_flag: 'avx2'}
           - {simtel_version: '240927', corsika_version: '77550', bernlohr_version: '1.68', hadronic_model: 'qgs2', avx_flag: 'avx512f'}
           - {simtel_version: '240927', corsika_version: '77550', bernlohr_version: '1.68', hadronic_model: 'qgs2', avx_flag: 'sse4'}
-          - {simtel_version: '250903', corsika_version: '78010', bernlohr_version: '1.70', hadronic_model: 'qgs3', avx_flag: 'no_opt'}
+          - {simtel_version: '250903', corsika_version: '78010', bernlohr_version: '1.70', hadronic_model: 'qgs3', avx_flag: 'generic'}
           - {simtel_version: '250903', corsika_version: '78010', bernlohr_version: '1.70', hadronic_model: 'qgs3', avx_flag: 'avx2'}
           - {simtel_version: '250903', corsika_version: '78010', bernlohr_version: '1.70', hadronic_model: 'qgs3', avx_flag: 'avx512f'}
           - {simtel_version: '250903', corsika_version: '78010', bernlohr_version: '1.70', hadronic_model: 'qgs3', avx_flag: 'sse4'}
@@ -144,8 +139,7 @@ jobs:
         uses: docker/build-push-action@v6
         with:
           context: .
-          # Build multi-platform only for no_opt (non-optimized) variant, others are x86-specific
-          platforms: ${{ matrix.version.avx_flag == 'no_opt' && 'linux/amd64,linux/arm64/v8' || 'linux/amd64' }}
+          platforms: 'linux/amd64'
           build-args: |
             BUILD_OPT=${{ matrix.production.build_opt }}
             EXTRA_DEF=${{ matrix.production.extra_def }}

{gammasimtools-0.26.0 → gammasimtools-0.27.1}/.github/workflows/build-corsika7.yml

@@ -1,7 +1,7 @@
 ---
 name: build-corsika7
 # Build and push CORSIKA7 images for different CPU architectures.
-# The no_opt (non-optimized) images are built as multi-platform images (x86_64 and arm64).
+# The generic (non-optimized) images are built as multi-platform images (x86_64 and arm64).
 #
 # The images are built and pushed when manually triggered (workflow_dispatch).
 #
@@ -28,7 +28,7 @@ jobs:
         run: |
           wget --no-verbose ${{ env.CLOUD_URL }}/${{ secrets.CLOUD_AUTOCONF }}/download -O autoconf.tar.gz
       - name: upload-auxiliary-files
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v6
         with:
           name: upload-auxiliary-files
           path: |
@@ -43,14 +43,18 @@ jobs:
       packages: write
     strategy:
       matrix:
-        version:
-          - {corsika: '78010', avx_flag: 'no_opt', corsika_config: 'v0.1.0'}
-          - {corsika: '78010', avx_flag: 'avx2', corsika_config: 'v0.1.0'}
-          - {corsika: '78010', avx_flag: 'avx512f', corsika_config: 'v0.1.0'}
-          - {corsika: '78010', avx_flag: 'sse4', corsika_config: 'v0.1.0'}
+        corsika: ['78010', '78050']
+        avx_flag: ['generic', 'avx2', 'avx512f', 'sse4']
+        include:
+          - corsika: '78010'
+            corsika_config: 'v0.1.0'
+            corsika_opt_patch: 'v1.1.0'
+          - corsika: '78050'
+            corsika_config: 'v1.0.0'
+            corsika_opt_patch: 'v1.2.0'
     env:
       BASE_LABEL: "corsika7"
-      BASE_TAG: "${{ matrix.version.corsika }}-${{ matrix.version.avx_flag }}"
+      BASE_TAG: "v${{ matrix.corsika }}-${{ matrix.avx_flag }}"
 
     steps:
       - name: Checkout repository
@@ -77,10 +81,10 @@ jobs:
         uses: docker/metadata-action@v5
         with:
           tags: |
+            type=raw,value=${{ env.BASE_TAG }}
             type=ref,event=pr,suffix=-${{ env.BASE_TAG }}
             type=semver,pattern={{major}}.{{minor}}.{{patch}}-${{ env.BASE_TAG }}
             type=schedule,pattern={{date 'YYYYMMDD'}}-${{ env.BASE_TAG }}
-            type=raw,value={{date 'YYYYMMDD'}}-${{ env.BASE_TAG }}
           images: ${{ env.REGISTRY }}/gammasim/${{ env.BASE_LABEL }}
           flavor: latest=false
 
@@ -88,12 +92,13 @@ jobs:
         uses: docker/build-push-action@v6
         with:
           context: .
-          # Build multi-platform only for no_opt (non-optimized) variant, others are x86-specific
-          platforms: ${{ matrix.version.avx_flag == 'no_opt' && 'linux/amd64,linux/arm64/v8' || 'linux/amd64' }}
+          # Build multi-platform only for generic (non-optimized) variant, others are x86-specific
+          platforms: ${{ matrix.avx_flag == 'generic' && 'linux/amd64,linux/arm64/v8' || 'linux/amd64' }}
           build-args: |
-            AVX_FLAG=${{ matrix.version.avx_flag }}
-            CORSIKA_VERSION=${{ matrix.version.corsika }}
-            CORSIKA_CONFIG_VERSION=${{ matrix.version.corsika_config }}
+            AVX_FLAG=${{ matrix.avx_flag }}
+            CORSIKA_VERSION=${{ matrix.corsika }}
+            CORSIKA_CONFIG_VERSION=${{ matrix.corsika_config }}
+            CORSIKA_OPT_PATCH_VERSION=${{ matrix.corsika_opt_patch }}
           secrets: |
             corsika7_token=${{ secrets.CORSIKA7_KIT_GITLAB }}
           push: ${{ github.event_name == 'workflow_dispatch' }}

{gammasimtools-0.26.0 → gammasimtools-0.27.1}/.github/workflows/build-sim_telarray.yml

@@ -1,6 +1,6 @@
 ---
 name: build-simtel_array
-# Build and push sim_telarray images
+# Build and push sim_telarray images.
 #
 # The images are built and pushed when manually triggered (workflow_dispatch).
 #
@@ -27,7 +27,7 @@ jobs:
     strategy:
       matrix:
         version:
-          - {simtel_version: 'master', hessio_version: 'master', stdtools_version: 'master'}
+          - {simtel_version: 'v2025-11-30-rc', hessio_version: 'v2025-12-01-rc', stdtools_version: 'v2025-06-16-rc'}
     env:
       BASE_LABEL: "sim_telarray"
       BASE_TAG: "${{ matrix.version.simtel_version }}"
@@ -51,10 +51,10 @@ jobs:
         uses: docker/metadata-action@v5
         with:
           tags: |
+            type=raw,value=${{ env.BASE_TAG }}
             type=ref,event=pr,suffix=-${{ env.BASE_TAG }}
             type=semver,pattern={{major}}.{{minor}}.{{patch}}-${{ env.BASE_TAG }}
             type=schedule,pattern={{date 'YYYYMMDD'}}-${{ env.BASE_TAG }}
-            type=raw,value={{date 'YYYYMMDD'}}-${{ env.BASE_TAG }}
           images: ${{ env.REGISTRY }}/gammasim/${{ env.BASE_LABEL }}
           flavor: latest=true
 

{gammasimtools-0.26.0 → gammasimtools-0.27.1}/.github/workflows/build-simtools-dev.yml

@@ -1,6 +1,6 @@
 ---
 name: build-simtools-dev
-# Build simtools images for developers based on CORSIKA / sim_telarray images (no optimizations)
+# Build simtools images for developers based on CORSIKA / sim_telarray images (no optimizations).
 
 on:
   workflow_dispatch:
@@ -16,26 +16,13 @@ env:
   REGISTRY: ghcr.io
   IMAGE_NAME: ${{ github.repository }}
   CLOUD_URL: "https://syncandshare.desy.de/index.php/s/"
+  CORSIKA_IMAGE_VERSION: "v78010"
+  SIMTEL_IMAGE_VERSION: "v2025-11-30-rc"
+  AVX_FLAG: "generic"
 
 jobs:
-
-  download-qgsjet-tables:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Download QGSJet
-        run: |
-          wget --no-verbose ${{ env.CLOUD_URL }}/${{ secrets.CLOUD_QGSJET3 }}/download -O qgsdat-III.bz2
-      - name: Upload QGSJet files
-        uses: actions/upload-artifact@v5
-        with:
-          name: upload-qgsjet-tables
-          path: |
-            qgsdat-III.bz2
-          retention-days: 1
-
   build-simtools-dev:
     runs-on: ubuntu-latest
-    needs: [download-qgsjet-tables]
     permissions:
       contents: read
       packages: write
@@ -46,12 +33,6 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v6
 
-      - name: Download QGSJet tables
-        uses: actions/download-artifact@v7
-        with:
-          name: upload-qgsjet-tables
-          path: .
-
       - name: Set build branch
         run: |
           if [[ "${{ github.event_name }}" == 'pull_request' ]]; then
@@ -77,7 +58,7 @@ jobs:
         with:
           tags: |
             type=ref,event=pr
-            type=semver,pattern={{major}}.{{minor}}.{{patch}}
+            type=semver,pattern=v{{major}}.{{minor}}.{{patch}}
             type=schedule,pattern={{date 'YYYYMMDD'}}
             type=raw,value={{date 'YYYYMMDD'}}
           images: ${{ env.REGISTRY }}/gammasim/${{ env.BASE_LABEL }}
@@ -88,7 +69,11 @@ jobs:
         with:
           context: .
           platforms: linux/amd64,linux/arm64/v8
-          build-args: SIMTOOLS_BRANCH=${{ env.SIMTOOLS_BRANCH }}
+          build-args: |
+            SIMTOOLS_BRANCH=${{ env.SIMTOOLS_BRANCH }}
+            CORSIKA_IMAGE_VERSION=${{ env.CORSIKA_IMAGE_VERSION }}
+            SIMTEL_IMAGE_VERSION=${{ env.SIMTEL_IMAGE_VERSION }}
+            AVX_FLAG=${{ env.AVX_FLAG }}
           push: ${{ github.event_name == 'release' || github.ref == 'refs/heads/main' || github.event_name == 'workflow_dispatch' }}
           file: ./docker/Dockerfile-simtools-dev
           tags: ${{ steps.meta.outputs.tags }}

{gammasimtools-0.26.0 → gammasimtools-0.27.1}/.github/workflows/build-simtools-legacy.yml

@@ -2,20 +2,10 @@
 name: build-simtools-legacy
 # **legacy build** - will be deprecated in near future
 # Build and push simtools images using CORSIKA / sim_telarray base images.
-# Integration tests are running on the non-optimized ('no_opt') images.
+# Integration tests are running on the generic (non-vector-optimized) images.
 
 on:
   workflow_dispatch:
-  workflow_run:
-    workflows: ["build-corsika-simtel"]
-    types: [completed]
-  pull_request:
-    paths:
-      - docker/Dockerfile-simtools-legacy
-  release:
-    types: [published]
-  schedule:
-    - cron: '0 1 * * 0'  # Every Sunday at 01:00 UTC (1 hour after base images)
 
 env:
   REGISTRY: ghcr.io
@@ -31,12 +21,12 @@ jobs:
       matrix:
         version:
           # list of avx instructions: 'avx2', 'avx512f', 'sse4', 'avx'
-          - {simtel_version: '240205', corsika_version: '77500', bernlohr_version: '1.67', hadronic_model: 'qgs2', avx_flag: 'no_opt'}
-          - {simtel_version: '240927', corsika_version: '77550', bernlohr_version: '1.68', hadronic_model: 'qgs2', avx_flag: 'no_opt'}
+          - {simtel_version: '240205', corsika_version: '77500', bernlohr_version: '1.67', hadronic_model: 'qgs2', avx_flag: 'generic'}
+          - {simtel_version: '240927', corsika_version: '77550', bernlohr_version: '1.68', hadronic_model: 'qgs2', avx_flag: 'generic'}
           - {simtel_version: '240927', corsika_version: '77550', bernlohr_version: '1.68', hadronic_model: 'qgs2', avx_flag: 'avx2'}
           - {simtel_version: '240927', corsika_version: '77550', bernlohr_version: '1.68', hadronic_model: 'qgs2', avx_flag: 'avx512f'}
           - {simtel_version: '240927', corsika_version: '77550', bernlohr_version: '1.68', hadronic_model: 'qgs2', avx_flag: 'sse4'}
-          - {simtel_version: '250903', corsika_version: '78010', bernlohr_version: '1.70', hadronic_model: 'qgs3', avx_flag: 'no_opt'}
+          - {simtel_version: '250903', corsika_version: '78010', bernlohr_version: '1.70', hadronic_model: 'qgs3', avx_flag: 'generic'}
           - {simtel_version: '250903', corsika_version: '78010', bernlohr_version: '1.70', hadronic_model: 'qgs3', avx_flag: 'avx2'}
           - {simtel_version: '250903', corsika_version: '78010', bernlohr_version: '1.70', hadronic_model: 'qgs3', avx_flag: 'avx512f'}
           - {simtel_version: '250903', corsika_version: '78010', bernlohr_version: '1.70', hadronic_model: 'qgs3', avx_flag: 'sse4'}
@@ -103,10 +93,10 @@ jobs:
       matrix:
         version:
           # list of avx instructions: 'avx2', 'avx512f', 'sse4', 'avx'
-          - {simtel_version: '240205', corsika_version: '77500', bernlohr_version: '1.67', hadronic_model: 'qgs2', avx_flag: 'no_opt'}
-          - {simtel_version: '240927', corsika_version: '77550', bernlohr_version: '1.68', hadronic_model: 'qgs2', avx_flag: 'no_opt'}
+          - {simtel_version: '240205', corsika_version: '77500', bernlohr_version: '1.67', hadronic_model: 'qgs2', avx_flag: 'generic'}
+          - {simtel_version: '240927', corsika_version: '77550', bernlohr_version: '1.68', hadronic_model: 'qgs2', avx_flag: 'generic'}
           - {simtel_version: '240927', corsika_version: '77550', bernlohr_version: '1.68', hadronic_model: 'qgs2', avx_flag: 'avx2'}
-          - {simtel_version: '250903', corsika_version: '78010', bernlohr_version: '1.70', hadronic_model: 'qgs3', avx_flag: 'no_opt'}
+          - {simtel_version: '250903', corsika_version: '78010', bernlohr_version: '1.70', hadronic_model: 'qgs3', avx_flag: 'generic'}
           - {simtel_version: '250903', corsika_version: '78010', bernlohr_version: '1.70', hadronic_model: 'qgs3', avx_flag: 'avx2'}
         production:
           # list of productions build options: 'prod6-sc', 'prod6-baseline', 'prod5', 'prod5-sc'

{gammasimtools-0.26.0 → gammasimtools-0.27.1}/.github/workflows/build-simtools-prod.yml

@@ -1,6 +1,6 @@
 ---
 name: build-simtools-prod
-# Build simtools production images based on CORSIKA / sim_telarray images
+# Build simtools images for production based on CORSIKA / sim_telarray images.
 
 on:
   workflow_dispatch:
@@ -23,17 +23,14 @@ jobs:
       contents: read
       packages: write
     outputs:
-      no_opt_tag: ${{ steps.export-tags.outputs.no_opt_tag }}
+      generic_tag: ${{ steps.export-tags.outputs.generic_tag }}
     strategy:
       matrix:
-        version:
-          - {corsika: '20251217-78010', avx_flag: 'no_opt', simtel_image: 'latest'}
-          - {corsika: '20251217-78010', avx_flag: 'avx2', simtel_image: 'latest'}
-          - {corsika: '20251217-78010', avx_flag: 'avx512f', simtel_image: 'latest'}
-          - {corsika: '20251217-78010', avx_flag: 'sse4', simtel_image: 'latest'}
+        corsika: ['v78010']
+        sim_telarray: ['v2025-11-30-rc']
+        avx_flag: ['generic', 'avx2', 'avx512f', 'sse4']
     env:
       BASE_LABEL: "simtools-prod"
-      BASE_TAG: "corsika-${{ matrix.version.corsika }}-${{ matrix.version.avx_flag }}-simtel-${{ matrix.version.simtel_image }}"
 
     steps:
       - name: Checkout repository
@@ -46,7 +43,7 @@ jobs:
           else
             echo "SIMTOOLS_BRANCH=${GITHUB_REF#refs/heads/}" >> "$GITHUB_ENV"
           fi
-          echo "BUILD BRANCH ${{ env.SIMTOOLS_BRANCH }}"
+          echo "BUILD BRANCH $SIMTOOLS_BRANCH"
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
@@ -62,34 +59,36 @@ jobs:
         id: meta
         uses: docker/metadata-action@v5
         with:
-          tags: |
-            type=ref,event=pr,suffix=-${{ env.BASE_TAG }}
-            type=semver,pattern={{major}}.{{minor}}.{{patch}}-${{ env.BASE_TAG }}
-            type=schedule,pattern={{date 'YYYYMMDD'}}-${{ env.BASE_TAG }}
-            type=raw,value={{date 'YYYYMMDD'}}-${{ env.BASE_TAG }}
           images: ${{ env.REGISTRY }}/gammasim/${{ env.BASE_LABEL }}
-          flavor: latest=false
+          flavor: |
+            latest=false
+            suffix=-${{ matrix.corsika }}-${{ matrix.sim_telarray }}-${{ matrix.avx_flag }}
+          tags: |
+            type=ref,event=pr
+            type=semver,pattern=v{{major}}.{{minor}}.{{patch}}
+            type=schedule,pattern={{date 'YYYYMMDD'}}
+            type=raw,value={{date 'YYYYMMDD'}}
 
-      - name: Export no_opt tag for testing
+      - name: Export generic tag for testing
         id: export-tags
-        if: matrix.version.avx_flag == 'no_opt'
+        if: matrix.avx_flag == 'generic'
         run: |
           TAG=$(echo "${{ steps.meta.outputs.tags }}" | head -n1)
           TAG=${TAG##*:}
-          echo "no_opt_tag=$TAG" >> "$GITHUB_OUTPUT"
-          echo "Exported no_opt tag: $TAG"
+          echo "generic_tag=$TAG" >> "$GITHUB_OUTPUT"
+          echo "Exported generic tag: $TAG"
 
       - name: Build and push
         uses: docker/build-push-action@v6
         with:
           context: .
-          platforms: ${{ matrix.version.avx_flag == 'no_opt' && 'linux/amd64,linux/arm64/v8' || 'linux/amd64' }}
+          platforms: ${{ matrix.avx_flag == 'generic' && 'linux/amd64,linux/arm64/v8' || 'linux/amd64' }}
           build-args: |
-            CORSIKA_IMAGE_VERSION=${{ matrix.version.corsika }}
-            SIMTEL_IMAGE_VERSION=${{ matrix.version.simtel_image }}
-            AVX_FLAG=${{ matrix.version.avx_flag }}
+            CORSIKA_IMAGE_VERSION=${{ matrix.corsika }}
+            SIMTEL_IMAGE_VERSION=${{ matrix.sim_telarray }}
+            AVX_FLAG=${{ matrix.avx_flag }}
             SIMTOOLS_BRANCH=${{ env.SIMTOOLS_BRANCH }}
-          push: ${{ github.event_name == 'release' || github.ref == 'refs/heads/main' || github.event_name == 'workflow_dispatch' || github.event_name == 'pull_request' }}
+          push: ${{ github.event_name == 'release' || github.ref == 'refs/heads/main' || github.event_name == 'workflow_dispatch' }}
           file: ./docker/Dockerfile-simtools-prod
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
@@ -98,8 +97,9 @@ jobs:
     permissions:
       contents: read
     needs: build-simtools-prod
+    if: ${{ github.event_name == 'release' || github.ref == 'refs/heads/main' || github.event_name == 'workflow_dispatch' }}
     uses: ./.github/workflows/CI-integrationtests.yml
     secrets: inherit
     with:
-      container_image: ghcr.io/gammasim/simtools-prod:${{ needs.build-simtools-prod.outputs.no_opt_tag }}
+      container_image: ghcr.io/gammasim/simtools-prod:${{ needs.build-simtools-prod.outputs.generic_tag }}
       model_versions: '["7.0.0","6.0.2"]'

{gammasimtools-0.26.0 → gammasimtools-0.27.1}/.pre-commit-config.yaml

@@ -2,7 +2,7 @@
 repos:
 # Ruff
 - repo: https://github.com/astral-sh/ruff-pre-commit
-  rev: v0.14.10
+  rev: v0.14.14
   hooks:
   - id: ruff
     args: ["--fix"]
@@ -46,7 +46,7 @@ repos:
   - id: actionlint
 # https://pyproject-fmt.readthedocs.io/en/latest/
 - repo: https://github.com/tox-dev/pyproject-fmt
-  rev: "v2.11.1"
+  rev: "v2.12.0"
   hooks:
   - id: pyproject-fmt
 # codespell
@@ -63,7 +63,7 @@ repos:
     language_version: 22.11.0
 # yamllint
 - repo: https://github.com/adrienverge/yamllint.git
-  rev: v1.37.1
+  rev: v1.38.0
   hooks:
   - id: yamllint
     args: