Update Barrel TOF

athena.xml

@@ -177,26 +177,26 @@
 
   <include ref="compact/central_tracker.xml"/>
   
-  <!--<include ref="compact/tof_barrel.xml"/>-->
+  <include ref="compact/tof_barrel.xml"/>
 
   <!--include ref="compact/rwell_tracker_barrel.xml"/-->
-  <!--<include ref="compact/cb_DIRC.xml"/>-->
+  <include ref="compact/cb_DIRC.xml"/>
 
 
-  <!--<include ref="compact/solenoid.xml"/>-->
-  <!--<include ref="compact/ecal.xml"/>
-  <include ref="compact/hcal.xml"/>-->
+  <include ref="compact/solenoid.xml"/>
+  <include ref="compact/ecal.xml"/>
+  <include ref="compact/hcal.xml"/>
   <!--include ref="compact/ce_GEM.xml"/-->
   <!--include ref="compact/gem_tracker_endcap.xml"/-->
-  <!--<include ref="compact/ce_mrich.xml"/>
+  <include ref="compact/ce_mrich.xml"/>
   <include ref="compact/tof_endcap.xml"/>
   <include ref="compact/forward_trd.xml"/>
-  <include ref="compact/forward_rich.xml"/>-->
+  <include ref="compact/forward_rich.xml"/>
 
-  <!--<include ref="compact/B0_tracker.xml"/>
+  <include ref="compact/B0_tracker.xml"/>
   <include ref="compact/far_forward_offM_tracker.xml"/>
   <include ref="compact/far_forward_romanpots.xml"/>
-  <include ref="compact/far_forward_detectors.xml"/>-->
+  <include ref="compact/far_forward_detectors.xml"/>
 
   <!--
   <include ref="compact/mm_tracker_barrel.xml"/>

compact/central_tracker.xml

@@ -68,8 +68,8 @@
     <constant name="TrackerEndcapOuter_rmin2" value="3.18*cm + 1.2*cm * 1"/>
     <constant name="TrackerEndcapOuter_rmin3" value="3.18*cm + 1.2*cm * 2"/>
 
-    <constant name="TrackerEndcapInner_rmax1" value="39.3*cm-5.0*mm"/>
-    <constant name="TrackerEndcapInner_rmax2" value="39.3*cm-5.0*mm"/>
+    <constant name="TrackerEndcapInner_rmax1" value="TrackerBarrelOuter_rmin1-5.0*mm"/>
+    <constant name="TrackerEndcapInner_rmax2" value="TrackerBarrelOuter_rmin1-5.0*mm"/>
 
     <constant name="TrackerEndcapOuter_rmax1"  value="43.23*cm"/>
     <constant name="TrackerEndcapOuter_rmax2"  value="43.23*cm"/>
@@ -398,7 +398,7 @@
         <z_layout dr="0.0 * mm" z0="0.0 * mm" nz="1"/>
       </layer>
     </detector>
-<!--
+
     <detector
       id="TrackerEndcapP_Outer_ID"
       name="TrackerEndcapP_Outer"
@@ -511,7 +511,7 @@
           zstart="0.0*mm"
           nmodules="12" dz="2.5 * mm" module="Module3" />
       </layer>
-    </detector>-->
+    </detector>
     <!--
     <detector id="TrackerEndcapP_Outer_ID" 
       name="TrackerEndcapP_Outer" 

compact/tof_barrel.xml

@@ -14,7 +14,7 @@
     </comment>
     <constant name="BarrelTOFLayer_rOffset"     value="0.5*cm"/>
 
-    <constant name="BarrelTOF_rmin1"       value="54.0*cm"/>
+    <constant name="BarrelTOF_rmin1"       value="50.0*cm"/>
     <constant name="BarrelTOF_rmin2"       value="BarrelTOF_rmin1 + BarrelTOFSpaceFrame_width"/>
     <constant name="BarrelTOF_length1"     value="105.0*cm"/>
     <constant name="BarrelTOF_length2"     value="114.0*cm"/>