From f497e29876033474aa9a7aaa37a0ae18671a6852 Mon Sep 17 00:00:00 2001 From: Whitney Armstrong <warmstrong@anl.gov> Date: Fri, 26 Mar 2021 23:24:25 -0500 Subject: [PATCH] modified: compact/definitions.xml --- compact/definitions.xml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/compact/definitions.xml b/compact/definitions.xml index 68cd384..8e4841e 100644 --- a/compact/definitions.xml +++ b/compact/definitions.xml @@ -395,17 +395,18 @@ <comment> Layer Thickness </comment> <constant name="EcalFirstLayerThickness" - value="EcalSiliconThickness + EcalCopperThickness + EcalKaptonThickness + EcalAir1Thickness"/> + value="EcalSiliconThickness + EcalCopperThickness + EcalKaptonThickness + EcalAir1Thickness"/> <constant name="EcalThinOneLayerThickness" - value="EcalThinTungstenThickness + EcalAir2Thickness + EcalSiliconThickness + EcalCopperThickness + EcalKaptonThickness + EcalAir1Thickness"/> + value="EcalThinTungstenThickness + EcalAir2Thickness + EcalSiliconThickness + EcalCopperThickness + EcalKaptonThickness + EcalAir1Thickness"/> <constant name="EcalThickOneLayerThickness" - value="EcalThickTungstenThickness + EcalAir2Thickness + EcalSiliconThickness + EcalCopperThickness + EcalKaptonThickness + EcalAir1Thickness"/> + value="EcalThickTungstenThickness + EcalAir2Thickness + EcalSiliconThickness + EcalCopperThickness + EcalKaptonThickness + EcalAir1Thickness"/> <comment> EM Barrel N Layer; same number of layers for EcalThin and EcalThick</comment> <constant name="EcalBarrelLayers" value="floor((EcalBarrel_TotalThickness - EcalFirstLayerThickness) / (EcalThinOneLayerThickness + EcalThickOneLayerThickness))"/> <constant name="EcalBarrelThinLayers" value="EcalBarrelLayers"/> <constant name="EcalBarrelThickLayers" value="EcalBarrelLayers"/> + <comment> EM Barrel Thickness </comment> <constant name="EcalBarrelThickness" value="EcalFirstLayerThickness + (EcalBarrelThinLayers * EcalThinOneLayerThickness) + (EcalBarrelThickLayers * EcalThickOneLayerThickness)"/> -- GitLab