Acts tracking geo fix.

modified:   src/BarrelTrackerWithFrame_geo.cpp

modified: src/SimpleDiskTracker_geo.cpp

compact/central_tracker.xml

@@ -66,9 +66,9 @@
     <constant name="TrackerEndcapInner_rmin2" value="Beampipe_rmax+1.0*cm"/>
     <constant name="TrackerEndcapOuter_rmin"  value="3.18*cm"/>
 
-    <constant name="TrackerEndcapInner_rmax1" value="18.5*cm"/>
-    <constant name="TrackerEndcapInner_rmax2" value="18.5*cm + TrackerBarrelInner_thickness"/>
-    <constant name="TrackerEndcapOuter_rmax"  value="43.23*cm"/>
+    <constant name="TrackerEndcapInner_rmax1" value="TrackerBarrelOuter_rmin1 - 1.0*cm"/>
+    <constant name="TrackerEndcapInner_rmax2" value="TrackerEndcapInner_rmax1"/>
+    <constant name="TrackerEndcapOuter_rmax"  value="TrackerBarrelOuter_rmin2+TrackerBarrelOuter_thickness*2"/>
 
 
     <comment> TODO: These should be computed </comment>
@@ -89,18 +89,10 @@
       Note: Endcap trackers are using SimpleDiskTracker construction.
             This should be changed to something more detailed in the future.
     </comment>
-    <detector id="TrackerSubAssemblyLayer1_ID"
-      name="TrackerSubAssemblyLayer1"
-      type="DD4hep_SubdetectorAssembly"
-      vis="TrackerSubAssemblyVis">
-      <composite name="TrackerEndcapN_Layer1"/>
-      <composite name="TrackerEndcapP_Layer1"/>
-      <composite name="TrackerBarrel_Layer1"/>
-    </detector>
 
     <detector
       id="TrackerBarrel_Layer1_ID"
-      name="TrackerBarrel_Layer1"
+      name="Tracker1Barrel"
       type="athena_TrackerBarrel"
       readout="TrackerBarrelHits"
       insideTrackingVolume="true">
@@ -143,9 +135,8 @@
         <z_layout dr="0.0 * mm" z0="0.0 * mm" nz="1"/>
       </layer>
     </detector>
-
     <detector id="TrackerEndcapP_Layer1_ID" 
-      name="TrackerEndcapP_Layer1" 
+      name="Tracker1EndcapP" 
       type="athena_SimpleDiskTracker"
       readout="TrackerEndcapHits"
       insideTrackingVolume="true" 
@@ -166,7 +157,7 @@
     </detector>
 
     <detector id="TrackerEndcapN_Layer1_ID" 
-      name="TrackerEndcapN_Layer1" 
+      name="Tracker1EndcapN" 
       type="athena_SimpleDiskTracker"
       readout="TrackerEndcapHits"
       insideTrackingVolume="true" 
@@ -191,6 +182,7 @@
       Outer Tracker Subassembly (group 2)
       -----------------------------------
     </comment>
+    <!--
     <detector id="TrackerSubAssemblyLayer2_ID"
       name="TrackerSubAssemblyLayer2"
       type="DD4hep_SubdetectorAssembly"
@@ -300,6 +292,7 @@
       </layer>
     </detector>
 
+-->
   </detectors>
 
   <readouts>