diff --git a/Detector/DetCRD/compact/CRD_common_v01/DC_Simple_v01_01.xml b/Detector/DetCRD/compact/CRD_common_v01/DC_Simple_v01_01.xml
index 2c5a3e5b432c2c9f09a4e946982c3e67e9ae5cb7..a35b1c7de724898c5243de0cae5816596cf9183d 100644
--- a/Detector/DetCRD/compact/CRD_common_v01/DC_Simple_v01_01.xml
+++ b/Detector/DetCRD/compact/CRD_common_v01/DC_Simple_v01_01.xml
@@ -19,10 +19,10 @@
<constant name="DC_length" value="DC_half_length*2"/>
<constant name="SDT_inner_chamber_radius_min" value="DC_inner_chamber_layer_rbegin-DC_safe_distance"/>
- <constant name="SDT_inner_chamber_radius_max" value="InnerTracker_outer_radius"/>
+ <constant name="SDT_inner_chamber_radius_max" value="InnerTracker_outer_radius-SDT_outer_wall_thickness"/>
<constant name="SDT_inner_chamber_half_length" value="DC_half_length"/>
- <constant name="SDT_outer_chamber_radius_min" value="OuterTracker_inner_radius"/>
+ <constant name="SDT_outer_chamber_radius_min" value="DC_outer_chamber_radius_min-DC_safe_distance"/>
<constant name="SDT_outer_chamber_radius_max" value="DC_outer_chamber_radius_max"/>
<constant name="SDT_outer_chamber_half_length" value="DC_half_length"/>
@@ -31,9 +31,6 @@
<constant name="SDT_chamber_layer_width" value="10*mm"/>
<constant name="Epsilon" value="0*deg"/>
- <constant name="SDT_inner_wall_thickness" value="0.2*mm"/>
- <constant name="SDT_outer_wall_thickness" value="2.8*mm"/>
-
<constant name="SDT_inner_chamber_inner_wall_radius_min" value="SDT_inner_chamber_radius_min-SDT_inner_wall_thickness"/>
<constant name="SDT_inner_chamber_inner_wall_radius_max" value="SDT_inner_chamber_radius_min"/>
<constant name="SDT_inner_chamber_outer_wall_radius_min" value="SDT_inner_chamber_radius_max"/>
@@ -50,8 +47,6 @@
<constant name="DC_inner_chamber_enabled" value="1"/>
<constant name="DC_outer_chamber_enabled" value="1"/>
- <constant name="DC_safe_distance" value="0.02*mm"/>
-
</define>
<limits>
@@ -68,9 +63,13 @@
<detectors>
<detector id="DetID_DC" name="DriftChamber" type="DriftChamber" readout="DriftChamberHitsCollection" vis="BlueVis" sensitive="true" insideTrackingVolume="true" limits="DC_limits">
<envelope vis="SeeThrough">
- <shape type="BooleanShape" operation="Union" material="Air">
+<!-- <shape type="BooleanShape" operation="Union" material="Air">
<shape type="Tube" rmin="SDT_radius_min" rmax="OuterTracker_inner_radius" dz="SDT_half_length" />
<shape type="Tube" rmin="SDT_outer_chamber_inner_wall_radius_min" rmax="SDT_radius_max" dz="SDT_half_length" />
+ </shape> -->
+ <shape type="BooleanShape" operation="Subtraction" material="Air">
+ <shape type="Tube" rmin="SDT_radius_min" rmax="SDT_radius_max" dz="SDT_half_length" />
+ <shape type="Tube" rmin="InnerTracker_outer_radius" rmax="SDT_outer_chamber_inner_wall_radius_min" dz="DC_half_length"/>
</shape>
</envelope>
diff --git a/Detector/DetCRD/compact/CRD_common_v01/SET_SimplePlanar_v01_01.xml b/Detector/DetCRD/compact/CRD_common_v01/SET_SimplePlanar_v01_01.xml
index d7f1dc5d0974b7159c8e2b955ae2c39e99d34d32..82071ac2591c17718373cb53e88abbb6313702bd 100644
--- a/Detector/DetCRD/compact/CRD_common_v01/SET_SimplePlanar_v01_01.xml
+++ b/Detector/DetCRD/compact/CRD_common_v01/SET_SimplePlanar_v01_01.xml
@@ -2,7 +2,7 @@
<define>
<constant name="SET_inner_radius" value="OuterTracker_outer_radius + env_safety"/>
<constant name="SET_outer_radius" value="Ecal_barrel_inner_radius - env_safety "/>
- <constant name="SET_half_length" value="MainTracker_half_length"/>
+ <constant name="SET_half_length" value="DC_half_length"/>
</define>
<detectors>
diff --git a/Detector/DetCRD/compact/CRD_common_v01/SET_SimplePlanar_v01_02.xml b/Detector/DetCRD/compact/CRD_common_v01/SET_SimplePlanar_v01_02.xml
index 0d3621a4841f9b142655b2d51447bc8da6d4f76e..22db7614e332a8be3d62397dc7489255deb4e34a 100644
--- a/Detector/DetCRD/compact/CRD_common_v01/SET_SimplePlanar_v01_02.xml
+++ b/Detector/DetCRD/compact/CRD_common_v01/SET_SimplePlanar_v01_02.xml
@@ -2,7 +2,7 @@
<define>
<constant name="SET_inner_radius" value="OuterTracker_outer_radius + env_safety"/>
<constant name="SET_outer_radius" value="Ecal_barrel_inner_radius - env_safety "/>
- <constant name="SET_half_length" value="MainTracker_half_length"/>
+ <constant name="SET_half_length" value="DC_half_length"/>
<constant name="SET_inner_distance_from_tpc" value="InnerTracker_outer_radius-OuterTracker_outer_radius+3*mm"/>
</define>
diff --git a/Detector/DetCRD/compact/CRD_common_v01/SIT_SimplePixel_v01_01.xml b/Detector/DetCRD/compact/CRD_common_v01/SIT_SimplePixel_v01_01.xml
index 9e7a967efaa134682cb5d9ae978095be20d14846..02a49d5eaa5a5fd32f68e2d51987d7c64505680f 100644
--- a/Detector/DetCRD/compact/CRD_common_v01/SIT_SimplePixel_v01_01.xml
+++ b/Detector/DetCRD/compact/CRD_common_v01/SIT_SimplePixel_v01_01.xml
@@ -5,7 +5,7 @@
<constant name="SIT_inner_radius_1" value="SIT_inner_radius + env_safety"/>
<constant name="SIT_outer_radius_1" value="SIT_inner_radius_1/cos(pi/8)"/>
<constant name="SIT_inner_radius_2" value="SIT2_inner_radius"/>
- <constant name="SIT_outer_radius" value="InnerTracker_inner_radius"/>
+ <constant name="SIT_outer_radius" value="OuterTracker_inner_radius"/>
<constant name="SIT_half_length" value="SIT2_half_length"/>
<constant name="SIT_half_length_1" value="SIT1_half_length"/>
<constant name="SIT_layer_gap" value="2.5*mm"/>
diff --git a/Detector/DetCRD/compact/CRD_o1_v01/CRD_Dimensions_v01_01.xml b/Detector/DetCRD/compact/CRD_o1_v01/CRD_Dimensions_v01_01.xml
index 519eb0cb1df53190bf606a4f033da7c54eef511f..48e8f62bf8e33fae9f9e35114dee34510c8d68b8 100644
--- a/Detector/DetCRD/compact/CRD_o1_v01/CRD_Dimensions_v01_01.xml
+++ b/Detector/DetCRD/compact/CRD_o1_v01/CRD_Dimensions_v01_01.xml
@@ -84,6 +84,8 @@
<constant name="DC_Endcap_z" value="0.1*mm"/>
<constant name="DC_half_length" value="2225*mm" />
<constant name="DC_safe_distance" value="0.2*mm"/>
+ <constant name="SDT_inner_wall_thickness" value="0.2*mm"/>
+ <constant name="SDT_outer_wall_thickness" value="2.8*mm"/>
<constant name="DC_inner_chamber_layer_rbegin" value="235*mm"/>
<constant name="DC_inner_chamber_layer_rend" value="905*mm"/>
<constant name="DC_outer_chamber_layer_rbegin" value="1085*mm"/>
@@ -97,13 +99,13 @@
<constant name="InnerTracker_inner_radius" value="234*mm"/>
<constant name="InnerTracker_outer_radius" value="DC_inner_chamber_radius_max"/>
<constant name="OuterTracker_half_length" value="DC_half_length"/>
- <constant name="OuterTracker_inner_radius" value="DC_outer_chamber_radius_min-DC_safe_distance"/>
+ <constant name="OuterTracker_inner_radius" value="DC_outer_chamber_radius_min-DC_safe_distance-SDT_inner_wall_thickness"/>
<constant name="OuterTracker_outer_radius" value="1720*mm"/>
<constant name="SIT1_inner_radius" value="152.90*mm"/>
<constant name="SIT1_half_length" value="368.00*mm"/>
<constant name="SIT2_inner_radius" value="InnerTracker_outer_radius + env_safety"/>
- <constant name="SIT2_half_length" value="MainTracker_half_length"/>
+ <constant name="SIT2_half_length" value="DC_half_length"/>
<constant name="FTD_BeamPipe_cable_clearance" value="10*mm"/>
<constant name="FTD_BeamPipe_gap" value="15*mm"/>
diff --git a/Detector/DetCRD/compact/CRD_o1_v02/CRD_Dimensions_v01_02.xml b/Detector/DetCRD/compact/CRD_o1_v02/CRD_Dimensions_v01_02.xml
index 9e1f0dfa7101e03aa7009450655dcfd195b5c667..984af96a00dce5aa0aa2c1a8482b9318ec63fdb1 100644
--- a/Detector/DetCRD/compact/CRD_o1_v02/CRD_Dimensions_v01_02.xml
+++ b/Detector/DetCRD/compact/CRD_o1_v02/CRD_Dimensions_v01_02.xml
@@ -84,6 +84,8 @@
<constant name="DC_Endcap_z" value="0.1*mm"/>
<constant name="DC_half_length" value="2225*mm" />
<constant name="DC_safe_distance" value="0.2*mm"/>
+ <constant name="SDT_inner_wall_thickness" value="0.2*mm"/>
+ <constant name="SDT_outer_wall_thickness" value="2.8*mm"/>
<constant name="DC_inner_chamber_layer_rbegin" value="235*mm"/>
<constant name="DC_inner_chamber_layer_rend" value="905*mm"/>
<constant name="DC_outer_chamber_layer_rbegin" value="1085*mm"/>
@@ -97,7 +99,7 @@
<constant name="InnerTracker_inner_radius" value="234*mm"/>
<constant name="InnerTracker_outer_radius" value="DC_inner_chamber_radius_max"/>
<constant name="OuterTracker_half_length" value="DC_half_length"/>
- <constant name="OuterTracker_inner_radius" value="DC_outer_chamber_radius_min-DC_safe_distance"/>
+ <constant name="OuterTracker_inner_radius" value="DC_outer_chamber_radius_min-DC_safe_distance-SDT_inner_wall_thickness"/>
<constant name="OuterTracker_outer_radius" value="1720*mm"/>
<constant name="SIT1_inner_radius" value="140*mm"/>