diff --git a/compact/ecal_barrel_interlayers.xml b/compact/ecal_barrel_interlayers.xml index 110c18e93ce7d2dfb018c1ad3820a3451453a0eb..a0d3b727e6ca81ff9d7e182a8e6cdbb6d718aace 100644 --- a/compact/ecal_barrel_interlayers.xml +++ b/compact/ecal_barrel_interlayers.xml @@ -22,13 +22,13 @@ <constant name="EcalBarrel_FiberRadius" value="0.5*mm"/> <constant name="EcalBarrel_FiberXSpacing" value="1.34*mm"/> <constant name="EcalBarrel_FiberZSpacing" value="1.22*mm"/> - <constant name="EcalBarrel_SpaceBetween" value="1*mm"/> - <constant name="EcalBarrel_FiberChunkLayers_num" value = "10"/> + <constant name="EcalBarrel_SpaceBetween" value="0.1*mm"/> + <constant name="EcalBarrel_FiberChunkLayers_num" value = "15"/> <comment> For Pb/SiFi (GlueX): X0 ~ 1.45 cm For W/SiFi (sPHENIX): X0 ~ 0.7 cm (but different fiber orientation) </comment> - <constant name="EcalBarrel_RadiatorThickness" value="EcalBarrel_FiberZSpacing*12"/> + <constant name="EcalBarrel_RadiatorThickness" value="EcalBarrel_FiberZSpacing*13"/> <constant name="EcalBarrel_ModRepeat" value="CaloSides"/> <constant name="EcalBarrel_ModLength" value="0.5*m"/> <constant name="EcalBarrel_ModWidth" value="0.5*m"/> @@ -39,6 +39,9 @@ + EcalBarrel_CopperThickness + EcalBarrel_KaptonThickness + EcalBarrel_EpoxyThickness + + EcalBarrel_CarbonThickness"/> + <constant name="EcalBarrel_ScFiLayerThickness" + value="EcalBarrel_RadiatorThickness + EcalBarrel_CarbonThickness + EcalBarrel_LayerSpacing"/> @@ -51,7 +54,7 @@ value="max(0, EcalBarrel_AvailThickness- (EcalBarrelImagingLayers_num*EcalBarrel_ImagingLayerThickness))"/> <constant name="EcalBarrel_FiberLayerThickness" - value="min(EcalBarrel_FiberLayerThickness_max, EcalBarrel_FiberZSpacing*12*15)"/> + value="min(EcalBarrel_FiberLayerThickness_max, EcalBarrel_FiberZSpacing*13*15)"/> </define> <limits> @@ -84,7 +87,7 @@ z="EcalBarrel_length"/> <staves vis="EcalBarrelStave_vis"/> <layer repeat="EcalBarrelImagingLayers_num" vis="AnlBlue" - space_between="EcalBarrel_RadiatorThickness + EcalBarrel_SpaceBetween" + space_between="EcalBarrel_ScFiLayerThickness + EcalBarrel_SpaceBetween" space_before="0.*cm"> <slice material="Silicon" thickness="EcalBarrel_SiliconThickness" sensitive="yes" limits="cal_limits" vis="AnlGray"/> <slice material="Silicon" thickness="EcalBarrel_ElectronicsThickness" vis="AnlGold"/> @@ -92,7 +95,6 @@ <slice material="Kapton" thickness="EcalBarrel_KaptonThickness" vis="AnlGold"/> <slice material="Epoxy" thickness="EcalBarrel_EpoxyThickness" vis="AnlGray"/> <slice material="CarbonFiber" thickness="EcalBarrel_CarbonThickness" vis="AnlGold"/> - <slice material="Air" thickness="EcalBarrel_LayerSpacing " vis="AnlGold"/> </layer> </detector> @@ -129,6 +131,8 @@ spacing_x="EcalBarrel_FiberXSpacing" spacing_z="EcalBarrel_FiberZSpacing"/> </slice> + <slice material="CarbonFiber" thickness="EcalBarrel_CarbonThickness" vis="AnlGold"/> + <slice material="Air" thickness="EcalBarrel_LayerSpacing " vis="AnlGold"/> </layer> <layer repeat="EcalBarrel_FiberChunkLayers_num" vis="AnlBlue" space_before="EcalBarrel_ImagingLayerThickness + EcalBarrel_SpaceBetween">