From b99cfa0ec3b029d46554e099e6370e6ae241f762 Mon Sep 17 00:00:00 2001
From: Juraj Smiesko <34742917+kjvbrt@users.noreply.github.com>
Date: Wed, 24 Jan 2024 14:35:48 +0100
Subject: [PATCH] Using K4GEO detectors in tests (#63)

* Using K4GEO detectors in tests

* Adjusting test CI
---
 .github/workflows/build-and-test.yaml                     | 8 ++++++--
 .../tests/options/fcc_ee_caloBenchmarkCalibration.py      | 4 ++--
 RecFCCeeCalorimeter/tests/options/reproduceSegfault.py    | 4 ++--
 RecFCCeeCalorimeter/tests/options/runCaloSim.py           | 4 ++--
 .../runFullCaloSystem_ReconstructionSW_noiseFromFile.py   | 4 ++--
 5 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/build-and-test.yaml b/.github/workflows/build-and-test.yaml
index 49206ae3..c7be0651 100644
--- a/.github/workflows/build-and-test.yaml
+++ b/.github/workflows/build-and-test.yaml
@@ -7,8 +7,12 @@ jobs:
       fail-fast: false
       matrix:
         STACK: ['/cvmfs/sw-nightlies.hsf.org/key4hep/setup.sh',
-                '/cvmfs/sw.hsf.org/key4hep/setup.sh']
-        OS: ['aidasoft/centos7', 'key4hep/key4hep-images/alma9']
+                # '/cvmfs/sw.hsf.org/key4hep/setup.sh'
+        ]
+        OS: ['aidasoft/centos7',
+             'key4hep/key4hep-images/alma9',
+             'key4hep/key4hep-images/ubuntu22'
+        ]
     steps:
     - uses: actions/checkout@v3
     - uses: cvmfs-contrib/github-action-cvmfs@v3
diff --git a/RecFCCeeCalorimeter/tests/options/fcc_ee_caloBenchmarkCalibration.py b/RecFCCeeCalorimeter/tests/options/fcc_ee_caloBenchmarkCalibration.py
index b842c201..766e78dd 100644
--- a/RecFCCeeCalorimeter/tests/options/fcc_ee_caloBenchmarkCalibration.py
+++ b/RecFCCeeCalorimeter/tests/options/fcc_ee_caloBenchmarkCalibration.py
@@ -20,9 +20,9 @@
 from Configurables import GeoSvc
 GEOSERVICE = GeoSvc("GeoSvc")
 # if FCC_DETECTORS is empty, this should use relative path to working directory
-DETECTORPATH = os.environ.get("FCCDETECTORS", "")
+DETECTORPATH = os.environ.get("K4GEO", "")
 DETECTORS = [
-    'Detector/DetFCCeeIDEA-LAr/compact/FCCee_DectMaster.xml',
+        'FCCee/ALLEGRO/compact/ALLEGRO_o1_v01/ALLEGRO_o1_v01.xml'
 ]
 for det in DETECTORS:
     GEOSERVICE.detectors += [os.path.join(DETECTORPATH, det)]
diff --git a/RecFCCeeCalorimeter/tests/options/reproduceSegfault.py b/RecFCCeeCalorimeter/tests/options/reproduceSegfault.py
index e6ca7dae..487ee72b 100644
--- a/RecFCCeeCalorimeter/tests/options/reproduceSegfault.py
+++ b/RecFCCeeCalorimeter/tests/options/reproduceSegfault.py
@@ -60,9 +60,9 @@
 from Configurables import GeoSvc
 geoservice = GeoSvc("GeoSvc")
 # if FCC_DETECTORS is empty, this should use relative path to working directory
-path_to_detectors = os.environ.get("FCCDETECTORS", "")
+path_to_detectors = os.environ.get("K4GEO", "")
 detectors = [
-    'Detector/DetFCCeeIDEA-LAr/compact/FCCee_DectMaster.xml',
+        'FCCee/ALLEGRO/compact/ALLEGRO_o1_v01/ALLEGRO_o1_v01.xml'
 ]
 # prefix all xmls with path_to_detectors
 for det in detectors:
diff --git a/RecFCCeeCalorimeter/tests/options/runCaloSim.py b/RecFCCeeCalorimeter/tests/options/runCaloSim.py
index ca67b283..22d585d2 100644
--- a/RecFCCeeCalorimeter/tests/options/runCaloSim.py
+++ b/RecFCCeeCalorimeter/tests/options/runCaloSim.py
@@ -46,9 +46,9 @@
 from Configurables import GeoSvc
 geoservice = GeoSvc("GeoSvc")
 # if FCC_DETECTORS is empty, this should use relative path to working directory
-path_to_detectors = os.environ.get("FCCDETECTORS", "")
+path_to_detectors = os.environ.get("K4GEO", "")
 detectors = [
-    'Detector/DetFCCeeIDEA-LAr/compact/FCCee_DectMaster.xml',
+        'FCCee/ALLEGRO/compact/ALLEGRO_o1_v01/ALLEGRO_o1_v01.xml'
 ]
 # prefix all xmls with path_to_detectors
 for det in detectors:
diff --git a/RecFCCeeCalorimeter/tests/options/runFullCaloSystem_ReconstructionSW_noiseFromFile.py b/RecFCCeeCalorimeter/tests/options/runFullCaloSystem_ReconstructionSW_noiseFromFile.py
index d5d513b2..c58b4002 100644
--- a/RecFCCeeCalorimeter/tests/options/runFullCaloSystem_ReconstructionSW_noiseFromFile.py
+++ b/RecFCCeeCalorimeter/tests/options/runFullCaloSystem_ReconstructionSW_noiseFromFile.py
@@ -23,9 +23,9 @@
 from Configurables import GeoSvc
 geoservice = GeoSvc("GeoSvc")
 # if FCC_DETECTORS is empty, this should use relative path to working directory
-path_to_detectors = os.environ.get("FCCDETECTORS", "")
+path_to_detectors = os.environ.get("K4GEO", "")
 detectors = [
-    'Detector/DetFCCeeIDEA-LAr/compact/FCCee_DectMaster.xml'
+        'FCCee/ALLEGRO/compact/ALLEGRO_o1_v01/ALLEGRO_o1_v01.xml'
 ]
 # prefix all xmls with path_to_detectors
 for det in detectors: