diff --git a/FCCee/ILD_FCCee/compact/ILD_FCCee_v01/ILD_FCCee_v01.xml b/FCCee/ILD_FCCee/compact/ILD_FCCee_v01/ILD_FCCee_v01.xml
new file mode 100644
index 000000000..0c159e67b
--- /dev/null
+++ b/FCCee/ILD_FCCee/compact/ILD_FCCee_v01/ILD_FCCee_v01.xml
@@ -0,0 +1,177 @@
+
+
+ experimental ILD simulation model for FCCee
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/FCCee/ILD_FCCee/compact/ILD_FCCee_v01/ILD_FCCee_v01_defs.xml b/FCCee/ILD_FCCee/compact/ILD_FCCee_v01/ILD_FCCee_v01_defs.xml
new file mode 100644
index 000000000..e0444bacd
--- /dev/null
+++ b/FCCee/ILD_FCCee/compact/ILD_FCCee_v01/ILD_FCCee_v01_defs.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
diff --git a/FCCee/ILD_FCCee/compact/ILD_FCCee_v01/InnerTrackerILD_o1_v02_00.xml b/FCCee/ILD_FCCee/compact/ILD_FCCee_v01/InnerTrackerILD_o1_v02_00.xml
new file mode 100644
index 000000000..bd8121151
--- /dev/null
+++ b/FCCee/ILD_FCCee/compact/ILD_FCCee_v01/InnerTrackerILD_o1_v02_00.xml
@@ -0,0 +1,544 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Tracking detectors
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Inner Tracker Assembly
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ${GlobalTrackerReadoutID}
+
+
+ ${GlobalTrackerReadoutID}
+
+
+
+
+
+
+
+
+
+ Silicon Inner Tracker Barrel
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Silicon Inner Tracker Endcaps
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 3.5959*cm = X0 for Carbon fibre
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ The next section is the cable for the vertex
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/FCCee/ILD_FCCee/compact/ILD_FCCee_v01/top_defs_ILD_FCCee_v01.xml b/FCCee/ILD_FCCee/compact/ILD_FCCee_v01/top_defs_ILD_FCCee_v01.xml
new file mode 100644
index 000000000..c21e861a1
--- /dev/null
+++ b/FCCee/ILD_FCCee/compact/ILD_FCCee_v01/top_defs_ILD_FCCee_v01.xml
@@ -0,0 +1,12 @@
+
+
+
+all hardcoded overall dimensions which differ between large and small models
+
+
+
+
+
+
+
+
diff --git a/FCCee/ILD_FCCee/compact/ILD_FCCee_v02/ILD_FCCee_v02.xml b/FCCee/ILD_FCCee/compact/ILD_FCCee_v02/ILD_FCCee_v02.xml
new file mode 100644
index 000000000..7c3cf258e
--- /dev/null
+++ b/FCCee/ILD_FCCee/compact/ILD_FCCee_v02/ILD_FCCee_v02.xml
@@ -0,0 +1,176 @@
+
+
+ experimental ILD simulation model for FCCee
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/FCCee/ILD_FCCee/compact/ILD_FCCee_v02/ILD_FCCee_v02_defs.xml b/FCCee/ILD_FCCee/compact/ILD_FCCee_v02/ILD_FCCee_v02_defs.xml
new file mode 100644
index 000000000..f6d289f93
--- /dev/null
+++ b/FCCee/ILD_FCCee/compact/ILD_FCCee_v02/ILD_FCCee_v02_defs.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
diff --git a/FCCee/ILD_FCCee/compact/ILD_FCCee_v02/top_defs_ILD_FCCee_v02.xml b/FCCee/ILD_FCCee/compact/ILD_FCCee_v02/top_defs_ILD_FCCee_v02.xml
new file mode 100644
index 000000000..255446701
--- /dev/null
+++ b/FCCee/ILD_FCCee/compact/ILD_FCCee_v02/top_defs_ILD_FCCee_v02.xml
@@ -0,0 +1,12 @@
+
+
+
+all hardcoded overall dimensions which differ between large and small models
+
+
+
+
+
+
+
+
diff --git a/FCCee/ILD_FCCee/compact/ILD_common_FCCee/FCCdefs_common.xml b/FCCee/ILD_FCCee/compact/ILD_common_FCCee/FCCdefs_common.xml
new file mode 100644
index 000000000..f1685c739
--- /dev/null
+++ b/FCCee/ILD_FCCee/compact/ILD_common_FCCee/FCCdefs_common.xml
@@ -0,0 +1,109 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/FCCee/ILD_FCCee/compact/ILD_common_FCCee/SEcal06_siw_ECRing.xml b/FCCee/ILD_FCCee/compact/ILD_common_FCCee/SEcal06_siw_ECRing.xml
new file mode 100644
index 000000000..58ccb80df
--- /dev/null
+++ b/FCCee/ILD_FCCee/compact/ILD_common_FCCee/SEcal06_siw_ECRing.xml
@@ -0,0 +1,83 @@
+
+
+
+
+ EM Calorimeter Endcap plugs for FCCee, has phi symmetry unlike at ILC
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ system:5,module:3,stave:4,tower:3,layer:6,x:32:-16,y:-16
+
+
+
+
+
+
+
diff --git a/FCCee/ILD_FCCee/compact/ILD_common_FCCee/basic_defs.xml b/FCCee/ILD_FCCee/compact/ILD_common_FCCee/basic_defs.xml
new file mode 100644
index 000000000..917010c7e
--- /dev/null
+++ b/FCCee/ILD_FCCee/compact/ILD_common_FCCee/basic_defs.xml
@@ -0,0 +1,44 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/FCCee/ILD_FCCee/compact/ILD_common_FCCee/envelope_defs.xml b/FCCee/ILD_FCCee/compact/ILD_common_FCCee/envelope_defs.xml
new file mode 100644
index 000000000..af833077d
--- /dev/null
+++ b/FCCee/ILD_FCCee/compact/ILD_common_FCCee/envelope_defs.xml
@@ -0,0 +1,97 @@
+
+
+
+
+
+ suggested naming convention:
+
+ main parameters:
+
+ DET_inner_radius : inner radius of tube like envelope ( inscribed cylinder )
+ DET_outer_radius : outer radius of tube like envelope ( inscribed cylinder )
+ DET_half_length : half length along z axis
+ DET_min_z : smallest absolute value on z-axis
+ DET_max_z : largest absolute value on z-axis
+ DET_inner_symmetry : number of sides on the inside ( 0 for tube )
+ DET_outer_symmetry : number of sides on the inside ( 0 for tube )
+ DET_inner_phi0 : optional rotation of the inner polygon ( in r-phi plane )
+ DET_outer_phi0 : optional rotation of the outer polygon ( in r-phi plane )
+
+ additional parameters for cutting away volumes/shapes use one of the above with a number
+ appended and/or an extra specifiaction such as cone ( for a cut away cone )
+
+ DET_inner_radius_1
+ DET_outer_radius_2
+ DET_cone_min_z
+ DET_cone_max_z
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/FCCee/ILD_FCCee/compact/ILD_common_v02 b/FCCee/ILD_FCCee/compact/ILD_common_v02
new file mode 120000
index 000000000..da51bb822
--- /dev/null
+++ b/FCCee/ILD_FCCee/compact/ILD_common_v02
@@ -0,0 +1 @@
+../../../ILD/compact/ILD_common_v02
\ No newline at end of file
diff --git a/FCCee/ILD_FCCee/compact/README.md b/FCCee/ILD_FCCee/compact/README.md
new file mode 100644
index 000000000..4e71fd7b8
--- /dev/null
+++ b/FCCee/ILD_FCCee/compact/README.md
@@ -0,0 +1,33 @@
+ILD models under FCCee/ILD_FCCee
+
+These are based on the ILC-specific models located under ILD/compact
+
+##########################
+# ILD_FCCee_v01
+#
+# D.Jeans, V.Schwan, Sep 2024
+##########################
+
+- experimental version of ILD for FCCee
+- based on ILD_l5_v02
+- vertex detector and lumiCal copied from CLD_o2_v07
+- inner silicon tracker adapted from CLD_o2_v07
+- TPC inner radius slightly larger than ILD_l5_v02 model (329 -> 365 mm) to keep 150 mrad cone clear for MDI
+- MDI taken from FCCee common MDI design
+- ECal ring removed
+- other subdetectors same as ILD_l5_v02
+
+##########################
+# ILD_FCCee_v02
+#
+# V.Schwan, D.Jeans, Sep 2024
+##########################
+
+- experimental version of ILD for FCCee
+- based on ILD_l5_v02
+- vertex detector, inner silicon tracker, lumiCal copied from CLD_o2_v07
+- TPC inner radius enlarged compared to ILD_l5_v02 model (329 -> 701 mm) to keep 5 mm safety distance from the outer radius of the inner tracker (696 mm)
+- MDI taken from FCCee common MDI design
+- ECal ring removed
+- other subdetectors same as ILD_l5_v02
+
diff --git a/ILD/compact/ILD_common_v02/BeamCal08.xml b/ILD/compact/ILD_common_v02/BeamCal08.xml
index 9563e85c0..60b5d63c6 100644
--- a/ILD/compact/ILD_common_v02/BeamCal08.xml
+++ b/ILD/compact/ILD_common_v02/BeamCal08.xml
@@ -5,7 +5,7 @@
-
@@ -97,20 +97,20 @@
-
+
-
-
-
-
+
+
+
+
-
-
-
-
-
+
+
+
+
+
diff --git a/ILD/compact/ILD_common_v02/Beampipe_o1_v01_01.xml b/ILD/compact/ILD_common_v02/Beampipe_o1_v01_01.xml
index 217e2e575..c5048af59 100644
--- a/ILD/compact/ILD_common_v02/Beampipe_o1_v01_01.xml
+++ b/ILD/compact/ILD_common_v02/Beampipe_o1_v01_01.xml
@@ -1,6 +1,13 @@
-
+
+
+
+
+
+
+
+
diff --git a/ILD/compact/ILD_common_v02/EcalBarrelFace_v00.xml b/ILD/compact/ILD_common_v02/EcalBarrelFace_v00.xml
index 99524c9b4..bc4a54957 100644
--- a/ILD/compact/ILD_common_v02/EcalBarrelFace_v00.xml
+++ b/ILD/compact/ILD_common_v02/EcalBarrelFace_v00.xml
@@ -1,4 +1,4 @@
-
+
Surfaces at the face of the Ecal Barrel
diff --git a/ILD/compact/ILD_common_v02/EcalEndcapFace_v00.xml b/ILD/compact/ILD_common_v02/EcalEndcapFace_v00.xml
index f70a6ad44..a9d7a2c26 100644
--- a/ILD/compact/ILD_common_v02/EcalEndcapFace_v00.xml
+++ b/ILD/compact/ILD_common_v02/EcalEndcapFace_v00.xml
@@ -1,4 +1,4 @@
-
+
Surfaces at the face of the Ecal Endcap
diff --git a/ILD/compact/ILD_common_v02/Hcal_Barrel_SD_v01.xml b/ILD/compact/ILD_common_v02/Hcal_Barrel_SD_v01.xml
index bfee3f1b9..d8a864ab1 100644
--- a/ILD/compact/ILD_common_v02/Hcal_Barrel_SD_v01.xml
+++ b/ILD/compact/ILD_common_v02/Hcal_Barrel_SD_v01.xml
@@ -1,7 +1,7 @@
-
+
Hadron Calorimeter Barrel
@@ -14,25 +14,25 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ILD/compact/ILD_common_v02/Hcal_Barrel_SD_v02.xml b/ILD/compact/ILD_common_v02/Hcal_Barrel_SD_v02.xml
index 057aa4813..af7f1d9e3 100644
--- a/ILD/compact/ILD_common_v02/Hcal_Barrel_SD_v02.xml
+++ b/ILD/compact/ILD_common_v02/Hcal_Barrel_SD_v02.xml
@@ -1,7 +1,7 @@
-
+
Hadron Calorimeter Barrel
@@ -14,25 +14,25 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ILD/compact/ILD_common_v02/Hcal_EndcapRing_SD_v01.xml b/ILD/compact/ILD_common_v02/Hcal_EndcapRing_SD_v01.xml
index ee89545a0..465ae9823 100644
--- a/ILD/compact/ILD_common_v02/Hcal_EndcapRing_SD_v01.xml
+++ b/ILD/compact/ILD_common_v02/Hcal_EndcapRing_SD_v01.xml
@@ -1,7 +1,7 @@
-
+
Hadron Calorimeter EndcapRing
@@ -23,24 +23,24 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ILD/compact/ILD_common_v02/Hcal_Endcaps_SD_v01.xml b/ILD/compact/ILD_common_v02/Hcal_Endcaps_SD_v01.xml
index 3b77b0fa6..b69218bff 100644
--- a/ILD/compact/ILD_common_v02/Hcal_Endcaps_SD_v01.xml
+++ b/ILD/compact/ILD_common_v02/Hcal_Endcaps_SD_v01.xml
@@ -1,7 +1,7 @@
-
+
Hadron Calorimeter Endcap
@@ -19,25 +19,25 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ILD/compact/ILD_common_v02/Hcal_Endcaps_SD_v02.xml b/ILD/compact/ILD_common_v02/Hcal_Endcaps_SD_v02.xml
index 8e245aa2b..78c6c422c 100644
--- a/ILD/compact/ILD_common_v02/Hcal_Endcaps_SD_v02.xml
+++ b/ILD/compact/ILD_common_v02/Hcal_Endcaps_SD_v02.xml
@@ -2,7 +2,7 @@
-
+
Hadron Calorimeter Endcap
@@ -18,7 +18,7 @@
-
+
@@ -33,21 +33,21 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ILD/compact/ILD_common_v02/Hcal_Endcaps_SD_v02_SMALL.xml b/ILD/compact/ILD_common_v02/Hcal_Endcaps_SD_v02_SMALL.xml
index 9c07b0837..e1f98f049 100644
--- a/ILD/compact/ILD_common_v02/Hcal_Endcaps_SD_v02_SMALL.xml
+++ b/ILD/compact/ILD_common_v02/Hcal_Endcaps_SD_v02_SMALL.xml
@@ -2,7 +2,7 @@
-
+
Hadron Calorimeter Endcap
@@ -18,7 +18,7 @@
-
+
@@ -32,21 +32,21 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ILD/compact/ILD_common_v02/LHCal.xml b/ILD/compact/ILD_common_v02/LHCal.xml
index 0577c1a4e..99caa932a 100644
--- a/ILD/compact/ILD_common_v02/LHCal.xml
+++ b/ILD/compact/ILD_common_v02/LHCal.xml
@@ -2,7 +2,7 @@
LHCal parameters for ILD
-->
-
@@ -35,11 +35,11 @@
/>
-
-
+
+
-
-
+
+
diff --git a/ILD/compact/ILD_common_v02/LHCal01.xml b/ILD/compact/ILD_common_v02/LHCal01.xml
index 078cae14c..c4d257d8d 100644
--- a/ILD/compact/ILD_common_v02/LHCal01.xml
+++ b/ILD/compact/ILD_common_v02/LHCal01.xml
@@ -3,7 +3,7 @@
-->
-
@@ -32,12 +32,12 @@
/>
-
-
-
-
-
-
+
+
+
+
+
+
diff --git a/ILD/compact/ILD_common_v02/LumiCal.xml b/ILD/compact/ILD_common_v02/LumiCal.xml
index db288e4c0..42fbaad1b 100644
--- a/ILD/compact/ILD_common_v02/LumiCal.xml
+++ b/ILD/compact/ILD_common_v02/LumiCal.xml
@@ -5,7 +5,7 @@
-
@@ -61,12 +61,12 @@
r_gap = "Lcal_tile_gap" />
-
-
-
-
-
-
+
+
+
+
+
+
diff --git a/ILD/compact/ILD_common_v02/SEcal05_siw_Barrel.xml b/ILD/compact/ILD_common_v02/SEcal05_siw_Barrel.xml
index 1661c9884..6c6443fdf 100644
--- a/ILD/compact/ILD_common_v02/SEcal05_siw_Barrel.xml
+++ b/ILD/compact/ILD_common_v02/SEcal05_siw_Barrel.xml
@@ -1,7 +1,7 @@
-
+
EM Calorimeter Barrel
@@ -15,56 +15,56 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ILD/compact/ILD_common_v02/SEcal05_siw_ECRing.xml b/ILD/compact/ILD_common_v02/SEcal05_siw_ECRing.xml
index a4b960610..3aca70fb0 100644
--- a/ILD/compact/ILD_common_v02/SEcal05_siw_ECRing.xml
+++ b/ILD/compact/ILD_common_v02/SEcal05_siw_ECRing.xml
@@ -1,7 +1,7 @@
-
+
EM Calorimeter Endcaps
@@ -22,53 +22,53 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ILD/compact/ILD_common_v02/SEcal05_siw_Endcaps.xml b/ILD/compact/ILD_common_v02/SEcal05_siw_Endcaps.xml
index 75556c83b..423a1a56e 100644
--- a/ILD/compact/ILD_common_v02/SEcal05_siw_Endcaps.xml
+++ b/ILD/compact/ILD_common_v02/SEcal05_siw_Endcaps.xml
@@ -1,7 +1,7 @@
-
+
EM Calorimeter Endcaps
@@ -21,54 +21,54 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ILD/compact/ILD_common_v02/SEcal06_hybrid_Barrel.xml b/ILD/compact/ILD_common_v02/SEcal06_hybrid_Barrel.xml
index 084f7ea99..457246d86 100644
--- a/ILD/compact/ILD_common_v02/SEcal06_hybrid_Barrel.xml
+++ b/ILD/compact/ILD_common_v02/SEcal06_hybrid_Barrel.xml
@@ -7,7 +7,7 @@
-
EM Calorimeter Barrel
@@ -22,46 +22,46 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ILD/compact/ILD_common_v02/SEcal06_hybrid_Endcaps.xml b/ILD/compact/ILD_common_v02/SEcal06_hybrid_Endcaps.xml
index c0760b162..9747acbc1 100644
--- a/ILD/compact/ILD_common_v02/SEcal06_hybrid_Endcaps.xml
+++ b/ILD/compact/ILD_common_v02/SEcal06_hybrid_Endcaps.xml
@@ -5,7 +5,7 @@
-
EM Calorimeter Endcaps
@@ -26,45 +26,45 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ILD/compact/ILD_common_v02/SHcalSc04_Barrel_v01.xml b/ILD/compact/ILD_common_v02/SHcalSc04_Barrel_v01.xml
index de0471ba0..5752ae0df 100644
--- a/ILD/compact/ILD_common_v02/SHcalSc04_Barrel_v01.xml
+++ b/ILD/compact/ILD_common_v02/SHcalSc04_Barrel_v01.xml
@@ -2,7 +2,7 @@
-
+
Hadron Calorimeter Barrel
@@ -16,15 +16,15 @@
-
+
-
-
-
-
-
+
+
+
+
+
diff --git a/ILD/compact/ILD_common_v02/SHcalSc04_Barrel_v04.xml b/ILD/compact/ILD_common_v02/SHcalSc04_Barrel_v04.xml
index fb79b33d4..5d1fd3e59 100644
--- a/ILD/compact/ILD_common_v02/SHcalSc04_Barrel_v04.xml
+++ b/ILD/compact/ILD_common_v02/SHcalSc04_Barrel_v04.xml
@@ -2,7 +2,7 @@
-
+
Hadron Calorimeter Barrel
@@ -16,18 +16,18 @@
-
+
-
-
-
-
-
-
+
+
+
+
+
+
diff --git a/ILD/compact/ILD_common_v02/SHcalSc04_EndcapRing.xml b/ILD/compact/ILD_common_v02/SHcalSc04_EndcapRing.xml
index 74d18b867..453f4c291 100644
--- a/ILD/compact/ILD_common_v02/SHcalSc04_EndcapRing.xml
+++ b/ILD/compact/ILD_common_v02/SHcalSc04_EndcapRing.xml
@@ -2,7 +2,7 @@
-
+
Hadron Calorimeter EndcapRing
@@ -23,17 +23,17 @@
-
+
-
+
-
-
-
+
+
+
diff --git a/ILD/compact/ILD_common_v02/SHcalSc04_EndcapRing_v01.xml b/ILD/compact/ILD_common_v02/SHcalSc04_EndcapRing_v01.xml
index 299a0d427..f369579db 100644
--- a/ILD/compact/ILD_common_v02/SHcalSc04_EndcapRing_v01.xml
+++ b/ILD/compact/ILD_common_v02/SHcalSc04_EndcapRing_v01.xml
@@ -2,7 +2,7 @@
-
+
Hadron Calorimeter EndcapRing
@@ -23,17 +23,17 @@
-
+
-
-
-
-
-
-
+
+
+
+
+
+
diff --git a/ILD/compact/ILD_common_v02/SHcalSc04_Endcaps_LARGE.xml b/ILD/compact/ILD_common_v02/SHcalSc04_Endcaps_LARGE.xml
index 57a6d813e..05541e999 100644
--- a/ILD/compact/ILD_common_v02/SHcalSc04_Endcaps_LARGE.xml
+++ b/ILD/compact/ILD_common_v02/SHcalSc04_Endcaps_LARGE.xml
@@ -2,7 +2,7 @@
-
+
Hadron Calorimeter Endcap
@@ -42,11 +42,11 @@
-
+
-
-
-
+
+
+
diff --git a/ILD/compact/ILD_common_v02/SHcalSc04_Endcaps_SMALL.xml b/ILD/compact/ILD_common_v02/SHcalSc04_Endcaps_SMALL.xml
index f8c937cad..85c57a502 100644
--- a/ILD/compact/ILD_common_v02/SHcalSc04_Endcaps_SMALL.xml
+++ b/ILD/compact/ILD_common_v02/SHcalSc04_Endcaps_SMALL.xml
@@ -2,7 +2,7 @@
-
+
Hadron Calorimeter Endcap
@@ -41,11 +41,11 @@
-
+
-
-
-
+
+
+
diff --git a/ILD/compact/ILD_common_v02/SHcalSc04_Endcaps_v01_LARGE.xml b/ILD/compact/ILD_common_v02/SHcalSc04_Endcaps_v01_LARGE.xml
index 2c1a15293..5679e7a1d 100644
--- a/ILD/compact/ILD_common_v02/SHcalSc04_Endcaps_v01_LARGE.xml
+++ b/ILD/compact/ILD_common_v02/SHcalSc04_Endcaps_v01_LARGE.xml
@@ -1,7 +1,7 @@
-
+
Hadron Calorimeter Endcap
@@ -42,12 +42,12 @@
-
-
-
-
-
-
+
+
+
+
+
+
diff --git a/ILD/compact/ILD_common_v02/SHcalSc04_Endcaps_v01_SMALL.xml b/ILD/compact/ILD_common_v02/SHcalSc04_Endcaps_v01_SMALL.xml
index 001451c01..1391dd7b0 100644
--- a/ILD/compact/ILD_common_v02/SHcalSc04_Endcaps_v01_SMALL.xml
+++ b/ILD/compact/ILD_common_v02/SHcalSc04_Endcaps_v01_SMALL.xml
@@ -1,7 +1,7 @@
-
+
Hadron Calorimeter Endcap
@@ -40,12 +40,12 @@
-
-
-
-
-
-
+
+
+
+
+
+
diff --git a/ILD/compact/ILD_common_v02/SServices00.xml b/ILD/compact/ILD_common_v02/SServices00.xml
index d34161c48..2f2a7fa1d 100644
--- a/ILD/compact/ILD_common_v02/SServices00.xml
+++ b/ILD/compact/ILD_common_v02/SServices00.xml
@@ -4,7 +4,7 @@
-
+
diff --git a/ILD/compact/ILD_common_v02/SServices01.xml b/ILD/compact/ILD_common_v02/SServices01.xml
index 932a106b0..38e3544d5 100644
--- a/ILD/compact/ILD_common_v02/SServices01.xml
+++ b/ILD/compact/ILD_common_v02/SServices01.xml
@@ -5,7 +5,7 @@
-
+
diff --git a/ILD/compact/ILD_common_v02/Yoke05_Barrel.xml b/ILD/compact/ILD_common_v02/Yoke05_Barrel.xml
index 00c8d2642..193091704 100644
--- a/ILD/compact/ILD_common_v02/Yoke05_Barrel.xml
+++ b/ILD/compact/ILD_common_v02/Yoke05_Barrel.xml
@@ -1,7 +1,7 @@
-
+
-
-
-
-
-
+
+
+
+
+
diff --git a/ILD/compact/ILD_common_v02/Yoke05_Endcaps.xml b/ILD/compact/ILD_common_v02/Yoke05_Endcaps.xml
index 6115d54d8..f575ffb02 100644
--- a/ILD/compact/ILD_common_v02/Yoke05_Endcaps.xml
+++ b/ILD/compact/ILD_common_v02/Yoke05_Endcaps.xml
@@ -1,7 +1,7 @@
-
+
@@ -26,10 +26,10 @@
-
-
-
-
+
+
+
+
diff --git a/ILD/compact/ILD_common_v02/Yoke06_Endcaps.xml b/ILD/compact/ILD_common_v02/Yoke06_Endcaps.xml
index e704a3577..0857dcb7a 100644
--- a/ILD/compact/ILD_common_v02/Yoke06_Endcaps.xml
+++ b/ILD/compact/ILD_common_v02/Yoke06_Endcaps.xml
@@ -1,7 +1,7 @@
-
+
@@ -34,10 +34,10 @@
-
-
-
-
+
+
+
+
diff --git a/ILD/compact/ILD_common_v02/display.xml b/ILD/compact/ILD_common_v02/display.xml
index edce85779..e96c56df3 100644
--- a/ILD/compact/ILD_common_v02/display.xml
+++ b/ILD/compact/ILD_common_v02/display.xml
@@ -1,41 +1,37 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ILD/compact/ILD_common_v02/ftd_simple_staggered_02.xml b/ILD/compact/ILD_common_v02/ftd_simple_staggered_02.xml
index 5290ca829..9b2e9efb9 100644
--- a/ILD/compact/ILD_common_v02/ftd_simple_staggered_02.xml
+++ b/ILD/compact/ILD_common_v02/ftd_simple_staggered_02.xml
@@ -7,7 +7,7 @@
-
+
diff --git a/ILD/compact/ILD_common_v02/hcal_defs.xml b/ILD/compact/ILD_common_v02/hcal_defs.xml
index d54e67902..736f2649b 100644
--- a/ILD/compact/ILD_common_v02/hcal_defs.xml
+++ b/ILD/compact/ILD_common_v02/hcal_defs.xml
@@ -19,11 +19,6 @@
-
@@ -65,21 +60,8 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/ILD/compact/ILD_common_v02/top_defs_ILD_l5_v02.xml b/ILD/compact/ILD_common_v02/top_defs_ILD_l5_v02.xml
index e670b598d..61684ef22 100644
--- a/ILD/compact/ILD_common_v02/top_defs_ILD_l5_v02.xml
+++ b/ILD/compact/ILD_common_v02/top_defs_ILD_l5_v02.xml
@@ -5,6 +5,7 @@ all hardcoded overall dimensions which differ between large and small models
+
diff --git a/ILD/compact/ILD_common_v02/top_defs_ILD_s5_v02.xml b/ILD/compact/ILD_common_v02/top_defs_ILD_s5_v02.xml
index a5b044905..5144058d3 100644
--- a/ILD/compact/ILD_common_v02/top_defs_ILD_s5_v02.xml
+++ b/ILD/compact/ILD_common_v02/top_defs_ILD_s5_v02.xml
@@ -5,6 +5,7 @@ all hardcoded overall dimensions which differ between large and small models
+
diff --git a/ILD/compact/ILD_common_v02/top_defs_common_v02.xml b/ILD/compact/ILD_common_v02/top_defs_common_v02.xml
index 6a3145588..b377376fb 100644
--- a/ILD/compact/ILD_common_v02/top_defs_common_v02.xml
+++ b/ILD/compact/ILD_common_v02/top_defs_common_v02.xml
@@ -38,7 +38,6 @@
-
diff --git a/ILD/compact/ILD_common_v02/tpc10_01.xml b/ILD/compact/ILD_common_v02/tpc10_01.xml
index eb46b3b73..d27607b75 100644
--- a/ILD/compact/ILD_common_v02/tpc10_01.xml
+++ b/ILD/compact/ILD_common_v02/tpc10_01.xml
@@ -6,7 +6,7 @@
-
+
diff --git a/ILD/compact/ILD_common_v02/vxd07.xml b/ILD/compact/ILD_common_v02/vxd07.xml
index ad32df1c8..8be4e2f24 100644
--- a/ILD/compact/ILD_common_v02/vxd07.xml
+++ b/ILD/compact/ILD_common_v02/vxd07.xml
@@ -5,7 +5,7 @@
-
+
diff --git a/ILD/compact/ILD_l2_v02/top_defs_ILD_l2_v02.xml b/ILD/compact/ILD_l2_v02/top_defs_ILD_l2_v02.xml
index e670b598d..61684ef22 100644
--- a/ILD/compact/ILD_l2_v02/top_defs_ILD_l2_v02.xml
+++ b/ILD/compact/ILD_l2_v02/top_defs_ILD_l2_v02.xml
@@ -5,6 +5,7 @@ all hardcoded overall dimensions which differ between large and small models
+
diff --git a/ILD/compact/ILD_l4_v02/top_defs_ILD_l4_v02.xml b/ILD/compact/ILD_l4_v02/top_defs_ILD_l4_v02.xml
index e670b598d..d95419012 100644
--- a/ILD/compact/ILD_l4_v02/top_defs_ILD_l4_v02.xml
+++ b/ILD/compact/ILD_l4_v02/top_defs_ILD_l4_v02.xml
@@ -1,10 +1,11 @@
-all hardcoded overall dimensions which differ between large and small models
+all hardcoded overall dimensions specific to this model (ie which differ between models)
+
diff --git a/ILD/compact/ILD_l5_v10/top_defs_ILD_l5_v10.xml b/ILD/compact/ILD_l5_v10/top_defs_ILD_l5_v10.xml
index e670b598d..130f776a3 100644
--- a/ILD/compact/ILD_l5_v10/top_defs_ILD_l5_v10.xml
+++ b/ILD/compact/ILD_l5_v10/top_defs_ILD_l5_v10.xml
@@ -1,10 +1,11 @@
-all hardcoded overall dimensions which differ between large and small models
+hardcoded overall dimensions specific to this model ILD_l5_v10 (ie not common to all/many models)
+
diff --git a/ILD/compact/ILD_l5_v11/InnerTrackerILD_o1_v01_00.xml b/ILD/compact/ILD_l5_v11/InnerTrackerILD_o1_v01_00.xml
index 8f1df743f..78b6d384c 100644
--- a/ILD/compact/ILD_l5_v11/InnerTrackerILD_o1_v01_00.xml
+++ b/ILD/compact/ILD_l5_v11/InnerTrackerILD_o1_v01_00.xml
@@ -122,7 +122,7 @@ adapted by DJeans to fit into ILD model at FCCee
-
+
diff --git a/ILD/compact/ILD_l5_v11/top_defs_ILD_l5_v11.xml b/ILD/compact/ILD_l5_v11/top_defs_ILD_l5_v11.xml
index f5996bdea..7bb940e21 100644
--- a/ILD/compact/ILD_l5_v11/top_defs_ILD_l5_v11.xml
+++ b/ILD/compact/ILD_l5_v11/top_defs_ILD_l5_v11.xml
@@ -1,9 +1,10 @@
-all hardcoded overall dimensions which differ between large and small models
+hardcoded overall dimensions specific to this model ILD_l5_v11 (ie not common to all/many models)
+
diff --git a/ILD/compact/ILD_l6_v02/top_defs_ILD_l6_v02.xml b/ILD/compact/ILD_l6_v02/top_defs_ILD_l6_v02.xml
index e670b598d..61684ef22 100644
--- a/ILD/compact/ILD_l6_v02/top_defs_ILD_l6_v02.xml
+++ b/ILD/compact/ILD_l6_v02/top_defs_ILD_l6_v02.xml
@@ -5,6 +5,7 @@ all hardcoded overall dimensions which differ between large and small models
+
diff --git a/ILD/compact/ILD_s1_v02/top_defs_ILD_s1_v02.xml b/ILD/compact/ILD_s1_v02/top_defs_ILD_s1_v02.xml
index a5b044905..5144058d3 100644
--- a/ILD/compact/ILD_s1_v02/top_defs_ILD_s1_v02.xml
+++ b/ILD/compact/ILD_s1_v02/top_defs_ILD_s1_v02.xml
@@ -5,6 +5,7 @@ all hardcoded overall dimensions which differ between large and small models
+
diff --git a/ILD/compact/ILD_s2_v02/top_defs_ILD_s2_v02.xml b/ILD/compact/ILD_s2_v02/top_defs_ILD_s2_v02.xml
index a5b044905..5144058d3 100644
--- a/ILD/compact/ILD_s2_v02/top_defs_ILD_s2_v02.xml
+++ b/ILD/compact/ILD_s2_v02/top_defs_ILD_s2_v02.xml
@@ -5,6 +5,7 @@ all hardcoded overall dimensions which differ between large and small models
+
diff --git a/ILD/compact/ILD_s4_v02/top_defs_ILD_s4_v02.xml b/ILD/compact/ILD_s4_v02/top_defs_ILD_s4_v02.xml
index a5b044905..5144058d3 100644
--- a/ILD/compact/ILD_s4_v02/top_defs_ILD_s4_v02.xml
+++ b/ILD/compact/ILD_s4_v02/top_defs_ILD_s4_v02.xml
@@ -5,6 +5,7 @@ all hardcoded overall dimensions which differ between large and small models
+
diff --git a/ILD/compact/ILD_s6_v02/top_defs_ILD_s6_v02.xml b/ILD/compact/ILD_s6_v02/top_defs_ILD_s6_v02.xml
index a5b044905..5144058d3 100644
--- a/ILD/compact/ILD_s6_v02/top_defs_ILD_s6_v02.xml
+++ b/ILD/compact/ILD_s6_v02/top_defs_ILD_s6_v02.xml
@@ -5,6 +5,7 @@ all hardcoded overall dimensions which differ between large and small models
+
diff --git a/ILD/compact/README.md b/ILD/compact/README.md
index c1c1dac47..d7df9e1e2 100644
--- a/ILD/compact/README.md
+++ b/ILD/compact/README.md
@@ -5,6 +5,7 @@ The following ILD detector models are available in lcgeo ( current production mo
+
| Model | Description | Hcal | Ecal | geometry | Status |
| ------------- | ---------------------------|--------|---------|----------|-------------------|
| ILD_l5_v02 | large simulation model | hybrid | hybrid | Tesla | validated |
@@ -40,9 +41,18 @@ The following ILD detector models are available in lcgeo ( current production mo
## Details
+### ILD_FCCee_v01
+ILD model for the FCCee with large TPC.
+This model definition can be found under [FCCee/ILD_FCCee/compact/ILD_FCCee_v01](../../FCCee/ILD_FCCee/compact/ILD_FCCee_v01/ILD_FCCee_v01.xml)
+
+### ILD_FCCee_v02
+ILD model for the FCCee with the CLD InnerTracker and a correspondingly shrunk TPC.
+This model definition can be found under [FCCee/ILD_FCCee/compact/ILD_FCCee_v02](../../FCCee/ILD_FCCee/compact/ILD_FCCee_v02/ILD_FCCee_v02.xml)
+
### ILD_l5_v11
-same detector geometry as ILD_l5_v02 model, but with FCCee MDI and CLD-inspired silicon inner tracker & VTX in place of original ILD's VTX, SIT, FTD.
+TEST DEVELOPMENT model: same detector geometry as ILD_l5_v02 model, but with FCCee MDI and CLD-inspired silicon inner tracker & VTX in place of original ILD's VTX, SIT, FTD.
BeamCal, LHCAL removed.
+**We recommend that you use an ILD model under FCCee/ILD_FCCee/ instead. Model ILD_FCCee_v01 is rather similar to ILD_l5_v11.**
### ILD_l5_v10
same detector geometry as ILD_l5_v02 model, but with CLD-inspired silicon inner tracker/VTX in place of original VTX, SIT, FTD
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 91c3febaa..0b0203867 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -35,6 +35,16 @@ ADD_TEST( t_${test_name} "${CMAKE_INSTALL_PREFIX}/bin/run_test_${PackageName}.sh
ddsim --compactFile=${CMAKE_CURRENT_SOURCE_DIR}/../ILD/compact/ILD_l5_v11/ILD_l5_v11.xml --runType=batch -G -N=1 --outputFile=testILD_l5_v11.slcio )
SET_TESTS_PROPERTIES( t_${test_name} PROPERTIES FAIL_REGULAR_EXPRESSION "Exception;EXCEPTION;ERROR;Error" )
+SET( test_name "test_ILD_FCCee_v01" )
+ADD_TEST( t_${test_name} "${CMAKE_INSTALL_PREFIX}/bin/run_test_${PackageName}.sh"
+ ddsim --compactFile=${CMAKE_CURRENT_SOURCE_DIR}/../FCCee/ILD_FCCee/compact/ILD_FCCee_v01/ILD_FCCee_v01.xml --runType=batch -G -N=1 --outputFile=testILD_FCCee_v01.slcio )
+SET_TESTS_PROPERTIES( t_${test_name} PROPERTIES FAIL_REGULAR_EXPRESSION "Exception;EXCEPTION;ERROR;Error" )
+
+SET( test_name "test_ILD_FCCee_v02" )
+ADD_TEST( t_${test_name} "${CMAKE_INSTALL_PREFIX}/bin/run_test_${PackageName}.sh"
+ ddsim --compactFile=${CMAKE_CURRENT_SOURCE_DIR}/../FCCee/ILD_FCCee/compact/ILD_FCCee_v02/ILD_FCCee_v02.xml --runType=batch -G -N=1 --outputFile=testILD_FCCee_v02.slcio )
+SET_TESTS_PROPERTIES( t_${test_name} PROPERTIES FAIL_REGULAR_EXPRESSION "Exception;EXCEPTION;ERROR;Error" )
+
#--------------------------------------------------
# tests for SiD
SET( test_name "test_SiD_o2_v03" )