Improved geometry closer to the "canonical" reference detector.

compact/cb_DIRC.xml

@@ -7,7 +7,7 @@
   </comment>
 
   <define>
-    <constant name="cb_DIRC_length"            value="TrackerBarrelOuter_length"/>
+    <constant name="cb_DIRC_length"            value="DIRCLength"/>
     <constant name="cb_DIRC_rmin"              value="82.00*cm"/>
     <constant name="cb_DIRC_rmax"              value="88.00*cm"/>
   </define>
@@ -24,7 +24,7 @@
   <detectors>
     <detector id="BarrelDIRC_ID" name="cb_DIRC" type="cb_DIRC" readout="DIRCHits" vis="AnlTeal">
       <dimensions rmin="cb_DIRC_rmin" rmax="cb_DIRC_rmax" length="cb_DIRC_length"/>
-      <position x="0" y="0" z="0"/>
+      <position x="0" y="0" z="DIRCOffset"/>
     </detector>
   </detectors>
 

compact/ce_mrich.xml

@@ -2,7 +2,7 @@
 <lccdd>
   <define>
     <constant name="ce_MRICHRMin"   value="15*cm"/>
-    <constant name="ce_MRICHRMax"   value="BarrelTrackingAndPID_rmax"/>
+    <constant name="ce_MRICHRMax"   value="BarrelTracking_rmax"/>
     <constant name="ce_MRICHLength" value="BackwardCherenkov_length"/>
     <constant name="ce_MRICHZMin"   value="-EcalEndcapN_zmin+ce_MRICHLength"/>
 

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,8 +400,9 @@
     </comment>
 
     <constant name="TrackerBarrel_rmin"        value="VertexTrackerBarrel_rmax"/>
-    <constant name="TrackerBarrel_rmax"        value="92*cm"/>
-    <constant name="TrackerBarrelOuter_length" value="1600.0*mm"/>
+    <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="2000.0*mm"/>
     <constant name="TrackerBarrelInner_length" value="VertexTrackingRegion_length"/>
     <constant name="TrackerBarrelInner_zmax"   value="TrackerBarrelInner_length/2.0"/>
     <constant name="TrackerBarrelOuter_zmax"   value="TrackerBarrelOuter_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_rmax + 35.0 * mm"/>
     <constant name="Barrel_rmax"                value="Solenoid_rmin - 1.0 *cm "/>
     <constant name="Barrel_TotalCalThickness"   value="Barrel_rmax - EcalBarrel_rmin"/>
 
@@ -475,8 +476,6 @@
     <constant name="EcalBarrel_TotalThickness"  value="Barrel_TotalCalThickness * CalBarrelDivider"/>
     <constant name="HcalBarrel_TotalThickness"  value="Barrel_TotalCalThickness * (1.0 - CalBarrelDivider)"/>
 
-    <constant name="EcalBarrelLength"           value="CentralTracking_length + BackwardPIDLength"/>
-    <constant name="EcalBarrel_offset"          value="(CentralTracking_length -(CentralTracking_length+BackwardPIDLength))/2.0"/>
 
     <constant name="EcalEndcapP_zmin"           value="CentralTracking_length/2.0 + ForwardPIDLength"/>
     <constant name="EcalEndcapN_zmin"           value="CentralTracking_length/2.0 + BackwardPIDLength"/>
@@ -567,6 +566,8 @@
     <constant name="EcalEndcapNThickness"        
         value="EcalEndcapNLayer1_NRepeat*EcalLayer1_thickness + EcalEndcapNLayer2_NRepeat*EcalLayer2_thickness + EcalEndcapNLayer3_NRepeat*EcalLayer3_thickness"/>
 
+    <constant name="EcalBarrelLength"           value="CentralTracking_length + BackwardPIDLength + EcalEndcapNThickness - 10*cm"/>
+    <constant name="EcalBarrel_offset"          value="(CentralTracking_length - EcalBarrelLength)/2.0"/>
 
     <comment>
       -------------------------------
@@ -608,6 +609,14 @@
     <constant name="HcalEndcapP_thickness" value="HcalEndcapPLayer_NRepeat * HcalSingleLayerThickness"/>
     <constant name="HcalEndcapN_thickness" value="HcalEndcapNLayer_NRepeat * HcalSingleLayerThickness"/>
 
+    <comment>
+      ----------------------
+      DIRC parameters
+      ----------------------
+    </comment>
+    <constant name="DIRCLength"           value="CentralTracking_length + BackwardPIDLength"/>
+    <constant name="DIRCOffset"           value="(CentralTracking_length - DIRCLength)/2.0"/>
+
     <comment>
       ----------------------
       Zero Degree Parameters

compact/ecal.xml

@@ -135,7 +135,7 @@
         numsides="CaloSides" 
         zmin="EcalEndcapN_zmin" 
         rmin="EcalEndcapN_rmin" 
-        rmax="EcalBarrel_rmax " />
+        rmax="EcalBarrel_rmin " />
       <layer repeat="EcalEndcapNLayer1_NRepeat">
         <slice material="Silicon" thickness="EcalSiliconThickness" sensitive="yes" limits="cal_limits"/>
         <slice material="Copper" thickness="EcalCopperThickness"/>

compact/gem_tracker_endcap.xml

@@ -4,13 +4,13 @@
 
   <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"/>
 
     <constant name="GEMTrackerEndcapLayer_thickness"  value="ForwardTrackingGEMLength/GEMTrackerEndcap_NLayers"/>
     <constant name="GEMTrackerEndcapFoil_rmin"        value="GEMTrackerEndcapFoilX1/(tan(GEMTrackerEndcapFoilOpeningAngle/2.0)*2.0)"/>
-    <constant name="GEMTrackerEndcapFoilY"            value="BarrelTrackingAndPID_rmax- GEMTrackerEndcapFoil_rmin- 1.0*cm"/>
+    <constant name="GEMTrackerEndcapFoilY"            value="BarrelTracking_rmax- GEMTrackerEndcapFoil_rmin- 1.0*cm"/>
     <constant name="GEMTrackerEndcapFoilX2"           value="2*GEMTrackerEndcapFoilY*tan(GEMTrackerEndcapFoilOpeningAngle/2.0) +  GEMTrackerEndcapFoilX1"/>
     <constant name="GEMTrackerEndcapFoil_rmax"        value="(GEMTrackerEndcapFoilY+GEMTrackerEndcapFoil_rmin)/(cos(GEMTrackerEndcapFoilOpeningAngle/2.0))"/>
 
@@ -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>

compact/rwell_tracker_barrel.xml

@@ -23,7 +23,7 @@
   </comment>
 
   <define>
-    <constant name="RWellTrackerBarrel_length"              value="TrackerBarrelOuter_length"/>
+    <constant name="RWellTrackerBarrel_length"              value="BarrelTracking_length"/>
     <constant name="RWellTrackerBarrel_NZModules"           value="1"/>
     <constant name="RWellTrackerBarrel_NZSupport"           value="2"/>
 

compact/tof_endcap.xml

@@ -11,7 +11,7 @@
     <constant name="ForwardTOF_rmax" value="Solenoid_rmin"/>
     <constant name="BackwardTOF_zmin" value="BarrelTracking_length/2.0 + BackwardTracking_length + BackwardCherenkov_length "/>
     <constant name="BackwardTOF_rmin" value="ForwardPID_rmin1"/>
-    <constant name="BackwardTOF_rmax" value="EcalBarrel_rmin"/>
+    <constant name="BackwardTOF_rmax" value="BarrelTracking_rmax"/>
   </define>
 
   <detectors>