rearrange some files to avoid duplication; fix typos

danieljeans · Sep 20, 2023 · a339b41 · a339b41
1 parent 749d258
commit a339b41
Show file tree

Hide file tree

Showing 21 changed files with 222 additions and 427 deletions.
diff --git a/...D_l5_v11/InnerTrackerBarrelModuleDown.xml → ...mmon_v02/InnerTrackerBarrelModuleDown.xml b/...D_l5_v11/InnerTrackerBarrelModuleDown.xml → ...mmon_v02/InnerTrackerBarrelModuleDown.xml
@@ -22,4 +22,4 @@
     <module_component thickness="0.068*mm"  material="Kapton"           info="Cold Plate: Cooling pipe"     sensitive="false"/>
     <module_component thickness="0.030*mm"  material="CarbonFiber"      info="Cold Plate: Graphite foil"    sensitive="false"/>
     <module_component thickness="0.020*mm"  material="CarbonFiber_25D"  info="Cold Plate: Carbon fleece"    sensitive="false"/>
-</lccdd>
+</lccdd>
diff --git a/...ILD_l5_v10/InnerTrackerBarrelModuleUp.xml → ...common_v02/InnerTrackerBarrelModuleUp.xml b/...ILD_l5_v10/InnerTrackerBarrelModuleUp.xml → ...common_v02/InnerTrackerBarrelModuleUp.xml
@@ -22,4 +22,4 @@
     <module_component thickness="0.100*mm"  material="Kapton"           info="Power bus: Insulating layer"  sensitive="false"/>
     <module_component thickness="0.200*mm"  material="Aluminium"        info="Power bus: Conductor"         sensitive="false"/>
     <module_component thickness="0.100*mm"  material="Kapton"           info="Power bus: Insulating layer"  sensitive="false"/>
-</lccdd>
+</lccdd>
diff --git a/ILD/compact/ILD_l5_v11/SServices00.xml → ILD/compact/ILD_common_v02/SServices01.xml b/ILD/compact/ILD_l5_v11/SServices00.xml → ILD/compact/ILD_common_v02/SServices01.xml
@@ -1,13 +1,14 @@
 <!-- 
-     SService00 parameters for ILD_*_v2
+     SService01 parameters for ILD_*_v10, v11
+     (some elements of services are turned off)
 -->
 <lccdd>
 <detectors>
 
 <detector name="SServices00" type="SServices00" id="ILDDetID_NOTUSED" vis="RedVis" insideTrackingVolume="false" sensitive="no" build_tpc_cooling="false" build_ecal_services="true" build_hcal_services="true" build_sit_cables="false" build_vxd_cables="false">
   <type_flags type=" DetType_SUPPORT " />
 
-  <TPC_Cooling number_of_rings="0"/> <!-- Daniel's understanding (via Dimitra) -->
+  <TPC_Cooling number_of_rings="0"/>
 
 </detector>
 </detectors>

diff --git a/ILD/compact/ILD_common_v02/TrackerDiskModuleIn.xml b/ILD/compact/ILD_common_v02/TrackerDiskModuleIn.xml
@@ -1,27 +1,27 @@
 <lccdd>
     <!-- Build slices top-down from innermost slice (closest to IP) to outer-most (away from IP)-->
     <module_component thickness="0.100*mm"  material="Kapton"           info="Power bus: Insulating layer"          sensitive="false"/>
-    <module_component thickness="0.200*mm"  material="Al"               info="Power bus: Conductor"                 sensitive="false"/>
+    <module_component thickness="0.200*mm"  material="Aluminium"        info="Power bus: Conductor"                 sensitive="false"/>
     <module_component thickness="0.100*mm"  material="Kapton"           info="Power bus: Insulating layer"          sensitive="false"/>
 
-    <module_component thickness="0.100*mm"  material="epoxy"            info="Glue: Eccobond"                       sensitive="false"/>
+    <module_component thickness="0.100*mm"  material="Epoxy"            info="Glue: Eccobond"                       sensitive="false"/>
 
     <module_component thickness="0.050*mm"  material="Kapton"           info="Module: FPC insulating layer"         sensitive="false"/>
-    <module_component thickness="0.050*mm"  material="Al"               info="Module: FPC metal layer"              sensitive="false"/>
+    <module_component thickness="0.050*mm"  material="Aluminium"        info="Module: FPC metal layer"              sensitive="false"/>
     <module_component thickness="0.050*mm"  material="Kapton"           info="Module: FPC insulating layer"         sensitive="false"/>
     <module_component thickness="0.100*mm"  material="Silicon"          info="Module: r/o ASIC"                     sensitive="false" />
     <module_component thickness="0.100*mm"  material="Silicon"          info="Module: Sensor"                       sensitive="true"/>
 
-    <module_component thickness="0.100*mm"  material="epoxy"            info="Glue: Eccobond"                       sensitive="false"/>
+    <module_component thickness="0.100*mm"  material="Epoxy"            info="Glue: Eccobond"                       sensitive="false"/>
 
     <module_component thickness="0.150*mm"  material="CarbonFiber"      info="Structure and cooling: CF Skins"      sensitive="false"/>
     <module_component thickness="0.025*mm"  material="CarbonFiber"      info="Structure and cooling: Interface"     sensitive="false"/>
-    <module_component thickness="0.100*mm"  material="epoxy"            info="Structure and cooling: Glue layer"    sensitive="false"/>
+    <module_component thickness="0.100*mm"  material="Epoxy"            info="Structure and cooling: Glue layer"    sensitive="false"/>
     <module_component thickness="0.235*mm"  material="Water"            info="Structure and cooling: Cooling fluid" sensitive="false"/>
     <module_component thickness="0.068*mm"  material="Kapton"           info="Structure and cooling: Cooling Pipe"  sensitive="false"/>
     <module_component thickness="0.700*mm"  material="Allcomp_K9"       info="Structure and cooling: Carbon Foam"   sensitive="false"/>
     <module_component thickness="2.800*mm"  material="Rohacell_IG51"    info="Structure and cooling: Core"          sensitive="false"/>
-    <module_component thickness="0.100*mm"  material="epoxy"            info="Structure and cooling: Glue layer"    sensitive="false"/>
+    <module_component thickness="0.100*mm"  material="Epoxy"            info="Structure and cooling: Glue layer"    sensitive="false"/>
     <module_component thickness="0.025*mm"  material="CarbonFiber"      info="Structure and cooling: Interface"     sensitive="false"/>
     <module_component thickness="0.150*mm"  material="CarbonFiber"      info="Structure and cooling: CF Skins"      sensitive="false"/>
-</lccdd>
+</lccdd>
diff --git a/ILD/compact/ILD_common_v02/TrackerDiskModuleOut.xml b/ILD/compact/ILD_common_v02/TrackerDiskModuleOut.xml
@@ -2,26 +2,26 @@
     <!-- Build slices top-down from innermost slice (closest to IP) to outer-most (away from IP)-->
     <module_component thickness="0.150*mm"  material="CarbonFiber"      info="Structure and cooling: CF Skins"      sensitive="false"/>
     <module_component thickness="0.025*mm"  material="CarbonFiber"      info="Structure and cooling: Interface"     sensitive="false"/>
-    <module_component thickness="0.100*mm"  material="epoxy"            info="Structure and cooling: Glue layer"    sensitive="false"/>
+    <module_component thickness="0.100*mm"  material="Epoxy"            info="Structure and cooling: Glue layer"    sensitive="false"/>
     <module_component thickness="2.800*mm"  material="Rohacell_IG51"    info="Structure and cooling: Core"          sensitive="false"/>
     <module_component thickness="0.700*mm"  material="Allcomp_K9"       info="Structure and cooling: Carbon Foam"   sensitive="false"/>
     <module_component thickness="0.068*mm"  material="Kapton"           info="Structure and cooling: Cooling Pipe"  sensitive="false"/>
     <module_component thickness="0.235*mm"  material="Water"            info="Structure and cooling: Cooling fluid" sensitive="false"/>
-    <module_component thickness="0.100*mm"  material="epoxy"            info="Structure and cooling: Glue layer"    sensitive="false"/>
+    <module_component thickness="0.100*mm"  material="Epoxy"            info="Structure and cooling: Glue layer"    sensitive="false"/>
     <module_component thickness="0.025*mm"  material="CarbonFiber"      info="Structure and cooling: Interface"     sensitive="false"/>
     <module_component thickness="0.150*mm"  material="CarbonFiber"      info="Structure and cooling: CF Skins"      sensitive="false"/>
 
-    <module_component thickness="0.100*mm"  material="epoxy"            info="Glue: Eccobond"                       sensitive="false"/>
+    <module_component thickness="0.100*mm"  material="Epoxy"            info="Glue: Eccobond"                       sensitive="false"/>
 
     <module_component thickness="0.100*mm"  material="Silicon"          info="Module: Sensor"                       sensitive="true"/>
     <module_component thickness="0.100*mm"  material="Silicon"          info="Module: r/o ASIC"                     sensitive="false" />
     <module_component thickness="0.050*mm"  material="Kapton"           info="Module: FPC insulating layer"         sensitive="false"/>
-    <module_component thickness="0.050*mm"  material="Al"               info="Module: FPC metal layer"              sensitive="false"/>
+    <module_component thickness="0.050*mm"  material="Aluminium"        info="Module: FPC metal layer"              sensitive="false"/>
     <module_component thickness="0.050*mm"  material="Kapton"           info="Module: FPC insulating layer"         sensitive="false"/>
 
-    <module_component thickness="0.100*mm"  material="epoxy"            info="Glue: Eccobond"                       sensitive="false"/>
+    <module_component thickness="0.100*mm"  material="Epoxy"            info="Glue: Eccobond"                       sensitive="false"/>
 
     <module_component thickness="0.100*mm"  material="Kapton"           info="Power bus: Insulating layer"          sensitive="false"/>
-    <module_component thickness="0.200*mm"  material="Al"               info="Power bus: Conductor"                 sensitive="false"/>
+    <module_component thickness="0.200*mm"  material="Aluminium"        info="Power bus: Conductor"                 sensitive="false"/>
     <module_component thickness="0.100*mm"  material="Kapton"           info="Power bus: Insulating layer"          sensitive="false"/>
-</lccdd>
+</lccdd>
diff --git a/ILD/compact/ILD_common_v02/elements.xml b/ILD/compact/ILD_common_v02/elements.xml
@@ -26,6 +26,12 @@
   <D type="density" unit="g/cm3" value="2.699" />
   <composite n="1" ref="Al" />
  </material>
+ <material formula="Al" name="Aluminium" state="solid" >
+  <RL type="X0" unit="cm" value="8.89632" />
+  <NIL type="lambda" unit="cm" value="38.8766" />
+  <D type="density" unit="g/cm3" value="2.699" />
+  <composite n="1" ref="Al" />
+ </material>
  <element Z="95" formula="Am" name="Am" >
   <atom type="A" unit="g/mol" value="243.061" />
  </element>
@@ -881,4 +887,4 @@
   <D type="density" unit="g/cm3" value="6.506" />
   <composite n="1" ref="Zr" />
  </material>
-</materials>
+</materials>
diff --git a/ILD/compact/ILD_common_v02/materials.xml b/ILD/compact/ILD_common_v02/materials.xml
@@ -571,5 +571,39 @@
     </material>
 
 
+    <material name="SolenoidMixture">
+      <D value="4.38" unit="g/cm3"/>
+      <fraction n="0.666" ref="Al"/>
+      <fraction n="0.166" ref="Cu"/>
+      <fraction n="0.084" ref="Ti"/>
+      <fraction n="0.084" ref="Nb"/>
+    </material>
+
+    <material name="Epoxy">
+      <D type="density" value="1.3" unit="g/cm3"/>
+      <composite n="44" ref="H"/>
+      <composite n="15" ref="C"/>
+      <composite n="7" ref="O"/>
+    </material>
+
+    <material name="CarbonFiber_25D">
+      <D type="density" value="0.375" unit="g/cm3"/>
+      <fraction n="0.60" ref="C"/>
+      <fraction n="0.40" ref="Epoxy"/>
+    </material>
+
+    <material name="AlBeMet162">
+      <D value="2.1" unit="g/cm3"/>
+      <fraction n="0.38" ref="Al"/>
+      <fraction n="0.62" ref="Be"/>
+    </material>
+
+    <material name="LiquidNDecane">
+      <D value="0.73" unit="g/cm3"/>
+      <composite n="10" ref="C" />
+      <composite n="22" ref="H" />
+    </material>
+
+
 
   </materials>
diff --git a/ILD/compact/ILD_l5_v10/FCCmats.xml b/ILD/compact/ILD_l5_v10/FCCmats.xml
diff --git a/ILD/compact/ILD_l5_v10/ILD_l5_v10.xml b/ILD/compact/ILD_l5_v10/ILD_l5_v10.xml
@@ -12,7 +12,6 @@
   <includes>
     <gdmlFile  ref="../ILD_common_v02/elements.xml"/>
     <gdmlFile  ref="../ILD_common_v02/materials.xml"/>
-    <gdmlFile  ref="FCCmats.xml"/>
   </includes>
 
   <define>
@@ -87,7 +86,7 @@
   <include ref="../ILD_common_v02/Yoke05_Barrel.xml"/>
   <include ref="../ILD_common_v02/Yoke06_Endcaps.xml"/>
   <include ref="../ILD_common_v02/coil03.xml"/>
-  <include ref="SServices00.xml"/>
+  <include ref="../ILD_common_v02/SServices01.xml"/>
 
   <plugins>
     <plugin name="DD4hepVolumeManager"/>

diff --git a/ILD/compact/ILD_l5_v10/InnerTrackerBarrelModuleDown.xml b/ILD/compact/ILD_l5_v10/InnerTrackerBarrelModuleDown.xml