Skip to content
Snippets Groups Projects
Commit c6168d63 authored by Whitney Armstrong's avatar Whitney Armstrong
Browse files

modified: compact/definitions.xml

parent 55e32640
No related branches found
No related tags found
No related merge requests found
Pipeline #7740 failed
This commit is part of merge request !22. Comments created here will be created in the context of that merge request.
...@@ -403,19 +403,19 @@ ...@@ -403,19 +403,19 @@
<comment> EM Barrel N Layer; same number of layers for EcalThin and EcalThick</comment> <comment> EM Barrel N Layer; same number of layers for EcalThin and EcalThick</comment>
<constant name="EcalBarrelLayers" <constant name="EcalBarrelLayers"
value="floor((EcalBarrel_TotalThickness - EcalFirstLayerThickness) / (EcalThinOneLayerThickness + EcalThickOneLayerThickness))"/> value="floor((EcalBarrel_TotalThickness - EcalFirstLayerThickness) / (EcalThinOneLayerThickness + EcalThickOneLayerThickness))"/>
<constant name="EcalBarrelThinLayers" value="EcalBarrelLayers"/> <constant name="EcalBarrelThinLayers" value="EcalBarrelLayers"/>
<constant name="EcalBarrelThickLayers" value="EcalBarrelLayers"/> <constant name="EcalBarrelThickLayers" value="EcalBarrelLayers"/>
<comment> EM Barrel Thickness </comment> <comment> EM Barrel Thickness </comment>
<constant name="EcalBarrelThickness" <constant name="EcalBarrelThickness"
value="EcalFirstLayerThickness + (EcalBarrelThinLayers * EcalThinOneLayerThickness) + (EcalBarrelThickLayers * EcalThickOneLayerThickness)"/> value="EcalFirstLayerThickness + (EcalBarrelThinLayers * EcalThinOneLayerThickness) + (EcalBarrelThickLayers * EcalThickOneLayerThickness)"/>
<constant name="EcalBarrel_rmax" value="EcalBarrel_rmin + EcalBarrelThickness"/> <constant name="EcalBarrel_rmax" value="EcalBarrel_rmin + EcalBarrelThickness"/>
<comment> EM Endcap N Layer; same number of layers for EcalThin and EcalThick </comment> <comment> EM Endcap N Layer; same number of layers for EcalThin and EcalThick </comment>
<constant name="EcalEndcapPLayers" <constant name="EcalEndcapPLayers"
value="floor((EcalEndcapP_TotalThickness - EcalFirstLayerThickness) / (EcalThinOneLayerThickness + EcalThickOneLayerThickness))"/> value="floor((EcalEndcapP_TotalThickness - EcalFirstLayerThickness) / (EcalThinOneLayerThickness + EcalThickOneLayerThickness))"/>
<constant name="EcalEndcapNLayers" <constant name="EcalEndcapNLayers"
value="floor((EcalEndcapN_TotalThickness - EcalFirstLayerThickness) / (EcalThinOneLayerThickness + EcalThickOneLayerThickness))"/> value="floor((EcalEndcapN_TotalThickness - EcalFirstLayerThickness) / (EcalThinOneLayerThickness + EcalThickOneLayerThickness))"/>
<constant name="EcalEndcapP_NThinLayers" value="EcalEndcapPLayers"/> <constant name="EcalEndcapP_NThinLayers" value="EcalEndcapPLayers"/>
<constant name="EcalEndcapP_NThickLayers" value="EcalEndcapPLayers"/> <constant name="EcalEndcapP_NThickLayers" value="EcalEndcapPLayers"/>
<constant name="EcalEndcapN_NThinLayers" value="EcalEndcapNLayers"/> <constant name="EcalEndcapN_NThinLayers" value="EcalEndcapNLayers"/>
...@@ -423,9 +423,9 @@ ...@@ -423,9 +423,9 @@
<comment> EM Endcap Thickness </comment> <comment> EM Endcap Thickness </comment>
<constant name="EcalEndcapPThickness" <constant name="EcalEndcapPThickness"
value="EcalFirstLayerThickness + (EcalEndcapP_NThinLayers * EcalThinOneLayerThickness) + (EcalEndcapP_NThickLayers * EcalThickOneLayerThickness)"/> value="EcalFirstLayerThickness + (EcalEndcapP_NThinLayers * EcalThinOneLayerThickness) + (EcalEndcapP_NThickLayers * EcalThickOneLayerThickness)"/>
<constant name="EcalEndcapNThickness" <constant name="EcalEndcapNThickness"
value="EcalFirstLayerThickness + (EcalEndcapN_NThinLayers * EcalThinOneLayerThickness) + (EcalEndcapN_NThickLayers * EcalThickOneLayerThickness)"/> value="EcalFirstLayerThickness + (EcalEndcapN_NThinLayers * EcalThinOneLayerThickness) + (EcalEndcapN_NThickLayers * EcalThickOneLayerThickness)"/>
<comment> <comment>
...@@ -435,7 +435,7 @@ ...@@ -435,7 +435,7 @@
</comment> </comment>
<constant name="HcalBarrel_rmin" value="EcalBarrel_rmax+10.0*mm"/> <constant name="HcalBarrel_rmin" value="EcalBarrel_rmax+10.0*mm"/>
<constant name="HcalBarrelAvailThickness" value="HcalBarrel_rmax - HcalBarrel_rmin"/> <constant name="HcalBarrelAvailThickness" value="HcalBarrel_rmax - HcalBarrel_rmin"/>
<constant name="HcalBarrelLength" value="EcalBarrelLength+2.0*EcalEndcapThickness + 10.0*mm "/> <constant name="HcalBarrelLength" value="EcalBarrelLength+EcalEndcapP_TotalThickness + EcalEndcapN_TotalThickness + 10.0*mm "/>
<constant name="HcalEndcap_zmin" value="HcalBarrelLength/2.0"/> <constant name="HcalEndcap_zmin" value="HcalBarrelLength/2.0"/>
<constant name="HcalEndcapAvailThickness" value="(SolenoidYokeEndcap_zmin - 10.0 * mm) - HcalEndcap_zmin"/> <constant name="HcalEndcapAvailThickness" value="(SolenoidYokeEndcap_zmin - 10.0 * mm) - HcalEndcap_zmin"/>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment