diff --git a/compact/definitions.xml b/compact/definitions.xml index f9e21323b4d02f0f6f67e9b542437e94702bde22..a1f22fd9b33a360d09ca3947d22e5a901e116462 100644 --- a/compact/definitions.xml +++ b/compact/definitions.xml @@ -341,8 +341,8 @@ <constant name="ForwardPID_rmin1" value="Beampipe_rmax + 80*mm"/> <comment> Barrel PID thicknesses</comment> - <comment> Note: ExtraPID set to zero, as we have potentially trackers past PID</comment> - <constant name="BarrelExtraPIDThickness" value="0.0 * cm"/> + <comment> Note: ExtraPID has space for DIRC and optional uRWEL layers</comment> + <constant name="BarrelExtraPIDThickness" value="14.0 * cm"/> <constant name="BarrelTRDThickness" value="1.0 * cm"/> <constant name="BarrelTOFThickness" value="1.0 * cm"/> @@ -355,8 +355,8 @@ ============================ </comment> - <constant name="ForwardTracking_length" value="30.0*cm"/> - <constant name="BackwardTracking_length" value="30.0*cm"/> + <constant name="ForwardTracking_length" value="6.0*cm"/> + <constant name="BackwardTracking_length" value="6.0*cm"/> <comment> ------------------------- @@ -400,7 +400,8 @@ </comment> <constant name="TrackerBarrel_rmin" value="VertexTrackerBarrel_rmax"/> - <constant name="TrackerBarrel_rmax" value="92*cm"/> + <comment> This is just inside of the potential uRWEL detector hugging the DIRC from the inside <comment> + <constant name="TrackerBarrel_rmax" value="78*cm"/> <constant name="TrackerBarrelOuter_length" value="1600.0*mm"/> <constant name="TrackerBarrelInner_length" value="VertexTrackingRegion_length"/> <constant name="TrackerBarrelInner_zmax" value="TrackerBarrelInner_length/2.0"/> @@ -465,7 +466,7 @@ <constant name="SolenoidYokeEndcapP_zmin" value="Solenoid_length/2.0 + Solenoid_offset + HcalEndcapPExtra_length"/> <constant name="SolenoidYokeEndcapN_zmin" value="Solenoid_length/2.0 - Solenoid_offset + HcalEndcapNExtra_length"/> - <constant name="EcalBarrel_rmin" value="TrackerBarrel_rmax + 35.0 * mm"/> + <constant name="EcalBarrel_rmin" value="BarrelTrackingAndPID_length + 35.0 * mm"/> <constant name="Barrel_rmax" value="Solenoid_rmin - 1.0 *cm "/> <constant name="Barrel_TotalCalThickness" value="Barrel_rmax - EcalBarrel_rmin"/> diff --git a/compact/gem_tracker_endcap.xml b/compact/gem_tracker_endcap.xml index 12477412d427ce9c56f028cbcfbc15d5a77282b9..cde830bce8179305a3393046c289ccae7eb5cdcc 100644 --- a/compact/gem_tracker_endcap.xml +++ b/compact/gem_tracker_endcap.xml @@ -4,7 +4,7 @@ <define> <constant name="GEMTrackerEndcap_zmin" value="BarrelTracking_length/2.0"/> - <constant name="GEMTrackerEndcap_NLayers" value="5"/> + <constant name="GEMTrackerEndcap_NLayers" value="1"/> <constant name="GEMTrackerEndcapFoilOpeningAngle" value="30.1*degree"/> <constant name="GEMTrackerEndcapFoilX1" value="43.0 * mm"/> @@ -113,46 +113,6 @@ zstart="GEMTrackerEndcap_zmin + 0.5*GEMTrackerEndcapLayer_thickness" nmodules="12" dz="0 * mm" module="GEMSupportModule2" /> </layer> - <layer id="2" > - <ring vis="AnlRed" - r="GEMTrackerEndcapFoil_rmin+GEMTrackerEndcapFoilY/2.0" - zstart="GEMTrackerEndcap_zmin+1.5*GEMTrackerEndcapLayer_thickness" - nmodules="12" dz="10 * mm" module="GEMModule1" /> - <ring vis="AnlBlue" phi0="15.0*degree" - r="GEMTrackerEndcapFoil_rmin+GEMTrackerEndcapFoilY/2.0" - zstart="GEMTrackerEndcap_zmin+1.5*GEMTrackerEndcapLayer_thickness" - nmodules="12" dz="0 * mm" module="GEMSupportModule2" /> - </layer> - <layer id="3" > - <ring vis="AnlRed" - r="GEMTrackerEndcapFoil_rmin+GEMTrackerEndcapFoilY/2.0" - zstart="GEMTrackerEndcap_zmin+2.5*GEMTrackerEndcapLayer_thickness" - nmodules="12" dz="10 * mm" module="GEMModule1" /> - <ring vis="AnlBlue" phi0="15.0*degree" - r="GEMTrackerEndcapFoil_rmin+GEMTrackerEndcapFoilY/2.0" - zstart="GEMTrackerEndcap_zmin+2.5*GEMTrackerEndcapLayer_thickness" - nmodules="12" dz="0 * mm" module="GEMSupportModule2" /> - </layer> - <layer id="4" > - <ring vis="AnlRed" - r="GEMTrackerEndcapFoil_rmin+GEMTrackerEndcapFoilY/2.0" - zstart="GEMTrackerEndcap_zmin+3.5*GEMTrackerEndcapLayer_thickness" - nmodules="12" dz="10 * mm" module="GEMModule1" /> - <ring vis="AnlBlue" phi0="15.0*degree" - r="GEMTrackerEndcapFoil_rmin+GEMTrackerEndcapFoilY/2.0" - zstart="GEMTrackerEndcap_zmin+3.5*GEMTrackerEndcapLayer_thickness" - nmodules="12" dz="0 * mm" module="GEMSupportModule2" /> - </layer> - <layer id="5" > - <ring vis="AnlRed" - r="GEMTrackerEndcapFoil_rmin+GEMTrackerEndcapFoilY/2.0" - zstart="GEMTrackerEndcap_zmin+4.5*GEMTrackerEndcapLayer_thickness" - nmodules="12" dz="10 * mm" module="GEMModule1" /> - <ring vis="AnlBlue" phi0="15.0*degree" - r="GEMTrackerEndcapFoil_rmin+GEMTrackerEndcapFoilY/2.0" - zstart="GEMTrackerEndcap_zmin+4.5*GEMTrackerEndcapLayer_thickness" - nmodules="12" dz="0 * mm" module="GEMSupportModule2" /> - </layer> </detector> <detector @@ -203,46 +163,6 @@ zstart="GEMTrackerEndcap_zmin + 0.5*GEMTrackerEndcapLayer_thickness" nmodules="12" dz="0 * mm" module="GEMSupportModule2" /> </layer> - <layer id="2" > - <ring vis="AnlRed" - r="GEMTrackerEndcapFoil_rmin+GEMTrackerEndcapFoilY/2.0" - zstart="GEMTrackerEndcap_zmin+1.5*GEMTrackerEndcapLayer_thickness" - nmodules="12" dz="10 * mm" module="GEMModule1" /> - <ring vis="AnlBlue" phi0="15.0*degree" - r="GEMTrackerEndcapFoil_rmin+GEMTrackerEndcapFoilY/2.0" - zstart="GEMTrackerEndcap_zmin+1.5*GEMTrackerEndcapLayer_thickness" - nmodules="12" dz="0 * mm" module="GEMSupportModule2" /> - </layer> - <layer id="3" > - <ring vis="AnlRed" - r="GEMTrackerEndcapFoil_rmin+GEMTrackerEndcapFoilY/2.0" - zstart="GEMTrackerEndcap_zmin+2.5*GEMTrackerEndcapLayer_thickness" - nmodules="12" dz="10 * mm" module="GEMModule1" /> - <ring vis="AnlBlue" phi0="15.0*degree" - r="GEMTrackerEndcapFoil_rmin+GEMTrackerEndcapFoilY/2.0" - zstart="GEMTrackerEndcap_zmin+2.5*GEMTrackerEndcapLayer_thickness" - nmodules="12" dz="0 * mm" module="GEMSupportModule2" /> - </layer> - <layer id="4" > - <ring vis="AnlRed" - r="GEMTrackerEndcapFoil_rmin+GEMTrackerEndcapFoilY/2.0" - zstart="GEMTrackerEndcap_zmin+3.5*GEMTrackerEndcapLayer_thickness" - nmodules="12" dz="10 * mm" module="GEMModule1" /> - <ring vis="AnlBlue" phi0="15.0*degree" - r="GEMTrackerEndcapFoil_rmin+GEMTrackerEndcapFoilY/2.0" - zstart="GEMTrackerEndcap_zmin+3.5*GEMTrackerEndcapLayer_thickness" - nmodules="12" dz="0 * mm" module="GEMSupportModule2" /> - </layer> - <layer id="5" > - <ring vis="AnlRed" - r="GEMTrackerEndcapFoil_rmin+GEMTrackerEndcapFoilY/2.0" - zstart="GEMTrackerEndcap_zmin+4.5*GEMTrackerEndcapLayer_thickness" - nmodules="12" dz="10 * mm" module="GEMModule1" /> - <ring vis="AnlBlue" phi0="15.0*degree" - r="GEMTrackerEndcapFoil_rmin+GEMTrackerEndcapFoilY/2.0" - zstart="GEMTrackerEndcap_zmin+4.5*GEMTrackerEndcapLayer_thickness" - nmodules="12" dz="0 * mm" module="GEMSupportModule2" /> - </layer> </detector> </detectors>