Commit 200bc303 authored by Jihee Kim's avatar Jihee Kim Committed by Whitney Armstrong
Browse files

Detector Param

parent 9ff08047
Pipeline #6672 passed with stages
in 5 minutes and 9 seconds
......@@ -82,7 +82,7 @@
<slice material="Kapton" thickness="EcalKaptonThickness"/>
<slice material="Air" thickness="EcalAir1Thickness"/>
</layer>
<layer repeat="EcalThinLayers">
<layer repeat="EcalBarrelThinLayers">
<slice material="TungstenDens24" thickness="EcalThinTungstenThickness"/>
<slice material="Air" thickness="EcalAir2Thickness"/>
<slice material="Silicon" thickness="EcalSiliconThickness" sensitive="yes" limits="cal_limits"/>
......@@ -90,7 +90,7 @@
<slice material="Kapton" thickness="EcalKaptonThickness"/>
<slice material="Air" thickness="EcalAir1Thickness"/>
</layer>
<layer repeat="EcalThickLayers">
<layer repeat="EcalBarrelThickLayers">
<slice material="TungstenDens24" thickness="EcalThickTungstenThickness"/>
<slice material="Air" thickness="EcalAir2Thickness"/>
<slice material="Silicon" thickness="EcalSiliconThickness" sensitive="yes" limits="cal_limits"/>
......@@ -124,7 +124,7 @@
<slice material="Kapton" thickness="EcalKaptonThickness"/>
<slice material="Air" thickness="EcalAir1Thickness"/>
</layer>
<layer repeat="EcalThinLayers">
<layer repeat="EcalEndcapThinLayers">
<slice material="TungstenDens24" thickness="EcalThinTungstenThickness"/>
<slice material="Air" thickness="EcalAir2Thickness"/>
<slice material="Silicon" thickness="EcalSiliconThickness" sensitive="yes" limits="cal_limits"/>
......@@ -132,7 +132,7 @@
<slice material="Kapton" thickness="EcalKaptonThickness"/>
<slice material="Air" thickness="EcalAir1Thickness"/>
</layer>
<layer repeat="EcalThickLayers">
<layer repeat="EcalEndcapThickLayers">
<slice material="TungstenDens24" thickness="EcalThickTungstenThickness"/>
<slice material="Air" thickness="EcalAir2Thickness"/>
<slice material="Silicon" thickness="EcalSiliconThickness" sensitive="yes" limits="cal_limits"/>
......@@ -167,7 +167,7 @@
<slice material="Kapton" thickness="EcalKaptonThickness"/>
<slice material="Air" thickness="EcalAir1Thickness"/>
</layer>
<layer repeat="EcalThinLayers">
<layer repeat="EcalEndcapThinLayers">
<slice material="TungstenDens24" thickness="EcalThinTungstenThickness"/>
<slice material="Air" thickness="EcalAir2Thickness"/>
<slice material="Silicon" thickness="EcalSiliconThickness" sensitive="yes" limits="cal_limits"/>
......@@ -175,7 +175,7 @@
<slice material="Kapton" thickness="EcalKaptonThickness"/>
<slice material="Air" thickness="EcalAir1Thickness"/>
</layer>
<layer repeat="EcalThickLayers">
<layer repeat="EcalEndcapThickLayers">
<slice material="TungstenDens24" thickness="EcalThickTungstenThickness"/>
<slice material="Air" thickness="EcalAir2Thickness"/>
<slice material="Silicon" thickness="EcalSiliconThickness" sensitive="yes" limits="cal_limits"/>
......
......@@ -28,7 +28,7 @@
rmin="HcalBarrel_rmin"
z="HcalBarrelLength"/>
<staves vis="HcalBarrelVis"/>
<layer repeat="HcalLayers">
<layer repeat="HcalBarrelLayers">
<slice material="Steel235" thickness="HcalSteelThickness"/>
<slice material="PyrexGlass" thickness="HcalPyrexThickness"/>
<slice material="RPCGasDefault" thickness="HcalRPCGasThickness" sensitive="yes" limits="cal_limits"/>
......@@ -51,7 +51,7 @@
zmin="HcalEndcap_zmin"
rmin="HcalEndcapP_rmin"
rmax="HcalBarrel_rmax"/>
<layer repeat="HcalLayers" vis="HcalEndcapVis" >
<layer repeat="HcalEndcapLayers" vis="HcalEndcapVis" >
<slice material="Steel235" thickness="HcalSteelThickness"/>
<slice material="PyrexGlass" thickness="HcalPyrexThickness"/>
<slice material="RPCGasDefault" thickness="HcalRPCGasThickness" sensitive="yes" limits="cal_limits"/>
......@@ -73,7 +73,7 @@
zmin="HcalEndcap_zmin"
rmin="HcalEndcapN_rmin"
rmax="HcalBarrel_rmax"/>
<layer repeat="HcalLayers" vis="HcalEndcapVis" >
<layer repeat="HcalEndcapLayers" vis="HcalEndcapVis" >
<slice material="Steel235" thickness="HcalSteelThickness"/>
<slice material="PyrexGlass" thickness="HcalPyrexThickness"/>
<slice material="RPCGasDefault" thickness="HcalRPCGasThickness" sensitive="yes" limits="cal_limits"/>
......
......@@ -205,66 +205,104 @@
<constant name="SiliconTrackerOuterRadius" value="860.0*mm"/>
<constant name="SiliconTrackerOuterBarrelLength" value="SiliconTrackerOuterRadius*2"/>
<comment>
------------
Calorimeters
------------
</comment>
<constant name="EcalBarrel_rmin" value="SiliconTrackerOuterRadius + 3.0 * cm"/>
<constant name="HcalBarrel_rmax" value="Solenoid_rmin - 10.0 * mm "/>
<constant name="AvailTotalBarrelCalorimetryThickness" value="HcalBarrel_rmax - EcalBarrel_rmin"/>
<constant name="CalBarrelDivider" value="0.5"/> <!-- Ecal and Hcal have the same thickness -->
<constant name="EcalBarrelAvailTotalThickness" value="AvailTotalBarrelCalorimetryThickness * CalBarrelDivider"/>
<constant name="HcalBarrelAvailTotalThickness" value="AvailTotalBarrelCalorimetryThickness * (1.0 - CalBarrelDivider)"/>
<constant name="EcalBarrelLength" value="SiliconTrackerOuterBarrelLength+50.0*cm"/>
<constant name="EcalEndcap_zmin" value="EcalBarrelLength/2.0"/>
<constant name="AvailTotalEndcapCalorimetryThickness" value="(SolenoidYokeEndcap_zmin - 10.0 * mm) - (EcalEndcap_zmin + 10.0 * mm)"/>
<constant name="CalEndcapDivider" value="0.5"/> <!-- Ecal and Hcal have the same thickness -->
<constant name="EcalEndcapAvailTotalThickness" value="AvailTotalEndcapCalorimetryThickness * CalEndcapDivider"/>
<constant name="HcalEndcapAvailTotalThickness" value="AvailTotalEndcapCalorimetryThickness * (1.0 - CalEndcapDivider)"/>
<constant name="EcalEndcapP_rmin" value="250.0*mm"/>
<constant name="EcalEndcapN_rmin" value="350.0*mm"/>
<constant name="HcalEndcapP_rmin" value="250.0 * mm"/>
<constant name="HcalEndcapN_rmin" value="350.0 * mm"/>
<comment>
-------------------------
EM Calorimeter Parameters
-------------------------
</comment>
<constant name="CaloSides" value="12"/>
<constant name="EcalThinLayers" value="10"/>
<constant name="EcalThickLayers" value="10"/>
<constant name="EcalSiliconThickness" value="0.32 * mm"/>
<!-- Material Thickness -->
<constant name="EcalSiliconThickness" value="9.00 * mm"/>
<constant name="EcalCopperThickness" value="0.05 * mm"/>
<constant name="EcalKaptonThickness" value="0.3 * mm"/>
<constant name="EcalKaptonThickness" value="0.30 * mm"/>
<constant name="EcalAir1Thickness" value="0.33 * mm"/>
<constant name="EcalAir2Thickness" value="0.25 * mm"/>
<constant name="EcalThinTungstenThickness" value="2.5 * mm"/>
<constant name="EcalThickTungstenThickness" value="10 * mm"/>
<constant name="EcalBarrelFixedLayersThickness"
value="EcalAir2Thickness + EcalSiliconThickness + EcalCopperThickness + EcalKaptonThickness + EcalAir1Thickness"/>
<constant name="EcalThinTungstenThickness" value="2.50 * mm"/>
<constant name="EcalThickTungstenThickness" value="5.00 * mm"/>
<!-- Layer Thickness -->
<constant name="EcalFirstLayerThickness"
value="EcalSiliconThickness + EcalCopperThickness + EcalKaptonThickness + EcalAir1Thickness"/>
<constant name="EcalThinOneLayerThickness"
value="EcalThinTungstenThickness + EcalAir2Thickness + EcalSiliconThickness + EcalCopperThickness + EcalKaptonThickness + EcalAir1Thickness"/>
<constant name="EcalThickOneLayerThickness"
value="EcalThickTungstenThickness + EcalAir2Thickness + EcalSiliconThickness + EcalCopperThickness + EcalKaptonThickness + EcalAir1Thickness"/>
<!-- EM Barrel N Layer; same number of layers for EcalThin and EcalThick -->
<constant name="EcalBarrelLayers"
value="floor((EcalBarrelAvailTotalThickness - EcalFirstLayerThickness) / (EcalThinOneLayerThickness + EcalThickOneLayerThickness))"/>
<constant name="EcalBarrelThinLayers" value="EcalBarrelLayers"/>
<constant name="EcalBarrelThickLayers" value="EcalBarrelLayers"/>
<!-- EM Barrel Thickness -->
<constant name="EcalBarrelThickness"
value="EcalSiliconThickness + EcalCopperThickness + EcalKaptonThickness + EcalAir1Thickness +
(EcalThinLayers * (EcalThinTungstenThickness + EcalBarrelFixedLayersThickness)) +
(EcalThickLayers * (EcalThickTungstenThickness + EcalBarrelFixedLayersThickness))"/>
<constant name="EcalBarrel_rmin" value="SiliconTrackerOuterRadius+3.0*cm"/>
value="EcalFirstLayerThickness + (EcalBarrelThinLayers * EcalThinOneLayerThickness) + (EcalBarrelThickLayers * EcalThickOneLayerThickness)"/>
<constant name="EcalBarrel_rmax" value="EcalBarrel_rmin + EcalBarrelThickness"/>
<constant name="EcalBarrelLength" value="SiliconTrackerOuterBarrelLength+50.0*cm"/>
<constant name="EcalEndcap_zmin" value="EcalBarrelLength/2.0"/>
<constant name="EcalEndcapThickness" value="EcalBarrelThickness"/>
<constant name="EcalEndcapP_rmin" value="250.0*mm"/>
<constant name="EcalEndcapN_rmin" value="350.0*mm"/>
<!-- EM Endcap N Layer; same number of layers for EcalThin and EcalThick -->
<constant name="EcalEndcapLayers"
value="floor((EcalEndcapAvailTotalThickness - EcalFirstLayerThickness) / (EcalThinOneLayerThickness + EcalThickOneLayerThickness))"/>
<constant name="EcalEndcapThinLayers" value="EcalEndcapLayers"/>
<constant name="EcalEndcapThickLayers" value="EcalEndcapLayers"/>
<!-- EM Endcap Thickness -->
<constant name="EcalEndcapThickness"
value="EcalFirstLayerThickness + (EcalEndcapThinLayers * EcalThinOneLayerThickness) + (EcalEndcapThickLayers * EcalThickOneLayerThickness)"/>
<comment>
-------------------------------
Hadronic Calorimeter Parameters
-------------------------------
</comment>
<constant name="HcalBarrel_rmin" value="EcalBarrel_rmax+10.0*mm"/>
<constant name="HcalBarrel_rmax" value="Solenoid_rmin - 10.0*mm "/>
<constant name="HcalBarrelThickness" value="HcalBarrel_rmax - HcalBarrel_rmin "/>
<constant name="HcalBarrelLength" value="EcalBarrelLength+2.0*EcalEndcapThickness + 10.0*mm "/>
<constant name="HcalEndcap_zmin" value="HcalBarrelLength/2.0"/>
<constant name="HcalEndcapThickness" value="HcalBarrelThickness"/>
<constant name="HcalEndcapP_rmin" value="250.0*mm"/>
<constant name="HcalEndcapN_rmin" value="350.0*mm"/>
<constant name="HcalLayers" value="8"/>
<constant name="HcalSteelThickness" value="1.89 * cm"/>
<constant name="HcalPyrexThickness" value="1.1 * mm"/>
<constant name="HcalRPCGasThickness" value="1.2 * mm"/>
<constant name="HcalG10Thickness" value="3 * mm"/>
<constant name="HcalAirThickness" value="1.6 * mm"/>
<constant name="HcalBarrelThickness" value="HcalBarrel_rmax - HcalBarrel_rmin"/>
<constant name="HcalEndcapThickness" value="HcalBarrelThickness"/>
<constant name="HcalThickness" value="HcalBarrelThickness"/>
<constant name="HcalBarrel_rmin" value="EcalBarrel_rmax+10.0*mm"/>
<constant name="HcalBarrelAvailThickness" value="HcalBarrel_rmax - HcalBarrel_rmin"/>
<constant name="HcalBarrelLength" value="EcalBarrelLength+2.0*EcalEndcapThickness + 10.0*mm "/>
<constant name="HcalEndcap_zmin" value="HcalBarrelLength/2.0"/>
<constant name="HcalEndcapAvailThickness" value="(SolenoidYokeEndcap_zmin - 10.0 * mm) - HcalEndcap_zmin"/>
<!-- Material Thickness -->
<constant name="HcalSteelThickness" value="1.89 * cm"/>
<constant name="HcalPyrexThickness" value="1.10 * mm"/>
<constant name="HcalRPCGasThickness" value="1.20 * mm"/>
<constant name="HcalG10Thickness" value="3.00 * mm"/>
<constant name="HcalAirThickness" value="1.60 * mm"/>
<!-- Layer Thickness -->
<constant name="HcalOneLayerThickness"
value="HcalSteelThickness + (2 * HcalPyrexThickness) + HcalRPCGasThickness + HcalG10Thickness + HcalAirThickness"/>
<!-- H Barrel Layers and Thickness -->
<constant name="HcalBarrelLayers" value="floor(HcalBarrelAvailThickness / HcalOneLayerThickness)"/>
<constant name="HcalBarrelThickness" value="HcalBarrelLayers * HcalOneLayerThickness"/>
<!-- H Endcap Layers and Thickness -->
<constant name="HcalEndcapLayers" value="floor(HcalEndcapAvailThickness / HcalOneLayerThickness)"/>
<constant name="HcalEndcapThickness" value="HcalEndcapLayers * HcalOneLayerThickness"/>
<comment>
-----------------------
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment