modified: compact/cb_CTD_Si.xml

	modified:   compact/definitions.xml
	deleted:    compact/refdetector_defs.xml

compact/cb_CTD_Si.xml

@@ -3,6 +3,9 @@
   <comment> Central Barrel Tracker Silicon </comment>        
 
   <define>
+    <comment> Si layer opiton </comment>
+    <constant name="cb_CTD_Si_gap"    value="5.0 * cm"/>
+    <constant name="cb_CTD_Si_layer"  value="15"/>
   </define>
 
   <limits>

compact/definitions.xml

@@ -307,7 +307,7 @@
     <constant name="ForwardTOFLength" value="10.0*cm"/>
     <constant name="ForwardPIDLength" value="RICHLength + TRDLength + ForwardTOFLength"/>
     
-    <constant name="BackwardCherenkovLength"   value="50.0*cm"/>
+    <constant name="BackwardCherenkovLength"   value="15.0*cm"/>
     <constant name="BackwardTOFLength"         value="10.0*cm"/>
     <constant name="BackwardPIDLength"         value="BackwardCherenkovLength + BackwardTOFLength"/>
 
@@ -346,22 +346,13 @@
       -------------------------------
       Central Barrel Tracker - Global
       -------------------------------
+
+      The cb_CTD_* parameters can probably be moved to the detector specific xml file.
     </comment>
-    <constant name="cb_CTD_rmin"   value="21.0 * cm"/>
-    <constant name="cb_CTD_rmax"   value="80.0 * cm"/>
-    <constant name="cb_CTD_zmax"   value="200.0 * cm"/>
-    <comment> Original Global parameter </comment>	    
-    <!--
-    <constant name="cb_CTD_zmax"   value="120.0 * cm"/>
-    -->	    
-    <constant name="cb_CTD_length" value="Solenoid_length - cb_CTD_zmax"/>
-    <comment> After fix cb_Solenoid parameters  </comment>
-    <!--	    
-    <constant name="cb_CTD_length" value="cb_Solenoid_z - cb_CTD_zmax"/>
-    -->
-    <comment> Si layer opiton </comment>
-    <constant name="cb_CTD_Si_gap"    value="5.0 * cm"/>
-    <constant name="cb_CTD_Si_layer"  value="15"/>
+    <constant name="cb_CTD_rmin"   value="SiliconTrackerInnerRadius"/>
+    <constant name="cb_CTD_rmax"   value="SiliconTrackerOuterRadius"/>
+    <constant name="cb_CTD_zmax"   value="SiliconTrackerOuterBarrel_zmax"/>
+    <constant name="cb_CTD_length" value="SiliconTrackerOuterBarrelLength"/>
 
     <comment>
       ------------
@@ -579,8 +570,8 @@
     </comment>
     <constant name="ce_MRICHRMin"   value="15*cm"/>
     <constant name="ce_MRICHRMax"   value="100*cm"/>
-    <constant name="ce_MRICHLength" value="15*cm"/>
-    <constant name="ce_MRICHZMin" value="-EcalEndcapP_zmin+10.*cm"/>
+    <constant name="ce_MRICHLength" value="BackwardCherenkovLength"/>
+    <constant name="ce_MRICHZMin"   value="-EcalEndcapN_zmin+ce_MRICHLength"/>
 
     <comment>
       ------------------

compact/refdetector_defs.xml

-  <!-- Define parameter -->
-  <define>
-    <constant name="world_side" value="50*m"/>
-    <constant name="world_x"    value="world_side"/>
-    <constant name="world_y"    value="world_side"/>
-    <constant name="world_z"    value="world_side"/>
-
-    <constant name="tracker_region_zmax" value="6 * m"/>
-    <constant name="tracker_region_rmax" value="6 * m"/>
-
-  </define>