From d2a20ac1c7de4492cb6237040c9de41fdda64c44 Mon Sep 17 00:00:00 2001
From: Juan Miguel Carceller <jmcarcell@users.noreply.github.com>
Date: Tue, 2 Sep 2025 21:35:45 +0200
Subject: [PATCH 1/2] Fix tests by not using run_test_k4geo that has been
 removed

Removed in 83be0f3c5c5e794beab1ddb556f19a04aef53ab1
---
 Tests/CMakeLists.txt | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 6211527..c2a0483 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -1,7 +1,6 @@
 SET( test_name "test_CLIC_o2_v04_sim" )
 ADD_TEST( NAME t_${test_name}
-  COMMAND "run_test_k4geo.sh"
-  ddsim --compactFile=$ENV{lcgeo_DIR}/CLIC/compact/CLIC_o2_v04/CLIC_o2_v04.xml --runType=batch -G -N=100 --outputFile=testCLIC_o2_v04.slcio --gun.isotrop=true --steeringFile=${CMAKE_CURRENT_SOURCE_DIR}/../clicConfig/clic_steer.py
+  COMMAND ddsim --compactFile=$ENV{lcgeo_DIR}/CLIC/compact/CLIC_o2_v04/CLIC_o2_v04.xml --runType=batch -G -N=100 --outputFile=testCLIC_o2_v04.slcio --gun.isotrop=true --steeringFile=${CMAKE_CURRENT_SOURCE_DIR}/../clicConfig/clic_steer.py
   WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../clicConfig/ CONFIGURATIONS o2_v04
   )
 SET_TESTS_PROPERTIES( t_${test_name} PROPERTIES FAIL_REGULAR_EXPRESSION  "Exception;EXCEPTION;ERROR;Error" )
@@ -77,8 +76,7 @@ SET(EOS_BACKGROUND_FILE /eos/experiment/clicdp/grid/ilc/prod/clic/3tev/gghad/CLI
 SET(CLIC_DETECTOR_MODEL CLIC_o3_v14)
 SET( test_name "test_${CLIC_DETECTOR_MODEL}_sim" )
 ADD_TEST( NAME t_${test_name}
-  COMMAND "run_test_k4geo.sh"
-  ddsim
+  COMMAND ddsim
   --compactFile=$ENV{lcgeo_DIR}/CLIC/compact/${CLIC_DETECTOR_MODEL}/${CLIC_DETECTOR_MODEL}.xml
   --runType=batch --inputFile ../Tests/yyxyev_000.stdhep -N 2
   --outputFile=test${CLIC_DETECTOR_MODEL}.slcio
@@ -232,8 +230,7 @@ SET_TESTS_PROPERTIES( t_${test_name} PROPERTIES FAIL_REGULAR_EXPRESSION  "Except
 
 SET( test_name "test_${CLIC_DETECTOR_MODEL}_sim_zuds" )
 ADD_TEST( NAME t_${test_name}
-  COMMAND "run_test_k4geo.sh"
-  ddsim
+  COMMAND ddsim
   --compactFile=$ENV{lcgeo_DIR}/CLIC/compact/${CLIC_DETECTOR_MODEL}/${CLIC_DETECTOR_MODEL}.xml
   --runType=batch -N=4
   --outputFile=test${CLIC_DETECTOR_MODEL}_zuds.slcio
@@ -440,8 +437,7 @@ SET_TESTS_PROPERTIES( t_${test_name} PROPERTIES
 SET(FCCee_DETECTOR_MODEL FCCee_o1_v04)
 SET( test_name "test_${FCCee_DETECTOR_MODEL}_sim" )
 ADD_TEST( NAME t_${test_name}
-  COMMAND "run_test_k4geo.sh"
-  ddsim --compactFile=$ENV{lcgeo_DIR}/FCCee/CLD/compact/${FCCee_DETECTOR_MODEL}/${FCCee_DETECTOR_MODEL}.xml
+  COMMAND ddsim --compactFile=$ENV{lcgeo_DIR}/FCCee/CLD/compact/${FCCee_DETECTOR_MODEL}/${FCCee_DETECTOR_MODEL}.xml
   --runType=batch --inputFiles ../Tests/yyxyev_000.stdhep -N 2
   --outputFile=test${FCCee_DETECTOR_MODEL}.slcio --gun.isotrop=true --steeringFile=${CMAKE_CURRENT_SOURCE_DIR}/../fcceeConfig/fcc_steer.py
   WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../fcceeConfig/

From a285ae4057b4b7c742b5dac11c1d0109ed5412c1 Mon Sep 17 00:00:00 2001
From: Juan Miguel Carceller <jmcarcell@users.noreply.github.com>
Date: Tue, 2 Sep 2025 22:21:04 +0200
Subject: [PATCH 2/2] Add --physics.ESeverity IgnoreTheIssue to some tests to
 ignore mass issues

See https://github.com/AIDASoft/DD4hep/issues/1475
---
 Tests/CMakeLists.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index c2a0483..c56252b 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -82,6 +82,7 @@ ADD_TEST( NAME t_${test_name}
   --outputFile=test${CLIC_DETECTOR_MODEL}.slcio
   --gun.isotrop=true
   --steeringFile=${CMAKE_CURRENT_SOURCE_DIR}/../clicConfig/clic_steer.py
+  --physics.ESeverity IgnoreTheIssue
   WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../clicConfig/
   )
 SET_TESTS_PROPERTIES( t_${test_name} PROPERTIES FAIL_REGULAR_EXPRESSION  "Exception;EXCEPTION;ERROR;Error" )
@@ -440,6 +441,7 @@ ADD_TEST( NAME t_${test_name}
   COMMAND ddsim --compactFile=$ENV{lcgeo_DIR}/FCCee/CLD/compact/${FCCee_DETECTOR_MODEL}/${FCCee_DETECTOR_MODEL}.xml
   --runType=batch --inputFiles ../Tests/yyxyev_000.stdhep -N 2
   --outputFile=test${FCCee_DETECTOR_MODEL}.slcio --gun.isotrop=true --steeringFile=${CMAKE_CURRENT_SOURCE_DIR}/../fcceeConfig/fcc_steer.py
+  --physics.ESeverity IgnoreTheIssue
   WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../fcceeConfig/
   )
 SET_TESTS_PROPERTIES( t_${test_name} PROPERTIES