Fixed constants in v4/etl.xml and v5/etl.xml

cms-sw · Jun 22, 2020 · 8bdcb36 · 8bdcb36
1 parent dbab7a5
commit 8bdcb36
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 41 deletions.
diff --git a/Geometry/MTDCommonData/data/etl/v4/etl.xml b/Geometry/MTDCommonData/data/etl/v4/etl.xml
@@ -2,39 +2,32 @@
 <DDDefinition xmlns="http://www.cern.ch/cms/DDL" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.cern.ch/cms/DDL ../../../../DetectorDescription/Schema/DDLSchema.xsd">
 
   <ConstantsSection label="etl.xml" eval="true/false">
-
-    <Constant name="ETLzmin" value="-0.5*([caloBase:Zpos110]-[caloBase:Zpos100])+0.2*mm"/>
-    <Constant name="ETLzmax" value="0.5*([caloBase:Zpos110]-[caloBase:Zpos100])-0.2*mm"/>
-    <!--<Constant name="ETLcenter" value="0.5*([caloBase:Zpos110]+[caloBase:Zpos100])"/>
-    <Constant name="Disc1center" value="3000.42*mm+0.2*mm"/>
-    <Constant name="Disc2center" value="3030.42*mm+0.2*mm"/>-->
-
-    <Constant name="ETLrmin" value="[caloBase:Rmin100]"/>   <!-- 26.3 cm -->
-    <Constant name="ETLrmax" value="[caloBase:Rmax100]"/>   <!-- 125.525 cm -->
+    <Constant name="ETLrmin" value="[caloBase:Rmin100]"/>   
+    <Constant name="ETLrmax" value="[caloBase:Rmax100]"/>   
     <Constant name="ETLthickness" value="7.7"/>
     <Constant name="ETLcenter" value="3024.5*mm"/>
     <Constant name="Disc1center" value="2999.62*mm"/>
     <Constant name="Disc2center" value="3029.62*mm"/>
-    <Constant name="Disc_thickness" value="1.894"/>  <!-- thickness of one Disc comprising modules, service hybrids on both faces, mounted on the Al and MIC6-Al rings. Fig 3.73 TDR and line 354 Ulascan ETLDetectorDimensions.cc -->
+    <Constant name="Disc_thickness" value="1.894"/>  <!-- thickness of one Disc comprising modules, service hybrids on both faces, mounted on the Al and MIC6-Al rings. -->
     <Constant name="DiscSector_thickness" value="0.585"/> <!-- this is the service hybrid height according to TDR table 3.9 -->
-    <!-- LGAD and ETROC values taken from Ulascan code (line 103 on in ETLDetectorDimensions.cc), same values in the TDR -->
+    <!-- LGAD and ETROC values taken from TDR -->
     <Constant name="LGADdx" value="2.12"/>
     <Constant name="LGADdy" value="4.2"/>
-    <Constant name="EModule_Timingactive" value="0.005"/> <!-- LGAD_Timingactive? -->
+    <Constant name="EModule_Timingactive" value="0.005"/> 
     <Constant name="LGAD_Substrate" value="0.025"/>
     <Constant name="LGADdz" value="0.03"/>
-    <Constant name="lgadSep_X" value="0.025"/>  <!-- x-offset between lgad in a 2SensorModule, line 232 ETLDetectorDimensions.cc -->
-    <Constant name="lgadSep_Y" value="0.05"/> <!-- y-offset between SensorModules and service hybrids, line 414 ETLDetectorDimensions.cc -->
+    <Constant name="lgadSep_X" value="0.025"/>  <!-- x-offset between lgad in a 2SensorModule -->
+    <Constant name="lgadSep_Y" value="0.05"/> <!-- y-offset between SensorModules and service hybrids -->
     <Constant name="ETROCdx" value="2.23"/>
     <Constant name="ETROCdy" value="2.08"/>
     <Constant name="ETROCdz" value="0.025"/>
-    <Constant name="etrocSep_X" value="0.03"/>  <!-- line 202 Ulascan ETLDetectorDimensions.cc -->
+    <Constant name="etrocSep_X" value="0.03"/>  
     <Constant name="etrocSep_Y" value="0.01"/>
     <Constant name="ServiceHybrid_X" value="3.4"/>  <!-- line 294 Ulascan ETLDetectorDimensions.cc -->
     <Constant name="ServiceHybrid_Y" value="26.11"/> <!-- ORANGE 6x SensorModule_dy + 5x lgadSep_Y -->
     <Constant name="ServiceHybrid_Y_short" value="13.03"/> <!-- RED 3x SensorModule_dy + 2x lgadSep_Y -->
     <Constant name="ServiceHybrid_Z" value="0.585"/>
-    <Constant name="SensorModuledx" value="2.585"/>  <!-- Half of a 2-Sensor-Module line 181 Ulascan ETLDetectorDimensions.cc -->
+    <Constant name="SensorModuledx" value="2.585"/>  <!-- Half of a 2-Sensor-Module -->
     <Constant name="SensorModuledy" value="4.31"/>
     <Constant name="SensorModuledz" value="0.229"/>
     <Constant name="DeltaX_ServiceModule" value="2.9925"/>
@@ -44,7 +37,7 @@
 
   <SolidSection label="etl.xml">
     <Tubs name="EndcapTimingLayer" rMin="[ETLrmin]" rMax="[ETLrmax]" dz="0.5*([ETLthickness])*cm" startPhi="0*deg" deltaPhi="360*deg"/>
-    <!-- Aluminium rings: dimensions as defined by ulascan (line 345 ETLDetectorDimensions.cc). Note: epoxy not considered as single element but included in "Aluminium_Disc" (0.081 + 0.008 cm) -->
+    <!-- Aluminium rings. Note: epoxy not considered as single element but included in "Aluminium_Disc" (0.081 + 0.008 cm) -->
     <Tubs name="Disc" rMin="31*cm" rMax="119*cm" dz="0.5*[Disc_thickness]*cm" startPhi="0*deg" deltaPhi="360*deg"/>
     <Tubs name="Aluminium_Disc" rMin="31*cm" rMax="119*cm" dz="0.5*(0.089)*cm" startPhi="0*deg" deltaPhi="360*deg"/>
     <Tubs name="MIC6_Aluminium_Disc" rMin="31*cm" rMax="119*cm" dz="0.5*(0.635)*cm" startPhi="0*deg" deltaPhi="360*deg"/>

diff --git a/Geometry/MTDCommonData/data/etl/v5/etl.xml b/Geometry/MTDCommonData/data/etl/v5/etl.xml
@@ -1,31 +1,14 @@
 <?xml version="1.0"?>
 <DDDefinition xmlns="http://www.cern.ch/mms/DDL" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.cern.ch/mms/DDL ../../../../DetectorDescription/Schema/DDLSchema.xsd">
 
-  <!-- Unit of measurement mm to adapt to Natalia's units -->
+  <!-- Unit of measurement: mm  -->
   <ConstantsSection label="etl.xml" eval="true/false">
-
-    <Constant name="ETLzmin" value="-0.5*([caloBase:Zpos110]-[caloBase:Zpos100])+0.2*mm"/>
-    <Constant name="ETLzmax" value="0.5*([caloBase:Zpos110]-[caloBase:Zpos100])-0.2*mm"/>
+    <Constant name="ETLthickness" value="([caloBase:Zpos110]-[caloBase:Zpos100])-0.4*mm"/>
     <Constant name="ETLcenter" value="0.5*([caloBase:Zpos110]+[caloBase:Zpos100])"/>
-
-    <!--<Constant name="ETLcenter" value="3025.3*mm"/>-->
     <Constant name="Disc1center" value="3000.42*mm+0.2*mm"/>
     <Constant name="Disc2center" value="3030.42*mm+0.2*mm"/>
-
-    <!--<Constant name="ETLcenter" value="3024.5*mm"/>
-    <Constant name="Disc1center" value="2999.62*mm"/>
-    <Constant name="Disc2center" value="3029.62*mm"/>-->
-
-    <!--<Constant name="ETLcenter" value="3024.68497*mm"/>
-    <Constant name="Disc1center" value="2999.62*mm"/>
-    <Constant name="Disc2center" value="3029.62*mm"/>-->
     <Constant name="ETLrmin" value="[caloBase:Rmin100]"/>
     <Constant name="ETLrmax" value="[caloBase:Rmax100]"/>
-    <Constant name="ETLrmax2" value="[caloBase:Rmax100]"/> 
-
-    <!--<Constant name="ETLrmax2" value="[caloBase:Rmax110]"/>-->
-    <!--<Constant name="ETLzmin" value="-39.3*mm"/> 
-    <Constant name="ETLzmax" value="39.3*mm"/>--> 
     <Constant name="Disc_thickness" value="27.9"/>
     <Constant name="Al_Disc_thickness" value="7.24"/>
     <Constant name="Disc_Rmin" value="310"/>
@@ -62,11 +45,7 @@
 
 
   <SolidSection label="etl.xml">
-    <Polycone name="EndcapTimingLayer" startPhi="0*deg" deltaPhi="360*deg">
-      <ZSection z="[ETLzmin]"         rMin="[ETLrmin]"          rMax="[ETLrmax]" />
-      <ZSection z="[ETLzmax]"         rMin="[ETLrmin]"          rMax="[ETLrmax2]" />
-    </Polycone>
-
+    <Tubs name="EndcapTimingLayer" rMin="[ETLrmin]" rMax="[ETLrmax]" dz="0.5*[ETLthickness]" startPhi="0*deg" deltaPhi="360*deg"/>
     <Tubs name="Disc" rMin="[Disc_Rmin]*mm" rMax="[Disc_Rmax]*mm" dz="0.5*[Disc_thickness]*mm" startPhi="0*deg" deltaPhi="360*deg"/>
     <Tubs name="Al_Disc" rMin="[Disc_Rmin]*mm" rMax="[Disc_Rmax]*mm" dz="0.5*[Al_Disc_thickness]*mm" startPhi="0*deg" deltaPhi="360*deg"/>