diff --git a/FCCee/ALLEGRO/compact/ALLEGRO_o1_v03/ALLEGRO_o1_v03.xml b/FCCee/ALLEGRO/compact/ALLEGRO_o1_v03/ALLEGRO_o1_v03.xml index 7f2b2fb3f..cda193f87 100644 --- a/FCCee/ALLEGRO/compact/ALLEGRO_o1_v03/ALLEGRO_o1_v03.xml +++ b/FCCee/ALLEGRO/compact/ALLEGRO_o1_v03/ALLEGRO_o1_v03.xml @@ -26,10 +26,12 @@ + - + + @@ -40,7 +42,16 @@ - + + + + + + + + + + @@ -50,7 +61,7 @@ - + - - - - - - - - - - - - - - - diff --git a/FCCee/ALLEGRO/compact/ALLEGRO_o1_v03/DectDimensions.xml b/FCCee/ALLEGRO/compact/ALLEGRO_o1_v03/DectDimensions.xml index d100e0a0f..31492231c 100644 --- a/FCCee/ALLEGRO/compact/ALLEGRO_o1_v03/DectDimensions.xml +++ b/FCCee/ALLEGRO/compact/ALLEGRO_o1_v03/DectDimensions.xml @@ -47,31 +47,9 @@ + + - - - - - - - - - - - - - - - - - - - - - - - - @@ -139,67 +117,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/FCCee/ALLEGRO/compact/ALLEGRO_o1_v03/materials.xml b/FCCee/ALLEGRO/compact/ALLEGRO_o1_v03/materials.xml index 338606639..8b15565bd 100644 --- a/FCCee/ALLEGRO/compact/ALLEGRO_o1_v03/materials.xml +++ b/FCCee/ALLEGRO/compact/ALLEGRO_o1_v03/materials.xml @@ -459,51 +459,5 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/FCCee/IDEA/compact/IDEA_o1_v03/DectDimensions_IDEA_o1_v03.xml b/FCCee/IDEA/compact/IDEA_o1_v03/DectDimensions_IDEA_o1_v03.xml index e662f7a58..bd8e04c44 100644 --- a/FCCee/IDEA/compact/IDEA_o1_v03/DectDimensions_IDEA_o1_v03.xml +++ b/FCCee/IDEA/compact/IDEA_o1_v03/DectDimensions_IDEA_o1_v03.xml @@ -57,31 +57,8 @@ - - - - - - - - - - - - - - - - - - - - - - - - - + + @@ -123,61 +100,8 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 949c55eb7..260224401 100644 --- a/FCCee/IDEA/compact/IDEA_o1_v03/IDEA_o1_v03.xml +++ b/FCCee/IDEA/compact/IDEA_o1_v03/IDEA_o1_v03.xml @@ -28,11 +28,13 @@ + - + + @@ -43,7 +45,17 @@ cmake -D INSTALL_BEAMPIPE_STL_FILES=ON which will download the files needed --> - + + + + + + + + + + + @@ -73,7 +85,7 @@ - + - - - - - - diff --git a/FCCee/MDI/compact/MDI_o1_v00/Beampipe_o4_v05.xml b/FCCee/MDI/compact/MDI_o1_v00/Beampipe_o4_v05.xml index 73283b2f5..97753f2a7 100644 --- a/FCCee/MDI/compact/MDI_o1_v00/Beampipe_o4_v05.xml +++ b/FCCee/MDI/compact/MDI_o1_v00/Beampipe_o4_v05.xml @@ -37,11 +37,22 @@ -
-
-
-
- +
+
+
+
@@ -50,28 +61,54 @@ - - + Golden foil in the inner part of the Be beampipe -
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -81,11 +118,20 @@ -
+
-
+
-
+
diff --git a/FCCee/MDI/compact/MDI_o1_v00/FFQuads_params_v530_Z.xml b/FCCee/MDI/compact/MDI_o1_v00/FFQuads_params_v530_Z.xml new file mode 100644 index 000000000..711c58084 --- /dev/null +++ b/FCCee/MDI/compact/MDI_o1_v00/FFQuads_params_v530_Z.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/FCCee/MDI/compact/MDI_o1_v00/FFQuads_params_v572_T.xml b/FCCee/MDI/compact/MDI_o1_v00/FFQuads_params_v572_T.xml new file mode 100644 index 000000000..c9bbc013b --- /dev/null +++ b/FCCee/MDI/compact/MDI_o1_v00/FFQuads_params_v572_T.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/FCCee/MDI/compact/MDI_o1_v00/FFQuads_params_v572_Z.xml b/FCCee/MDI/compact/MDI_o1_v00/FFQuads_params_v572_Z.xml new file mode 100644 index 000000000..83d9154f4 --- /dev/null +++ b/FCCee/MDI/compact/MDI_o1_v00/FFQuads_params_v572_Z.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/FCCee/MDI/compact/MDI_o1_v00/FFQuads_v01.xml b/FCCee/MDI/compact/MDI_o1_v00/FFQuads_v01.xml new file mode 100644 index 000000000..865c54bb5 --- /dev/null +++ b/FCCee/MDI/compact/MDI_o1_v00/FFQuads_v01.xml @@ -0,0 +1,231 @@ + + + + + + Final Focusing Quadrupoles simplified geometry + fields - Started from MaskTrafos.xml by A. Sailer + + + + + + + + + +
+
+
+
+
+
+
+
+
+
+ + + + + + + Note that the coefficient should be adjusted for the beam energy AND charge! + B'[T/m] = k[m-2]/0.3 * P[GeV/c] / (q/e) + Also, rotate everything in one direction only. + + [P]ositron/[E]lectron, [U]pstream/[D]ownstream + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/FCCee/MDI/compact/MDI_o1_v00/FFQuads_v01_sens.xml b/FCCee/MDI/compact/MDI_o1_v00/FFQuads_v01_sens.xml new file mode 100644 index 000000000..43ec83ce9 --- /dev/null +++ b/FCCee/MDI/compact/MDI_o1_v00/FFQuads_v01_sens.xml @@ -0,0 +1,237 @@ + + + + + + Final Focusing Quadrupoles simplified sensitive geometry + fields - Started from MaskTrafos.xml by A. Sailer + + + + + + system:5,side:-2,layer:6,module:11,sensor:8 + + + + + + + + + +
+
+
+
+
+
+
+
+
+
+ + + + + + + Note that the coefficient should be adjusted for the beam energy AND charge! + B'[T/m] = k[m-2]/0.3 * P[GeV/c] / (q/e) + Also, rotate everything in one direction only. + + [P]ositron/[E]lectron, [U]pstream/[D]ownstream + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/FCCee/IDEA/compact/IDEA_o1_v03/LumiCal_o1_v01.xml b/FCCee/MDI/compact/MDI_o1_v00/LumiCal_o3_v02_05.xml similarity index 81% rename from FCCee/IDEA/compact/IDEA_o1_v03/LumiCal_o1_v01.xml rename to FCCee/MDI/compact/MDI_o1_v00/LumiCal_o3_v02_05.xml index 2c19e5772..3c3f7bf64 100644 --- a/FCCee/IDEA/compact/IDEA_o1_v03/LumiCal_o1_v01.xml +++ b/FCCee/MDI/compact/MDI_o1_v00/LumiCal_o3_v02_05.xml @@ -1,19 +1,9 @@ - - - LumiCal for FCCee detector - - - + system:8,barrel:3,layer:8,slice:8,r:32:-16,phi:-16 - + - + - + - + + - + + - + - + - - + + - - + + - + - + + - + + - + - + - - + + - - + + - + - + + - + + - + - + - - + + - - + + - + - + + - + + - + - - + + - - + inner_z = "LumiCal_max_z - LumiCal_shield_dz_prime + LumiCal_shield_dz"/> + + - - + + - - - + diff --git a/FCCee/MDI/compact/MDI_o1_v00/MDI_Dimensions_Materials_o1_v00.xml b/FCCee/MDI/compact/MDI_o1_v00/MDI_Dimensions_Materials_o1_v00.xml new file mode 100644 index 000000000..ac2293a96 --- /dev/null +++ b/FCCee/MDI/compact/MDI_o1_v00/MDI_Dimensions_Materials_o1_v00.xml @@ -0,0 +1,144 @@ + + + + Dimensions and Materials for the FCCee common MDI + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/FCCee/MDI/compact/MDI_o1_v00/MDI_standalone_o1_v00.xml b/FCCee/MDI/compact/MDI_o1_v00/MDI_standalone_o1_v00.xml new file mode 100644 index 000000000..325502190 --- /dev/null +++ b/FCCee/MDI/compact/MDI_o1_v00/MDI_standalone_o1_v00.xml @@ -0,0 +1,64 @@ + + + + + + Master compact file for the common FCCee Machine Detector Interface. For debug only. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/FCCee/MDI/compact/MDI_o1_v00/fields_antisol_ideal.xml b/FCCee/MDI/compact/MDI_o1_v00/fields_antisol_ideal.xml new file mode 100644 index 000000000..fc9daefbb --- /dev/null +++ b/FCCee/MDI/compact/MDI_o1_v00/fields_antisol_ideal.xml @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/FCCee/MDI/compact/MDI_o1_v00/fields_antisol_map.xml b/FCCee/MDI/compact/MDI_o1_v00/fields_antisol_map.xml new file mode 100644 index 000000000..77d3e263a --- /dev/null +++ b/FCCee/MDI/compact/MDI_o1_v00/fields_antisol_map.xml @@ -0,0 +1,32 @@ + + + Dimensions and Materials for the FCCee common MDI + + + + + + + + + diff --git a/FCCee/MDI/compact/MDI_o1_v00/fields_solenoid.xml b/FCCee/MDI/compact/MDI_o1_v00/fields_solenoid.xml new file mode 100644 index 000000000..8225f5397 --- /dev/null +++ b/FCCee/MDI/compact/MDI_o1_v00/fields_solenoid.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + diff --git a/FCCee/MDI/compact/MDI_o1_v00/local_elements.xml b/FCCee/MDI/compact/MDI_o1_v00/local_elements.xml new file mode 100644 index 000000000..f35eb3454 --- /dev/null +++ b/FCCee/MDI/compact/MDI_o1_v00/local_elements.xml @@ -0,0 +1,884 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/FCCee/MDI/compact/MDI_o1_v00/local_materials.xml b/FCCee/MDI/compact/MDI_o1_v00/local_materials.xml new file mode 100644 index 000000000..1b4dcb770 --- /dev/null +++ b/FCCee/MDI/compact/MDI_o1_v00/local_materials.xml @@ -0,0 +1,350 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

+ + + + + + + + + diff --git a/FCCee/MDI/compact/MDI_o1_v01/FFQuads_params_v530_Z.xml b/FCCee/MDI/compact/MDI_o1_v01/FFQuads_params_v530_Z.xml new file mode 100644 index 000000000..711c58084 --- /dev/null +++ b/FCCee/MDI/compact/MDI_o1_v01/FFQuads_params_v530_Z.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/FCCee/MDI/compact/MDI_o1_v01/FFQuads_params_v572_T.xml b/FCCee/MDI/compact/MDI_o1_v01/FFQuads_params_v572_T.xml new file mode 100644 index 000000000..c9bbc013b --- /dev/null +++ b/FCCee/MDI/compact/MDI_o1_v01/FFQuads_params_v572_T.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/FCCee/MDI/compact/MDI_o1_v01/FFQuads_params_v572_Z.xml b/FCCee/MDI/compact/MDI_o1_v01/FFQuads_params_v572_Z.xml new file mode 100644 index 000000000..83d9154f4 --- /dev/null +++ b/FCCee/MDI/compact/MDI_o1_v01/FFQuads_params_v572_Z.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/FCCee/MDI/compact/MDI_o1_v01/FFQuads_v01.xml b/FCCee/MDI/compact/MDI_o1_v01/FFQuads_v01.xml new file mode 100644 index 000000000..865c54bb5 --- /dev/null +++ b/FCCee/MDI/compact/MDI_o1_v01/FFQuads_v01.xml @@ -0,0 +1,231 @@ + + + + + + Final Focusing Quadrupoles simplified geometry + fields - Started from MaskTrafos.xml by A. Sailer + + + + + + + + + +

+
+
+
+
+
+
+
+
+
+ + + + + + + Note that the coefficient should be adjusted for the beam energy AND charge! + B'[T/m] = k[m-2]/0.3 * P[GeV/c] / (q/e) + Also, rotate everything in one direction only. + + [P]ositron/[E]lectron, [U]pstream/[D]ownstream + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/FCCee/MDI/compact/MDI_o1_v01/FFQuads_v01_sens.xml b/FCCee/MDI/compact/MDI_o1_v01/FFQuads_v01_sens.xml new file mode 100644 index 000000000..43ec83ce9 --- /dev/null +++ b/FCCee/MDI/compact/MDI_o1_v01/FFQuads_v01_sens.xml @@ -0,0 +1,237 @@ + + + + + + Final Focusing Quadrupoles simplified sensitive geometry + fields - Started from MaskTrafos.xml by A. Sailer + + + + + + system:5,side:-2,layer:6,module:11,sensor:8 + + + + + + + + + +
+
+
+
+
+
+
+
+
+
+ + + + + + + Note that the coefficient should be adjusted for the beam energy AND charge! + B'[T/m] = k[m-2]/0.3 * P[GeV/c] / (q/e) + Also, rotate everything in one direction only. + + [P]ositron/[E]lectron, [U]pstream/[D]ownstream + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/FCCee/ALLEGRO/compact/ALLEGRO_o1_v03/LumiCal.xml b/FCCee/MDI/compact/MDI_o1_v01/LumiCal_o3_v02_05.xml similarity index 81% rename from FCCee/ALLEGRO/compact/ALLEGRO_o1_v03/LumiCal.xml rename to FCCee/MDI/compact/MDI_o1_v01/LumiCal_o3_v02_05.xml index 15f0434e8..3c3f7bf64 100644 --- a/FCCee/ALLEGRO/compact/ALLEGRO_o1_v03/LumiCal.xml +++ b/FCCee/MDI/compact/MDI_o1_v01/LumiCal_o3_v02_05.xml @@ -1,18 +1,9 @@ - - - LumiCal for FCCee detector based on CLD - - + system:8,barrel:3,layer:8,slice:8,r:32:-16,phi:-16 - + - + - + - + + - + + - + - + - - + + - - + + - + - + + - + + - + - + - - + + - - + + - + - + + - + + - + - + - - + + - - + + - + - + + - + + - + - - + + - - + inner_z = "LumiCal_max_z - LumiCal_shield_dz_prime + LumiCal_shield_dz"/> + + - - + + - - - + diff --git a/FCCee/MDI/compact/MDI_o1_v01/MDI_Dimensions_Materials_o1_v01.xml b/FCCee/MDI/compact/MDI_o1_v01/MDI_Dimensions_Materials_o1_v01.xml new file mode 100644 index 000000000..5d035b11a --- /dev/null +++ b/FCCee/MDI/compact/MDI_o1_v01/MDI_Dimensions_Materials_o1_v01.xml @@ -0,0 +1,157 @@ + + + + Dimensions and Materials for the FCCee common MDI + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/FCCee/MDI/compact/MDI_o1_v01/MDI_standalone_o1_v01.xml b/FCCee/MDI/compact/MDI_o1_v01/MDI_standalone_o1_v01.xml new file mode 100644 index 000000000..0ef687b6c --- /dev/null +++ b/FCCee/MDI/compact/MDI_o1_v01/MDI_standalone_o1_v01.xml @@ -0,0 +1,63 @@ + + + + + + Master compact file for the common FCCee Machine Detector Interface. For debug only. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/FCCee/MDI/compact/MDI_o1_v01/fields_antisol_ideal.xml b/FCCee/MDI/compact/MDI_o1_v01/fields_antisol_ideal.xml new file mode 100644 index 000000000..fc9daefbb --- /dev/null +++ b/FCCee/MDI/compact/MDI_o1_v01/fields_antisol_ideal.xml @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/FCCee/MDI/compact/MDI_o1_v01/fields_antisol_map.xml b/FCCee/MDI/compact/MDI_o1_v01/fields_antisol_map.xml new file mode 100644 index 000000000..77d3e263a --- /dev/null +++ b/FCCee/MDI/compact/MDI_o1_v01/fields_antisol_map.xml @@ -0,0 +1,32 @@ + + + Dimensions and Materials for the FCCee common MDI + + + + + + + + + diff --git a/FCCee/MDI/compact/MDI_o1_v01/fields_solenoid.xml b/FCCee/MDI/compact/MDI_o1_v01/fields_solenoid.xml new file mode 100644 index 000000000..8225f5397 --- /dev/null +++ b/FCCee/MDI/compact/MDI_o1_v01/fields_solenoid.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + diff --git a/FCCee/MDI/compact/MDI_o1_v01/local_elements.xml b/FCCee/MDI/compact/MDI_o1_v01/local_elements.xml new file mode 100644 index 000000000..f35eb3454 --- /dev/null +++ b/FCCee/MDI/compact/MDI_o1_v01/local_elements.xml @@ -0,0 +1,884 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/FCCee/MDI/compact/MDI_o1_v01/local_materials.xml b/FCCee/MDI/compact/MDI_o1_v01/local_materials.xml new file mode 100644 index 000000000..1b4dcb770 --- /dev/null +++ b/FCCee/MDI/compact/MDI_o1_v01/local_materials.xml @@ -0,0 +1,350 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

+ + + + + + + + + diff --git a/FCCee/MDI/compact/README.md b/FCCee/MDI/compact/README.md index 13222dae2..92a760ef1 100644 --- a/FCCee/MDI/compact/README.md +++ b/FCCee/MDI/compact/README.md @@ -1,9 +1,21 @@ -aciarma - 08/07/24 +aciarma - 02/09/24 - MDI_o1_v00 -- Beampipe_o4_v05.xml : "shape based" beam pipe with AlBeMet central chamber and Paraffin cooling. From IDEA_o1_v02. -- BeamInstrumentation_o1_v01.xml : compensating and screening solenoids -- HOMAbsorber.xml : old model of the HOM absorbers. Not needed anymore with new low impedance beam pipe. +-- MDI_Dimensions_Materials_o1_v00.xml : Includes the materials and constants necessary for the MDI elements +-- LumiCal_o3_v02_05.xml : lumical xml +-- FFQuads_v01.xml : simple equivalent material geometry for the final focus quadrupoles +-- FFQuads_params_xxx_x.xml : parameters for geometry and fields of the final focus quadrupoles, different lattices and energies +-- fields_antisol_map.xml : imports the magnetic fields for the compensating and screening solenoids from field map (NO 2T DETECTOR FIELD) +-- fields_antisol_ideal.xml : ideal fields for compensating and screening solenoids, no fringe fields (NO 2T DETECTOR FIELD) +only for debug +-- MDI_standalone_o1_v00.xml : master compact for only the MDI elements +-- fields_solenoid.xml : simple 2T detector solenoid field +-- local_elements.xml +-- local_materials.xml + - MDI_o1_v01 -- Beampipe_CADimport_o1_v02.xml : import CAD models for engineered beam pipe (by F. Fransesini/INFN-LNF) @@ -17,3 +29,17 @@ The CMake option `INSTALL_BEAMPIPE_STL_FILES=ON` downloads these STL. ├── Tungsten_mask_02102023.stl : SR masks 2.1m upstream └── Water_30042024.stl : cooling for elliptoconical chambers -- BeamInstrumentation_o1_v01.xml : compensating and screening solenoids +-- MDI_Dimensions_Materials_o1_v01.xml : Includes the materials and constants necessary for the MDI elements +-- LumiCal_o3_v02_05.xml : lumical xml +-- FFQuads_v01.xml : simple equivalent material geometry for the final focus quadrupoles +-- FFQuads_params_xxx_x.xml : parameters for geometry and fields of the final focus quadrupoles, different lattices and energies +-- fields_antisol_map.xml : imports the magnetic fields for the compensating and screening solenoids from field map (NO 2T DETECTOR FIELD) +-- fields_antisol_ideal.xml : ideal fields for compensating and screening solenoids, no fringe fields (NO 2T DETECTOR FIELD) +only for debug +-- MDI_standalone_o1_v01.xml : master compact for only the MDI elements +-- fields_solenoid.xml : simple 2T detector solenoid field +-- local_elements.xml +-- local_materials.xml + + + diff --git a/fieldmaps/FCCee_fieldMapXYZ_120218.root b/fieldmaps/FCCee_fieldMapXYZ_120218.root new file mode 100644 index 000000000..1d4ca5bac Binary files /dev/null and b/fieldmaps/FCCee_fieldMapXYZ_120218.root differ diff --git a/test/compact/IDEA_withDRC_o1_v03.xml b/test/compact/IDEA_withDRC_o1_v03.xml index 22ab501bb..53d09bd14 100644 --- a/test/compact/IDEA_withDRC_o1_v03.xml +++ b/test/compact/IDEA_withDRC_o1_v03.xml @@ -28,19 +28,34 @@ + + + + - - - + + + + + + + + + + + + +