From 0c0fa9dfab16cba2d8bfd25cfde3fb1e4a3643f0 Mon Sep 17 00:00:00 2001
From: Alvaro Tolosa Delgado <alvaro.tolosa.delgado@cern.ch>
Date: Tue, 6 Aug 2024 16:37:30 +0200
Subject: [PATCH 1/9] comment include of DRC in IDEA o1 v3

---
 FCCee/IDEA/compact/IDEA_o1_v03/IDEA_o1_v03.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/FCCee/IDEA/compact/IDEA_o1_v03/IDEA_o1_v03.xml b/FCCee/IDEA/compact/IDEA_o1_v03/IDEA_o1_v03.xml
index 341278a13..949c55eb7 100644
--- a/FCCee/IDEA/compact/IDEA_o1_v03/IDEA_o1_v03.xml
+++ b/FCCee/IDEA/compact/IDEA_o1_v03/IDEA_o1_v03.xml
@@ -61,7 +61,8 @@
   <include ref="EndPlateAbsorber_o1_v01.xml"/>
 
   <!-- Import fiber-based dual-readout calorimeter -->
-  <include ref="FiberDualReadoutCalo_o1_v01.xml"/>
+  <!-- (uncomment the following line to effectively include it) -->
+  <!--  <include ref="FiberDualReadoutCalo_o1_v01.xml"/> -->
 
   <!-- Import muon system -->
   <include ref="MuonSystem_o1_v01.xml"/>

From dca19c6d5b3dd3c6ec77dece442bde187ee1f6bc Mon Sep 17 00:00:00 2001
From: Alvaro Tolosa Delgado <alvaro.tolosa.delgado@cern.ch>
Date: Tue, 6 Aug 2024 16:53:36 +0200
Subject: [PATCH 2/9] IDEA with DRC dedicated test added

---
 test/CMakeLists.txt                  | 10 +++
 test/compact/IDEA_withDRC_o1_v03.xml | 99 ++++++++++++++++++++++++++++
 2 files changed, 109 insertions(+)
 create mode 100644 test/compact/IDEA_withDRC_o1_v03.xml

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 9736cbda6..36e3d6d9f 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -95,6 +95,16 @@ ADD_TEST( t_${test_name} "${CMAKE_INSTALL_PREFIX}/bin/run_test_${PackageName}.sh
     SET_TESTS_PROPERTIES( t_${test_name} PROPERTIES FAIL_REGULAR_EXPRESSION  " Exception; EXCEPTION;ERROR;Error" TIMEOUT 700)
 endif()
 
+#--------------------------------------------------
+# test for IDEA o1 v03, with DRC
+if(DCH_INFO_H_EXIST)
+SET( test_name "test_IDEA_with_DRC_o1_v03" )
+ADD_TEST( t_${test_name} "${CMAKE_INSTALL_PREFIX}/bin/run_test_${PackageName}.sh"
+    ddsim --compactFile=${CMAKE_CURRENT_SOURCE_DIR}/compact/IDEA_withDRC_o1_v03.xml --steeringFile=${CMAKE_CURRENT_SOURCE_DIR}/../example/SteeringFile_IDEA_o1_v03.py --gun.direction "3 4 0")
+    SET_TESTS_PROPERTIES( t_${test_name} PROPERTIES FAIL_REGULAR_EXPRESSION  " Exception; EXCEPTION;ERROR;Error" TIMEOUT 1200)
+endif()
+
+
 #--------------------------------------------------
 # test for ALLEGRO o1 v02
 SET( test_name "test_ALLEGRO_o1_v02" )
diff --git a/test/compact/IDEA_withDRC_o1_v03.xml b/test/compact/IDEA_withDRC_o1_v03.xml
new file mode 100644
index 000000000..0cacefc40
--- /dev/null
+++ b/test/compact/IDEA_withDRC_o1_v03.xml
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<lccdd xmlns:compact="http://www.lcsim.org/schemas/compact/1.0"
+  xmlns:xs="http://www.w3.org/2001/XMLSchema"
+  xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/compact/1.0/compact.xsd">
+
+
+
+  <info name="IDEA_o1_v03"
+    title="FCCee IDEA detector geometry master file"
+    author="Niloufar Alipour Tehrani, vertex detector by Armin Ilg, DCH by Alvaro Tolosa-Delgado"
+    url="no"
+    status="development"
+    version="o1_v03">
+    <comment> 
+      Version o1_v03 of the IDEA detector
+    </comment>
+  </info>
+
+  <include ref="${DD4hepINSTALL}/DDDetectors/compact/detector_types.xml" />
+
+  <includes>
+    <gdmlFile  ref="elements_o1_v01.xml"/>
+    <gdmlFile  ref="materials_o1_v02.xml"/>
+  </includes>
+
+  <define>
+    <constant name="world_size" value="25*m"/>
+    <constant name="world_x" value="world_size"/>
+    <constant name="world_y" value="world_size"/>
+    <constant name="world_z" value="world_size"/>
+  </define>
+
+  <!-- Import dimensions -->
+  <include ref="DectDimensions_IDEA_o1_v03.xml"/>
+
+  <!-- Import accelerator components -->
+  <!-- shape based model of the beam pipe -->
+  <include ref="../../FCCee/MDI/compact/MDI_o1_v00/Beampipe_o4_v05.xml" />
+  <include ref="../../FCCee/MDI/compact/MDI_o1_v00/BeamInstrumentation_o1_v01.xml" />
+  <!-- engineered CAD model of the beam pipe -->
+  <!-- <include ref="../../../MDI/compact/MDI_o1_v01/Beampipe_CADimport_o1_v02.xml" /> -->
+  <!-- <include ref="../../../MDI/compact/MDI_o1_v01/BeamInstrumentation_o1_v01.xml"/> -->
+  <include ref="../../FCCee/IDEA/compact/IDEA_o1_v03/LumiCal_o1_v01.xml"/>
+
+  <!-- Import vertex -->
+  <include ref="../../FCCee/IDEA/compact/IDEA_o1_v03/Vertex_IDEA_o1_v01.xml"/>
+
+  <!-- Import drift chamber -->
+  <include ref="../../FCCee/IDEA/compact/IDEA_o1_v03/DriftChamber_o1_v02.xml"/>
+
+  <!-- Import silicon wrapper -->
+  <!-- <include ref="SiliconWrapper_o1_v01.xml"/> -->
+
+  <!-- Import solenoid -->
+  <include ref="../../FCCee/IDEA/compact/IDEA_o1_v03/Solenoid_o1_v01.xml"/>
+
+  <!-- Import Endcap plate absorber -->
+  <include ref="../../FCCee/IDEA/compact/IDEA_o1_v03/EndPlateAbsorber_o1_v01.xml"/>
+
+  <!-- Import fiber-based dual-readout calorimeter -->
+  <!-- (uncomment the following line to effectively include it) -->
+  <include ref="../../FCCee/IDEA/compact/IDEA_o1_v03/FiberDualReadoutCalo_o1_v01.xml"/>
+
+  <!-- Import muon system -->
+  <include ref="../../FCCee/IDEA/compact/IDEA_o1_v03/MuonSystem_o1_v01.xml"/>
+
+  <plugins>
+    <plugin name="DD4hepVolumeManager"/>
+    <plugin name="InstallSurfaceManager"/>
+  </plugins>
+
+  <fields>
+    <!-- FIXME The magnetic field should be a map derived from FEM tools including all field sources, the return yoke geometry, etc -->
+    <!-- Currently the outer field value is kind of arbitrary and it will also impregnate the calorimeter volume while the field there is very small -->
+    <field name="GlobalSolenoid" type="solenoid"
+           inner_field="SolenoidField"
+           outer_field="-1.7*tesla"
+           zmax="Solenoid_Coil_half_length"
+           outer_radius="Solenoid_Coil_radius">
+    </field>
+
+    <field name="CompensatingSolenoidZplus" type="solenoid"
+           inner_field="-SolenoidField -SolenoidField * QD0_min_z / ( QD0_min_z - CompSol_min_z)"
+           outer_field="0*tesla"
+           zmax="QD0_min_z"
+           zmin="CompSol_min_z"
+           outer_radius="20*cm">
+    </field>
+
+    <field name="CompensatingSolenoidZminus" type="solenoid"
+           inner_field="-SolenoidField -SolenoidField * QD0_min_z / ( QD0_min_z - CompSol_min_z)"
+           outer_field="0*tesla"
+           zmin="-QD0_min_z"
+           zmax="-CompSol_min_z"
+           outer_radius="20*cm">
+    </field>
+  </fields>
+
+</lccdd>

From e5d7f86bf1ca0b9888a1b089baae5c7f388dc026 Mon Sep 17 00:00:00 2001
From: Alvaro Tolosa Delgado <alvaro.tolosa.delgado@cern.ch>
Date: Tue, 6 Aug 2024 18:03:44 +0200
Subject: [PATCH 3/9] fix IDEA with DRC test

---
 test/CMakeLists.txt                  | 2 +-
 test/compact/IDEA_withDRC_o1_v03.xml | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 36e3d6d9f..834175cfb 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -100,7 +100,7 @@ endif()
 if(DCH_INFO_H_EXIST)
 SET( test_name "test_IDEA_with_DRC_o1_v03" )
 ADD_TEST( t_${test_name} "${CMAKE_INSTALL_PREFIX}/bin/run_test_${PackageName}.sh"
-    ddsim --compactFile=${CMAKE_CURRENT_SOURCE_DIR}/compact/IDEA_withDRC_o1_v03.xml --steeringFile=${CMAKE_CURRENT_SOURCE_DIR}/../example/SteeringFile_IDEA_o1_v03.py --gun.direction "3 4 0")
+	"ddsim --compactFile=${CMAKE_CURRENT_SOURCE_DIR}/compact/IDEA_withDRC_o1_v03.xml --steeringFile=${CMAKE_CURRENT_SOURCE_DIR}/../example/SteeringFile_IDEA_o1_v03.py --gun.direction '(3,4,0)'")
     SET_TESTS_PROPERTIES( t_${test_name} PROPERTIES FAIL_REGULAR_EXPRESSION  " Exception; EXCEPTION;ERROR;Error" TIMEOUT 1200)
 endif()
 
diff --git a/test/compact/IDEA_withDRC_o1_v03.xml b/test/compact/IDEA_withDRC_o1_v03.xml
index 0cacefc40..22ab501bb 100644
--- a/test/compact/IDEA_withDRC_o1_v03.xml
+++ b/test/compact/IDEA_withDRC_o1_v03.xml
@@ -19,8 +19,8 @@
   <include ref="${DD4hepINSTALL}/DDDetectors/compact/detector_types.xml" />
 
   <includes>
-    <gdmlFile  ref="elements_o1_v01.xml"/>
-    <gdmlFile  ref="materials_o1_v02.xml"/>
+    <gdmlFile  ref="../../FCCee/IDEA/compact/IDEA_o1_v03/elements_o1_v01.xml"/>
+    <gdmlFile  ref="../../FCCee/IDEA/compact/IDEA_o1_v03/materials_o1_v02.xml"/>
   </includes>
 
   <define>
@@ -31,7 +31,7 @@
   </define>
 
   <!-- Import dimensions -->
-  <include ref="DectDimensions_IDEA_o1_v03.xml"/>
+  <include ref="../../FCCee/IDEA/compact/IDEA_o1_v03/DectDimensions_IDEA_o1_v03.xml"/>
 
   <!-- Import accelerator components -->
   <!-- shape based model of the beam pipe -->

From 201a34d443c75f02f9b79962496c13b57502b0e0 Mon Sep 17 00:00:00 2001
From: Alvaro Tolosa Delgado <alvaro.tolosa.delgado@cern.ch>
Date: Tue, 6 Aug 2024 18:16:19 +0200
Subject: [PATCH 4/9] apply other SD action to DRC

---
 test/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 834175cfb..da518f8f1 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -100,7 +100,7 @@ endif()
 if(DCH_INFO_H_EXIST)
 SET( test_name "test_IDEA_with_DRC_o1_v03" )
 ADD_TEST( t_${test_name} "${CMAKE_INSTALL_PREFIX}/bin/run_test_${PackageName}.sh"
-	"ddsim --compactFile=${CMAKE_CURRENT_SOURCE_DIR}/compact/IDEA_withDRC_o1_v03.xml --steeringFile=${CMAKE_CURRENT_SOURCE_DIR}/../example/SteeringFile_IDEA_o1_v03.py --gun.direction '(3,4,0)'")
+	"ddsim --compactFile=${CMAKE_CURRENT_SOURCE_DIR}/compact/IDEA_withDRC_o1_v03.xml --steeringFile=${CMAKE_CURRENT_SOURCE_DIR}/../example/SteeringFile_IDEA_o1_v03.py --gun.direction '(3,4,0)' --action.mapActions 'DRcalo, Geant4SimpleTrackerAction' )
     SET_TESTS_PROPERTIES( t_${test_name} PROPERTIES FAIL_REGULAR_EXPRESSION  " Exception; EXCEPTION;ERROR;Error" TIMEOUT 1200)
 endif()
 

From 862e47cab81c35a247ad3bbd524a4de836754ab9 Mon Sep 17 00:00:00 2001
From: Alvaro Tolosa Delgado <alvaro.tolosa.delgado@cern.ch>
Date: Tue, 6 Aug 2024 22:05:19 +0200
Subject: [PATCH 5/9] update IDEA README

---
 FCCee/IDEA/compact/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FCCee/IDEA/compact/README.md b/FCCee/IDEA/compact/README.md
index 74b045408..fed6cf941 100644
--- a/FCCee/IDEA/compact/README.md
+++ b/FCCee/IDEA/compact/README.md
@@ -19,4 +19,4 @@ v02). NB: production threshold and step limit physics have to be tuned for the d
 
 July 2024: Added a detailed version of the muon system.
 
-The monolithic fiber dual-readout calorimeter (o1, v01) is added.
+The monolithic fiber dual-readout calorimeter (o1, v01) is added to the directory, but commented in the main file IDEA_o1_v03.xml for the sake of speed. Please remove the comments to include this calorimeter in the full IDEA detector. 

From b3e421baa53e3f06efbe53926ef659bff2313521 Mon Sep 17 00:00:00 2001
From: Alvaro Tolosa Delgado <alvaro.tolosa.delgado@cern.ch>
Date: Wed, 7 Aug 2024 09:24:15 +0200
Subject: [PATCH 6/9] still not working...

---
 test/CMakeLists.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index da518f8f1..9b6cecf95 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -100,7 +100,8 @@ endif()
 if(DCH_INFO_H_EXIST)
 SET( test_name "test_IDEA_with_DRC_o1_v03" )
 ADD_TEST( t_${test_name} "${CMAKE_INSTALL_PREFIX}/bin/run_test_${PackageName}.sh"
-	"ddsim --compactFile=${CMAKE_CURRENT_SOURCE_DIR}/compact/IDEA_withDRC_o1_v03.xml --steeringFile=${CMAKE_CURRENT_SOURCE_DIR}/../example/SteeringFile_IDEA_o1_v03.py --gun.direction '(3,4,0)' --action.mapActions 'DRcalo, Geant4SimpleTrackerAction' )
+	"ddsim --compactFile=/home/alvarotd/work/update_main_detectors_after_DRC/k4geo/test/compact/IDEA_withDRC_o1_v03.xml --steeringFile=/home/alvarotd/work/update_main_detectors_after_DRC/k4geo/test/../example/SteeringFile_IDEA_o1_v03.py --gun.direction '(3,4,0)'
+ " )
     SET_TESTS_PROPERTIES( t_${test_name} PROPERTIES FAIL_REGULAR_EXPRESSION  " Exception; EXCEPTION;ERROR;Error" TIMEOUT 1200)
 endif()
 

From 4af1055e326066062c27af327004c1a6b5c1f698 Mon Sep 17 00:00:00 2001
From: Alvaro Tolosa Delgado <alvaro.tolosa.delgado@cern.ch>
Date: Wed, 7 Aug 2024 09:46:03 +0200
Subject: [PATCH 7/9] replace absolute path by cmake variables in ctest

---
 test/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 9b6cecf95..fee7ac608 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -100,7 +100,7 @@ endif()
 if(DCH_INFO_H_EXIST)
 SET( test_name "test_IDEA_with_DRC_o1_v03" )
 ADD_TEST( t_${test_name} "${CMAKE_INSTALL_PREFIX}/bin/run_test_${PackageName}.sh"
-	"ddsim --compactFile=/home/alvarotd/work/update_main_detectors_after_DRC/k4geo/test/compact/IDEA_withDRC_o1_v03.xml --steeringFile=/home/alvarotd/work/update_main_detectors_after_DRC/k4geo/test/../example/SteeringFile_IDEA_o1_v03.py --gun.direction '(3,4,0)'
+	"ddsim --compactFile=${CMAKE_CURRENT_SOURCE_DIR}/compact/IDEA_withDRC_o1_v03.xml --steeringFile=${CMAKE_CURRENT_SOURCE_DIR}/../example/SteeringFile_IDEA_o1_v03.py --gun.direction '(3,4,0)'
  " )
     SET_TESTS_PROPERTIES( t_${test_name} PROPERTIES FAIL_REGULAR_EXPRESSION  " Exception; EXCEPTION;ERROR;Error" TIMEOUT 1200)
 endif()

From ce919678120478b13eeeda0f252e505db572ab8d Mon Sep 17 00:00:00 2001
From: Alvaro Tolosa Delgado <alvaro.tolosa.delgado@cern.ch>
Date: Wed, 7 Aug 2024 18:16:53 +0200
Subject: [PATCH 8/9] fix test_IDEA_o1_v03 by removing DRC steering file

---
 test/CMakeLists.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index fee7ac608..2f204c468 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -91,8 +91,8 @@ SET_TESTS_PROPERTIES( t_${test_name} PROPERTIES FAIL_REGULAR_EXPRESSION  "Except
 if(DCH_INFO_H_EXIST)
 SET( test_name "test_IDEA_o1_v03" )
 ADD_TEST( t_${test_name} "${CMAKE_INSTALL_PREFIX}/bin/run_test_${PackageName}.sh"
-    ddsim --compactFile=${CMAKE_CURRENT_SOURCE_DIR}/../FCCee/IDEA/compact/IDEA_o1_v03/IDEA_o1_v03.xml --steeringFile=${CMAKE_CURRENT_SOURCE_DIR}/../example/SteeringFile_IDEA_o1_v03.py )
-    SET_TESTS_PROPERTIES( t_${test_name} PROPERTIES FAIL_REGULAR_EXPRESSION  " Exception; EXCEPTION;ERROR;Error" TIMEOUT 700)
+    ddsim --compactFile=${CMAKE_CURRENT_SOURCE_DIR}/../FCCee/IDEA/compact/IDEA_o1_v03/IDEA_o1_v03.xml -N 1 -G --gun.distribution uniform --random.seed 1988301045 )
+    SET_TESTS_PROPERTIES( t_${test_name} PROPERTIES FAIL_REGULAR_EXPRESSION  " Exception; EXCEPTION;ERROR;Error" TIMEOUT 100)
 endif()
 
 #--------------------------------------------------

From d45c44260054f17393da35ddf25a1a1ce8243308 Mon Sep 17 00:00:00 2001
From: Alvaro Tolosa Delgado <alvaro.tolosa.delgado@cern.ch>
Date: Wed, 7 Aug 2024 18:26:16 +0200
Subject: [PATCH 9/9] IDEA+DRC test is now working

---
 test/CMakeLists.txt | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 2f204c468..5ba8150b8 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -100,9 +100,8 @@ endif()
 if(DCH_INFO_H_EXIST)
 SET( test_name "test_IDEA_with_DRC_o1_v03" )
 ADD_TEST( t_${test_name} "${CMAKE_INSTALL_PREFIX}/bin/run_test_${PackageName}.sh"
-	"ddsim --compactFile=${CMAKE_CURRENT_SOURCE_DIR}/compact/IDEA_withDRC_o1_v03.xml --steeringFile=${CMAKE_CURRENT_SOURCE_DIR}/../example/SteeringFile_IDEA_o1_v03.py --gun.direction '(3,4,0)'
- " )
-    SET_TESTS_PROPERTIES( t_${test_name} PROPERTIES FAIL_REGULAR_EXPRESSION  " Exception; EXCEPTION;ERROR;Error" TIMEOUT 1200)
+	ddsim --compactFile=${CMAKE_CURRENT_SOURCE_DIR}/compact/IDEA_withDRC_o1_v03.xml --steeringFile=${CMAKE_CURRENT_SOURCE_DIR}/../example/SteeringFile_IDEA_o1_v03.py -G --gun.distribution uniform --random.seed 1988301045 )
+    SET_TESTS_PROPERTIES( t_${test_name} PROPERTIES FAIL_REGULAR_EXPRESSION  " Exception; EXCEPTION;ERROR;Error" TIMEOUT 600)
 endif()