diff --git a/compact/definitions.xml b/compact/definitions.xml index 6fc4c15a2572e60587cb7b8d9b586691de894663..0ccc4958ffd2db35609ba4b4d7c47c138c93dda0 100644 --- a/compact/definitions.xml +++ b/compact/definitions.xml @@ -403,7 +403,7 @@ <comment> EM Barrel N Layer; same number of layers for EcalThin and EcalThick</comment> <constant name="EcalBarrelLayers" - value="floor((EcalBarrelAvailTotalThickness - EcalFirstLayerThickness) / (EcalThinOneLayerThickness + EcalThickOneLayerThickness))"/> + value="floor((EcalBarrel_TotalThickness - EcalFirstLayerThickness) / (EcalThinOneLayerThickness + EcalThickOneLayerThickness))"/> <constant name="EcalBarrelThinLayers" value="EcalBarrelLayers"/> <constant name="EcalBarrelThickLayers" value="EcalBarrelLayers"/> <comment> EM Barrel Thickness </comment> @@ -412,13 +412,21 @@ <constant name="EcalBarrel_rmax" value="EcalBarrel_rmin + EcalBarrelThickness"/> <comment> EM Endcap N Layer; same number of layers for EcalThin and EcalThick </comment> - <constant name="EcalEndcapLayers" - value="floor((EcalEndcapAvailTotalThickness - EcalFirstLayerThickness) / (EcalThinOneLayerThickness + EcalThickOneLayerThickness))"/> - <constant name="EcalEndcapThinLayers" value="EcalEndcapLayers"/> - <constant name="EcalEndcapThickLayers" value="EcalEndcapLayers"/> + <constant name="EcalEndcapPLayers" + value="floor((EcalEndcapP_TotalThickness - EcalFirstLayerThickness) / (EcalThinOneLayerThickness + EcalThickOneLayerThickness))"/> + <constant name="EcalEndcapNLayers" + value="floor((EcalEndcapN_TotalThickness - EcalFirstLayerThickness) / (EcalThinOneLayerThickness + EcalThickOneLayerThickness))"/> + <constant name="EcalEndcapP_NThinLayers" value="EcalEndcapPLayers"/> + <constant name="EcalEndcapP_NThickLayers" value="EcalEndcapPLayers"/> + <constant name="EcalEndcapN_NThinLayers" value="EcalEndcapNLayers"/> + <constant name="EcalEndcapN_NThickLayers" value="EcalEndcapNLayers"/> + <comment> EM Endcap Thickness </comment> - <constant name="EcalEndcapThickness" - value="EcalFirstLayerThickness + (EcalEndcapThinLayers * EcalThinOneLayerThickness) + (EcalEndcapThickLayers * EcalThickOneLayerThickness)"/> + <constant name="EcalEndcapPThickness" + value="EcalFirstLayerThickness + (EcalEndcapP_NThinLayers * EcalThinOneLayerThickness) + (EcalEndcapP_NThickLayers * EcalThickOneLayerThickness)"/> + <constant name="EcalEndcapNThickness" + value="EcalFirstLayerThickness + (EcalEndcapN_NThinLayers * EcalThinOneLayerThickness) + (EcalEndcapN_NThickLayers * EcalThickOneLayerThickness)"/> + <comment> ------------------------------- diff --git a/compact/ecal.xml b/compact/ecal.xml index be2a125ca6a76621c663032eb0b4a74ae5d19659..ce966fcd370ab0c0de008503a1aa1c819bb750ff 100644 --- a/compact/ecal.xml +++ b/compact/ecal.xml @@ -69,9 +69,9 @@ </detector> <comment> - ----------------------------- - Forward Endcap EM Calorimeter - ----------------------------- + ------------------------------------------ + Forward (Positive Z) Endcap EM Calorimeter + ------------------------------------------ A layered EM calorimeter with tungsten and silicon (or scintillator) strips </comment> <detector id="ECalEndcapP_ID" @@ -83,7 +83,7 @@ calorimeterType="EM_ENDCAP" > <dimensions numsides="CaloSides" - zmin="EcalEndcap_zmin" + zmin="EcalEndcapP_zmin" rmin="EcalEndcapP_rmin" rmax="EcalBarrel_rmax " /> <layer repeat="1"> @@ -92,7 +92,7 @@ <slice material="Kapton" thickness="EcalKaptonThickness"/> <slice material="Air" thickness="EcalAir1Thickness"/> </layer> - <layer repeat="EcalEndcapThinLayers"> + <layer repeat="EcalEndcapP_NThinLayers"> <slice material="TungstenDens24" thickness="EcalThinTungstenThickness"/> <slice material="Air" thickness="EcalAir2Thickness"/> <slice material="Silicon" thickness="EcalSiliconThickness" sensitive="yes" limits="cal_limits"/> @@ -100,7 +100,7 @@ <slice material="Kapton" thickness="EcalKaptonThickness"/> <slice material="Air" thickness="EcalAir1Thickness"/> </layer> - <layer repeat="EcalEndcapThickLayers"> + <layer repeat="EcalEndcapP_NThickLayers"> <slice material="TungstenDens24" thickness="EcalThickTungstenThickness"/> <slice material="Air" thickness="EcalAir2Thickness"/> <slice material="Silicon" thickness="EcalSiliconThickness" sensitive="yes" limits="cal_limits"/> @@ -126,7 +126,7 @@ calorimeterType="EM_ENDCAP"> <dimensions numsides="CaloSides" - zmin="EcalEndcap_zmin" + zmin="EcalEndcapN_zmin" rmin="EcalEndcapN_rmin" rmax="EcalBarrel_rmax " /> <layer repeat="1"> @@ -135,7 +135,7 @@ <slice material="Kapton" thickness="EcalKaptonThickness"/> <slice material="Air" thickness="EcalAir1Thickness"/> </layer> - <layer repeat="EcalEndcapThinLayers"> + <layer repeat="EcalEndcapN_NThinLayers"> <slice material="TungstenDens24" thickness="EcalThinTungstenThickness"/> <slice material="Air" thickness="EcalAir2Thickness"/> <slice material="Silicon" thickness="EcalSiliconThickness" sensitive="yes" limits="cal_limits"/> @@ -143,7 +143,7 @@ <slice material="Kapton" thickness="EcalKaptonThickness"/> <slice material="Air" thickness="EcalAir1Thickness"/> </layer> - <layer repeat="EcalEndcapThickLayers"> + <layer repeat="EcalEndcapN_NThickLayers"> <slice material="TungstenDens24" thickness="EcalThickTungstenThickness"/> <slice material="Air" thickness="EcalAir2Thickness"/> <slice material="Silicon" thickness="EcalSiliconThickness" sensitive="yes" limits="cal_limits"/>