Detector/DetCEPCv4/compact/SEcal05_siw_ECRing_02.xml

+<lccdd>
+
+  <detectors>
+    <detector name="EcalPlug" type="SEcal05_ECRing" id="ILDDetID_ECAL_PLUG" readout="EcalEndcapRingCollection" vis="BlueVis" >
+      <comment>EM Calorimeter Endcaps</comment>
+
+      <envelope vis="ILD_ECALVis">
+        <shape type="BooleanShape" operation="Subtraction" material="ECCableMix">
+          <shape type="BooleanShape" operation="Subtraction" material="Air">
+            <shape type="Box" dx="Ecal_endcap_center_box_size/2.0" dy="Ecal_endcap_center_box_size/2.0"
+                   dz="EcalEndcapRing_max_z"/>
+            <shape type="Tube" rmin="0" rmax="EcalEndcapRing_inner_radius" dz="2.0*EcalEndcapRing_max_z + env_safety"/>
+
+            <position x="0.5*(EcalEndcapRing_min_z + EcalEndcapRing_max_z)*tan(Ecal_ECRing_Crossing_Angle/2)" y="0" z="0"/>
+            <!-- position x="0" y="0" z="0"/ -->
+
+          </shape>
+          <shape type="Box" dx="Ecal_endcap_center_box_size/2 + env_safety" dy="Ecal_endcap_center_box_size/2 + env_safety"
+                 dz="EcalEndcapRing_min_z"/>
+        </shape>
+      </envelope>
+
+      <type_flags type=" DetType_CALORIMETER + DetType_ENDCAP + DetType_ELECTROMAGNETIC + DetType_AUXILIARY " />
+
+      <staves  material = "G4_W"  vis="GreenVis"/>
+
+      <layer repeat="Ecal_nlayers1/2" vis="SeeThrough" >
+	<slice material = "g10"         thickness = "Ecal_ECRing_structure_thickness"                    vis="Invisible" />
+        <slice material = "Si"          thickness = "Ecal_Si_thickness" sensitive = "yes"     limits="cal_limits" vis="RedVis"    />
+        <slice material = "g10"         thickness = "Ecal_ECRing_structure_thickness"                    vis="Invisible" />
+	<slice material = "g10"         thickness = "Ecal_fiber_thickness_slabAbs"                    vis="Invisible" />
+        <slice material = "G4_W"        thickness = "Ecal_radiator_layers_set1_thickness"   vis="GreenVis"   />
+	<slice material = "g10"         thickness = "Ecal_fiber_thickness_slabAbs"                    vis="Invisible" />
+        <slice material = "g10"         thickness = "Ecal_ECRing_structure_thickness"                    vis="Invisible" />
+	<slice material = "Si"          thickness = "Ecal_Si_thickness" sensitive = "yes"     limits="cal_limits" vis="RedVis"    />
+	<slice material = "g10"         thickness = "Ecal_ECRing_structure_thickness"                    vis="Invisible" />
+      </layer>
+      <layer repeat="(Ecal_nlayers2+1)/2" vis="SeeThrough">
+	<slice material = "g10"         thickness = "Ecal_ECRing_structure_thickness"                    vis="Invisible" />
+        <slice material = "Si"          thickness = "Ecal_Si_thickness" sensitive = "yes"     limits="cal_limits" vis="RedVis"    />
+	<slice material = "g10"         thickness = "Ecal_ECRing_structure_thickness"                    vis="Invisible" />
+        <slice material = "g10"         thickness = "Ecal_fiber_thickness_slabAbs"                    vis="Invisible" />
+        <slice material = "G4_W"        thickness = "Ecal_radiator_layers_set2_thickness"   vis="GreenVis"   />
+	<slice material = "g10"         thickness = "Ecal_fiber_thickness_slabAbs"                    vis="Invisible" />
+	<slice material = "g10"         thickness = "Ecal_ECRing_structure_thickness"                    vis="Invisible" />
+        <slice material = "Si"          thickness = "Ecal_Si_thickness" sensitive = "yes"     limits="cal_limits" vis="RedVis"    />
+	<slice material = "g10"         thickness = "Ecal_ECRing_structure_thickness"                    vis="Invisible" />
+      </layer>
+    </detector>
+  </detectors>
+
+  <readouts>
+    <readout name="EcalEndcapRingCollection">
+      <segmentation type="CartesianGridXY" grid_size_x="Ecal_cells_size" grid_size_y="Ecal_cells_size"/>
+      <id>system:5,module:3,stave:4,tower:3,layer:6,x:32:-16,y:-16</id>
+    </readout>
+  </readouts>
+
+
+
+</lccdd>
+

Detector/DetCEPCv4/compact/SEcal05_siw_Endcaps.xml

@@ -12,8 +12,8 @@
             <shape type="PolyhedraRegular"  numsides="EcalEndcap_symmetry" rmin="0"
                    rmax="EcalEndcap_outer_radius + 2.*env_safety" dz="2.0*EcalEndcap_min_z - env_safety"/>
           </shape>
-          <shape type="Box" dx="EcalEndcap_inner_radius - env_safety"
-                 dy="EcalEndcap_inner_radius - env_safety" dz="(EcalEndcap_max_z + env_safety )"/>
+          <shape type="Box" dx="EcalEndcap_inner_radius"
+                 dy="EcalEndcap_inner_radius" dz="(EcalEndcap_max_z + env_safety )"/>
           <rotation x="0*deg" y="0*deg" z="-180*deg/EcalEndcap_symmetry"/>
         </shape>
         <rotation x="0*deg" y="0*deg" z="180*deg/EcalEndcap_symmetry"/>
@@ -80,8 +80,8 @@
 
   <readouts>
     <readout name="EcalEndcapsCollection">
-      <segmentation type="MegatileLayerGridXY" grid_size_x="10.1667*mm" grid_size_y="10.1667*mm"/>
-      <id>system:5,module:3,stave:4,tower:5,layer:6,wafer:6,cellX:32:-16,cellY:-16</id>
+      <segmentation type="WaferGridXY" grid_size_x="10.1667*mm" grid_size_y="10.1667*mm" offset_x="2*mm" offset_y="-1.0999755859375*mm"/>
+      <id>system:5,module:3,stave:4,tower:5,layer:6,wafer:6,x:32:-16,y:-16</id>
     </readout>
   </readouts>
 

Detector/DetCEPCv4/compact/SHcalRpc01_Barrel_01.xml

+<lccdd>
+  <detectors>
+    <detector name="HcalBarrel" type="SHcalRpc01_Barrel" id="ILDDetID_HCAL" readout="HcalBarrelCollection" vis="GreenVis" insideTrackingVolume="false" >
+      <comment>Hadron Calorimeter Barrel</comment>
+      <envelope vis="ILD_HCALVis">
+        <shape type="BooleanShape" operation="Subtraction" material="Air" >
+          <shape type="Cone" z="Hcal_half_length + env_safety/2" rmin1="0.0" rmax1="Hcal_outer_radius + env_safety" rmin2="0.0" rmax2="Hcal_outer_radius + env_safety"/>
+          <shape type="PolyhedraRegular"  numsides="Hcal_inner_symmetry" rmin="0.0"
+                 rmax="Hcal_inner_radius - env_safety" dz="2*(Hcal_half_length + env_safety)"/>
+	  <rotation x="0" y="0" z="-180*deg/Hcal_inner_symmetry"/>
+        </shape>
+        <!--rotation x="0" y="0" z="90*deg-180*deg/Hcal_inner_symmetry"/-->
+      </envelope>
+      <type_flags type=" DetType_CALORIMETER + DetType_BARREL + DetType_HADRONIC " />
+
+      <staves  material="stainless_steel"  vis="BlueVis"/>
+
+      <layer repeat="Hcal_nlayers" vis="SeeThrough">
+        <slice material="stainless_steel" thickness="Hcal_radiator_thickness"                    vis="BlueVis"   />
+        <slice material="Air"             thickness="Hcal_airgap_thickness"                      vis="WhiteVis"   />
+	<slice material="mylar"           thickness="Hcal_mylar_cathode_thickness"               vis="MagentaVis" />
+	<slice material="graphite"        thickness="Hcal_graphite_cathode_thickness"            vis="Invisible" />
+	<slice material="FloatGlass"      thickness="Hcal_glass_cathode_thickness"               vis="RedVis" />
+	<slice material="RPCGAS2"         thickness="Hcal_sensitive_gas_gap"   sensitive = "yes" vis="YellowVis" edge_material="PEEK-GF30" spacer_material="Nylon"/>
+	<slice material="FloatGlass"      thickness="Hcal_glass_anode_thickness"                 vis="RedVis" />
+	<slice material="graphite"        thickness="Hcal_graphite_anode_thickness"              vis="Invisible" />
+	<slice material="mylar"           thickness="Hcal_mylar_anode_thickness"                 vis="MagentaVis" />
+	<slice material="g10"             thickness="Hcal_PCB_thickness"                         vis="CyanVis" />
+	<slice material="g10"             thickness="Hcal_electronics_mask_thickness"            vis="GreenVis" />
+      </layer>
+    </detector>
+  </detectors>
+
+  <readouts>
+    <readout name="HcalBarrelCollection">
+
+      <segmentation type="TiledLayerGridXY" grid_size_x="Hcal_cells_size" grid_size_y="Hcal_cells_size"/>
+      <id>system:5,module:3,stave:3,tower:5,layer:6,slice:4,x:32:-16,y:-16</id>
+
+    </readout>
+  </readouts>
+
+</lccdd>

Detector/DetCEPCv4/compact/SHcalRpc01_EndcapRing_01.xml

+<lccdd>
+  <detectors>
+    <detector name="HcalRing" type="SHcalRpc01_EndcapRing" id="ILDDetID_HCAL_RING" readout="HcalEndcapRingCollection" vis="SeeThrough" insideTrackingVolume="false" >
+      <comment>Hadron Calorimeter EndcapRing</comment>
+      <envelope vis="ILD_HCALVis">
+	<!--shape type="Assembly"/-->
+        <shape type="BooleanShape" operation="Subtraction" material="Air">
+          <shape type="BooleanShape" operation="Intersection" material="Air">
+            <shape type="Box" dx="HcalEndcapRing_outer_radius + 2.0*env_safety" dy="HcalEndcapRing_outer_radius + 2.0*env_safety"
+                   dz="HcalEndcapRing_max_z + 2.0*env_safety"/>
+            <shape type="PolyhedraRegular" numsides="Hcal_ring_inner_symmetry" rmin="HcalEndcapRing_inner_radius - env_safety"
+                   rmax="HcalEndcapRing_outer_radius*cos(pi/Hcal_ring_outer_symmetry) + env_safety" dz="2.0*HcalEndcapRing_max_z + env_safety" material="Air"/>
+            <rotation x="0" y="0" z="-180*deg/Hcal_ring_inner_symmetry"/>
+          </shape>
+          <shape type="Box" dx="HcalEndcapRing_outer_radius + 2.0*env_safety" dy="HcalEndcapRing_outer_radius + 2.0*env_safety"
+                 dz="HcalEndcapRing_min_z - env_safety"/>
+        </shape>
+      </envelope>
+
+      <type_flags type=" DetType_CALORIMETER + DetType_ENDCAP + DetType_HADRONIC + DetType_AUXILIARY " />
+      <staves material="stainless_steel" vis="GreenVis"/>
+
+      <layer repeat="HcalEndcapRing_nlayers" vis="SeeThrough">
+	<slice material="stainless_steel" thickness="Hcal_radiator_thickness"                    vis="BlueVis"/>
+	<slice material="FloatGlass"      thickness="Hcal_glass_cathode_thickness"               vis="RedVis"/>
+        <slice material="RPCGAS2"         thickness="Hcal_sensitive_gas_gap"   sensitive = "yes" vis="YellowVis"/>
+        <slice material="FloatGlass"      thickness="Hcal_glass_anode_thickness"                 vis="RedVis"/>
+        <slice material="RPC2ECRMix"      thickness="Hcal_mix_thickness"                         vis="CyanVis"/>
+      </layer>
+    </detector>
+  </detectors>
+
+  <readouts>
+    <readout name="HcalEndcapRingCollection">
+      <segmentation type="CartesianGridXY" grid_size_x="Hcal_cells_size" grid_size_y="Hcal_cells_size" offset_x="Hcal_cells_size/2.0" offset_y="Hcal_cells_size/2.0"/>
+      <id>system:5,module:3,stave:4,tower:3,layer:6,y:32:-16,x:-16</id>
+    </readout>
+  </readouts>
+  
+</lccdd>
+

Detector/DetCEPCv4/compact/SHcalRpc01_Endcaps_01.xml

+<lccdd>
+  <detectors>
+    <detector id="ILDDetID_HCAL_ENDCAP" name="HcalEndcap" type="SHcalRpc01_Endcaps" readout="HcalEndcapsCollection"  vis="SeeThrough" calorimeterType="HAD_ENDCAP">
+      <comment>Hadron Calorimeter Endcap</comment>
+      <envelope vis="ILD_HCALVis">    
+	<shape type="BooleanShape" operation="Subtraction" material="Air">
+          <shape type="BooleanShape" operation="Subtraction" material="Air">
+            <shape type="Tube" rmin="0.0" rmax="HcalEndcap_outer_radius + env_safety" dz="HcalEndcap_max_z + env_safety"/>
+            <shape type="Tube" rmin="0.0" rmax="HcalEndcap_outer_radius + 2.0*env_safety" dz="HcalEndcap_min_z - env_safety"/>
+          </shape>
+          <shape type="Box" dx="HcalEndcap_inner_radius - env_safety" dy="HcalEndcap_inner_radius - env_safety" dz="HcalEndcap_max_z + 2.0*env_safety"/>
+	</shape>
+	<rotation x="0" y="0" z="0"/>
+      </envelope>
+      
+      <type_flags type="DetType_CALORIMETER + DetType_ENDCAP + DetType_HADRONIC " />
+      
+      <staves material="stainless_steel" vis="SeeThrough"/>
+
+      <layer repeat="Hcal_endcap_nlayers" vis="SeeThrough">  
+	<slice material="stainless_steel" thickness="Hcal_radiator_thickness"                    vis="BlueVis"/>
+	<slice material="FloatGlass"      thickness="Hcal_glass_cathode_thickness"               vis="RedVis"/>
+	<slice material="RPCGAS2"         thickness="Hcal_sensitive_gas_gap"   sensitive = "yes" vis="YellowVis"/>
+        <slice material="FloatGlass"      thickness="Hcal_glass_anode_thickness"                 vis="RedVis"/>
+        <slice material="RPC2ECRMix"      thickness="Hcal_mix_thickness"                         vis="CyanVis"/>
+      </layer>
+      
+    </detector>
+  </detectors>
+
+  <readouts>
+    <readout name="HcalEndcapsCollection">
+      <segmentation type="CartesianGridXY" grid_size_x="Hcal_cells_size" grid_size_y="Hcal_cells_size" offset_x="Hcal_cells_size/2.0" offset_y="Hcal_cells_size/2.0" />
+      <id>system:5,module:3,stave:3,tower:5,layer:6,y:32:-16,x:-16</id>
+    </readout>
+  </readouts>
+  
+</lccdd>

Detector/DetCEPCv4/compact/Yoke05_Barrel.xml

 <!-- comment>Calorimeters</comment -->
 <lccdd>
   <detectors>
-    <detector name="YokeBarrel" type="Yoke05_Barrel" id="ILDDetID_YOKE" readout="YokeBarrelCollection" vis="YellowVis" insideTrackingVolume="false" buildType="BUILD_ENVELOPE">
+    <detector name="YokeBarrel" type="Yoke05_Barrel" id="ILDDetID_YOKE" readout="MuonBarrelCollection" vis="YellowVis" insideTrackingVolume="false" buildType="BUILD_ENVELOPE">
       <envelope vis="ILD_YOKEVis">
         <shape type="BooleanShape" operation="Intersection" material="Air" >
-          <shape type="Box" dx="Yoke_outer_radius + env_safety" dy="Yoke_outer_radius + env_safety"
-                 dz="Yoke_half_length + env_safety"/> <!--Box defined the coordinate system-->
-          <shape type="PolyhedraRegular" numsides="Yoke_symmetry"  rmin="Yoke_inner_radius"
-                 rmax="Yoke_outer_radius" dz="2.0*Yoke_half_length"  material = "Air" />
+          <shape type="Box" dx="Yoke_outer_radius + env_safety" dy="Yoke_outer_radius + env_safety" dz="Yoke_half_length + env_safety"/> <!--Box defined the coordinate system-->
+          <shape type="PolyhedraRegular" numsides="Yoke_symmetry"  rmin="Yoke_inner_radius" rmax="Yoke_outer_radius" dz="2.0*Yoke_half_length"  material = "Air" />
           <rotation x="0*deg" y="0*deg" z="90*deg-180*deg/Yoke_symmetry"/>
         </shape>
       </envelope>
@@ -28,7 +26,7 @@
   </detectors>
 
   <readouts>
-    <readout name="YokeBarrelCollection">
+    <readout name="MuonBarrelCollection">
       <segmentation type="CartesianGridXZ" grid_size_x="Yoke_cells_size" grid_size_z="Yoke_cells_size"/>
       <id>system:5,module:3,stave:4,tower:3,layer:6,x:32:-16,z:-16</id>
     </readout>

Detector/DetCEPCv4/compact/Yoke05_Endcaps.xml

 <!-- comment>Calorimeters</comment -->
 <lccdd>
   <detectors>
-    <detector name="YokeEndcap" type="Yoke05_Endcaps" id="ILDDetID_YOKE_ENDCAP" readout="YokeEndcapsCollection" vis="YellowVis" insideTrackingVolume="false" >
-
+    <detector name="YokeEndcap" type="Yoke05_Endcaps" id="ILDDetID_YOKE_ENDCAP" readout="MuonEndcapsCollection" vis="YellowVis" insideTrackingVolume="false" >
       <envelope vis="ILD_YOKEVis">
         <shape type="BooleanShape" operation="Subtraction" material="Air">
           <shape type="BooleanShape" operation="Subtraction" material="Air">
@@ -16,7 +15,7 @@
             <shape type="Box" dx="YokeEndcap_outer_radius + 1.5*env_safety" dy="YokeEndcap_outer_radius + 1.5*env_safety"
                    dz="YokeEndcapPlug_min_z - env_safety"/>
           </shape>
-          <shape type="PolyhedraRegular" numsides="YokeEndcapPlug_symmetry"  rmin="YokeEndcapPlug_outer_radius + env_safety"
+          <shape type="PolyhedraRegular" numsides="YokeEndcapPlug_symmetry"  rmin="YokeEndcapPlug_outer_radius*cos(pi/Hcal_ring_outer_symmetry) + env_safety"
                  rmax="YokeEndcap_outer_radius + 2.0*env_safety" dz="2.*YokeEndcap_min_z - env_safety" />
           <rotation x="0*deg" y="0*deg" z="90*deg-180*deg/YokeEndcapPlug_symmetry"/>
         </shape>
@@ -24,7 +23,7 @@
 
       <type_flags type=" DetType_CALORIMETER + DetType_ENDCAP + DetType_MUON " />
 
-      <dimensions numsides="12" rmin="Yoke_inner_radius" z="Yoke_barrel_halfZ" />
+      <dimensions numsides="Yoke_symmetry" rmin="Yoke_inner_radius" z="Yoke_barrel_halfZ" />
       <material name="Iron"/>
       <layer repeat="12" vis="SeeThrough">
         <slice material = "Air"            thickness = "15.0*mm"                    vis="YellowVis" />
@@ -35,7 +34,7 @@
   </detectors>
 
   <readouts>
-    <readout name="YokeEndcapsCollection">
+    <readout name="MuonEndcapsCollection">
       <segmentation type="CartesianGridXY" grid_size_x="Yoke_cells_size" grid_size_y="Yoke_cells_size"/>
       <id>system:5,module:3,stave:4,tower:3,layer:6,x:32:-16,y:-16</id>
     </readout>

Detector/DetCEPCv4/compact/coil03.xml

@@ -2,29 +2,29 @@
      Coil parameters for ILD_o1_v5  
 -->
 <lccdd>
-<detectors>
-
-<detector name="Coil" type="SCoil02" vis="CoilVis" id="ILDDetID_COIL" insideTrackingVolume="false" sensitive="no">
-
+  <detectors>
+    <detector name="Coil" type="SCoil02" vis="ILD_COILVis" id="ILDDetID_COIL" insideTrackingVolume="false" readout="COILCollection">
   <!-- fg: taken from SCoil02.cc::PreLoadScriptAction() : 
        there the variable Hcal_R_max was used, which was set from Hcal_module_radius in the SHcal driver - 
        here we simply use the value Hcal_outer_radius defined in ILD_l1_v01
 
        -> now (03/2015) done in main compact file ILD_l1_v01.xml
   -->
-
-  <envelope vis="ILD_COILVis">
-    <shape type="Tube" rmin="Coil_inner_radius" rmax="Coil_outer_radius" 
-	   dz="Coil_half_length" material="Air"/>
-  </envelope>
-
-  <type_flags type=" DetType_SUPPORT + DetType_COIL " />
-
-  <!--fg: for now only a simple aluminum cylinder is created inside the envelope -->
-  <tube rmin="Coil_inner_radius+env_safety" rmax="Coil_outer_radius-env_safety" 
-	dz="Coil_half_length-env_safety" material="G4_Al"/>
-
-</detector>
-
-</detectors>
+      <envelope vis="SeeThrough">
+	<shape type="Tube" rmin="Coil_inner_radius" rmax="Coil_outer_radius" dz="Coil_half_length" material="Air"/>
+      </envelope>
+  
+      <type_flags type=" DetType_SUPPORT + DetType_COIL " />
+  
+      <!--fg: for now only a simple aluminum cylinder is created inside the envelope -->
+      <tube rmin="Coil_inner_radius" rmax="Coil_outer_radius" dz="Coil_half_length" material="G4_Al"/>
+      
+    </detector>
+  </detectors>
+
+  <readouts>
+    <readout name="COILCollection">
+      <id>system:5,side:-2,layer:9,module:8,sensor:8,barrelside:-2</id>
+    </readout>
+  </readouts>
 </lccdd>

Detector/DetCEPCv4/compact/ecal_defs.xml

@@ -55,7 +55,8 @@
   <constant name="Ecal_Slab_Plug_length" value="0*mm"/>
   
   <!-- needed only for ecal ring driver... -->
-  <constant name="Ecal_cells_size" value="10.2105*mm"/>
+  <constant name="Ecal_ECRing_Siplate_Size" value="Ecal_endcap_center_box_size - 2*Ecal_EC_Ring_gap - 2*Ecal_lateral_face_thickness"/>
+  <constant name="Ecal_cells_size" value="Ecal_ECRing_Siplate_Size/76."/>
   <constant name="Ecal_Sc_reflector_thickness" value="0.057*mm"/>
   <constant name="Ecal_Sc_thickness" value="2.0*mm"/>
   <constant name="Ecal_Slab_Sc_PCB_thickness" value="0.8*mm"/>

Detector/DetCEPCv4/compact/envelope_defs.xml

@@ -50,12 +50,13 @@
   <constant name="VXD_inner_radius"   value="top_VXD_inner_radius"/>
   <constant name="VXD_outer_radius"   value="top_VXD_outer_radius"/>
   <constant name="VXD_half_length"    value="top_VXD_half_length"/>
-  <constant name="VXD_cone_min_z"     value="TUBE_IPInnerTube_end_z"/>
+  <!--constant name="VXD_cone_min_z"     value="TUBE_IPInnerTube_end_z"/-->
+  <constant name="VXD_cone_min_z"     value="135*mm"/>
   <!--constant name="VXD_cone_max_z"     value="TUBE_IPInnerBulge_end_z"/-->
-  <constant name="VXD_cone_max_z"     value="VXD_half_length"/>
+  <constant name="VXD_cone_max_z"     value="VXD_half_length-10*mm"/>
   <!--constant name="VXD_cone_max_z"     value="125.1*mm "/-->
   <constant name="VXD_inner_radius_1" value="TUBE_IPInnerBulge_end_envradius + env_safety "/>
-
+  <!--constant name="VXD_inner_radius_1" value="TUBE_central_inner_radius + TUBE_central_thickness + env_safety"/-->
 
   <constant name="SIT_inner_radius"    value="SIT1_Radius - env_safety"/>
   <constant name="SIT_outer_radius_1"  value="SIT2_Radius - env_safety"/>
@@ -92,7 +93,8 @@
   <constant name="Ecal_symmetry"        value="Ecal_Hcal_symmetry"/>
 
   <constant name="Hcal_inner_radius"    value="Ecal_outer_radius+Hcal_Ecal_gap"/>
-  <constant name="Hcal_outer_radius"    value="(Hcal_inner_radius+Hcal_barrel_thickness)/cos(pi/Hcal_outer_symmetry)"/> <!-- cos(pi/16)   -->
+  <!--constant name="Hcal_outer_radius"    value="(Hcal_inner_radius+Hcal_barrel_thickness)/cos(pi/Hcal_outer_symmetry)"/--> <!-- cos(pi/16)   -->
+  <constant name="Hcal_outer_radius"    value="3144.43*mm + 0.00244676*mm"/>
   <constant name="Hcal_half_length"     value="TPC_Ecal_Hcal_barrel_halfZ"/>
   <constant name="Hcal_inner_symmetry"  value="Ecal_Hcal_symmetry"/>
 
@@ -118,7 +120,8 @@
   <constant name="Coil_outer_radius"    value="Hcal_outer_radius+Hcal_Coil_additional_gap+Coil_thickness"/>
   <constant name="Coil_half_length"     value="TPC_Ecal_Hcal_barrel_halfZ+Coil_extra_size"/>
 
-  <constant name="Yoke_inner_radius"    value="Coil_outer_radius+top_Hcal_Yoke_gap"/>
+  <!--constant name="Yoke_inner_radius"    value="Hcal_outer_radius+top_Hcal_Yoke_gap"/--><!--two ways to obtain Yoke_inner_radius--> 
+  <constant name="Yoke_inner_radius"    value="Coil_outer_radius+Coil_Yoke_radial_clearance"/>
   <constant name="Yoke_outer_radius"    value="Yoke_inner_radius+top_Yoke_thickness"/>
   <constant name="Yoke_half_length"     value="top_Yoke_half_length"/>
   <constant name="Yoke_symmetry"        value="top_Yoke_symmetry"/>

Detector/DetCEPCv4/compact/ftd_cepc.xml → Detector/DetCEPCv4/compact/ftd_cepc_01.xml

@@ -2,11 +2,8 @@
    FTD parameters for ILD_o1_v5
    from database : ftd_simple_staggered_02
   -->
-
 <lccdd>
   <detectors>
-
-
     <detector name="FTD" type="FTD_cepc" vis="FTDVis" id="ILDDetID_FTD" limits="Tracker_limits" readout="FTDCollection" insideTrackingVolume="true">
 
       <envelope vis="ILD_FTDVis">
@@ -19,7 +16,8 @@
                   <shape type="Tube" rmin="FTD_inner_radius"   rmax="FTD_outer_radius" dz="FTD_half_length"  />
                   <shape type="Tube" rmin="0." rmax="FTD_outer_radius+env_safety" dz="FTD_min_z_0" />
                 </shape>
-                <shape type="Tube" rmin="FTD_outer_radius_1" rmax="FTD_outer_radius+env_safety" dz="FTD_min_z_2-petal_cp_support_thickness-petal_support_zoffset" />
+                <!--shape type="Tube" rmin="FTD_outer_radius_1" rmax="FTD_outer_radius+env_safety" dz="FTD_min_z_2-petal_cp_support_thickness-petal_support_zoffset" /-->
+		<shape type="Tube" rmin="FTD_outer_radius_1" rmax="FTD_outer_radius+env_safety" dz="FTD_min_z_2-FTD_layer_shift"/>
               </shape>
               <shape type="Tube" rmin="FTD_outer_radius_2" rmax="FTD_outer_radius+env_safety" dz="FTD_min_z_2" />
             </shape>
@@ -46,9 +44,9 @@
       <!-- SQL command: "select * from extended_reconstruction_parameters;"  same as ftd_cepc_v4 checked by fucd -->
       <extended_reconstruction_parameters strip_width="0.001*mm" strip_length="250*mm" strip_pitch="0.01*mm" strip_angle="5*deg"  />
 
-      <!-- SQL command: "select * from disks;"  same as ftd_cepc_v4 checked by fucd-->
-      <disk disk_number="1" z_position_ReltoTPCLength="0"                            disk_si_thickness="0.02*mm" petal_cp_support_dxMax="72*mm" padUp_Si_dxMax="68*mm" petal_cp_support_thickness="1*mm" petal_support_zoffset="1.5*mm" sensor_is_pixel="1" double_sided="0"  />
-      <disk disk_number="2" z_position_ReltoTPCLength="FTD_disk2_zPosRelToTpcLength" disk_si_thickness="0.02*mm" petal_cp_support_dxMax="72*mm" padUp_Si_dxMax="68*mm" petal_cp_support_thickness="1*mm" petal_support_zoffset="1.5*mm" sensor_is_pixel="1" double_sided="0"  />
+      <!-- SQL command: "select * from disks;"  same as ftd_cepc_v4 checked by fucd, but overlap exist, reduce petal_cp_support_dxMax from 72mm to 71.4mm/71.8mm-->
+      <disk disk_number="1" z_position_ReltoTPCLength="0"                            disk_si_thickness="0.02*mm" petal_cp_support_dxMax="71.4*mm" padUp_Si_dxMax="68*mm" petal_cp_support_thickness="1*mm" petal_support_zoffset="1.5*mm" sensor_is_pixel="1" double_sided="0"  />
+      <disk disk_number="2" z_position_ReltoTPCLength="FTD_disk2_zPosRelToTpcLength" disk_si_thickness="0.02*mm" petal_cp_support_dxMax="71.8*mm" padUp_Si_dxMax="68*mm" petal_cp_support_thickness="1*mm" petal_support_zoffset="1.5*mm" sensor_is_pixel="1" double_sided="0"  />
       <disk disk_number="3" z_position_ReltoTPCLength="FTD_disk3_zPosRelToTpcLength" disk_si_thickness="0.20*mm" petal_cp_support_dxMax="122.49*mm" padUp_Si_dxMax="118.46*mm" petal_cp_support_thickness="2*mm" petal_support_zoffset="1.5*mm" sensor_is_pixel="0" double_sided="1"  />
       <disk disk_number="4" z_position_ReltoTPCLength="FTD_disk4_zPosRelToTpcLength" disk_si_thickness="0.20*mm" petal_cp_support_dxMax="122.49*mm" padUp_Si_dxMax="118.46*mm" petal_cp_support_thickness="2*mm" petal_support_zoffset="1.5*mm" sensor_is_pixel="0" double_sided="1"  />
       <disk disk_number="5" z_position_ReltoTPCLength="FTD_disk5_zPosRelToTpcLength" disk_si_thickness="0.20*mm" petal_cp_support_dxMax="122.49*mm" padUp_Si_dxMax="118.46*mm" petal_cp_support_thickness="2*mm" petal_support_zoffset="1.5*mm" sensor_is_pixel="0" double_sided="1"  />
@@ -61,8 +59,7 @@
 
   <readouts>
     <readout name="FTDCollection">
-      <!-- fixme: for now DD4hep cannot handle signed values - side should actually be "-2" -->
-      <id>system:5,side:2,layer:9,module:8,sensor:8</id>
+      <id>system:5,side:-2,layer:9,module:8,sensor:8</id>
     </readout>
   </readouts>
 

Detector/DetCEPCv4/compact/ftd_cepc_02.xml

+<!-- FTD parameters for updating new MDI on CEPCv4, only envelope changed-->
+<lccdd>
+  <define>
+    <constant name="FTD_inner_radius_new" value="BeamPipe_VertexRegion_rmax+env_safety"/>
+    <constant name="FTD_cone_radius_new"  value="FTD_half_length*tan(CepC_Main_Crossing_Angle/2.)+BeamPipe_Dnstream_inner_radius+BeamPipe_Cu_thickness+env_safety"/>
+  </define>
+
+  <detectors>
+    <detector name="FTD" type="FTD_cepc" vis="FTDVis" id="ILDDetID_FTD" limits="Tracker_limits" readout="FTDCollection" insideTrackingVolume="true">
+
+      <envelope vis="ILD_FTDVis">
+	<shape type="Assembly"/>
+        <!--shape type="BooleanShape" operation="Subtraction" material="Air" >
+          <shape type="BooleanShape" operation="Subtraction" material="Air" >
+            <shape type="BooleanShape" operation="Subtraction" material="Air" >
+              <shape type="BooleanShape" operation="Subtraction" material="Air" >
+                <shape type="BooleanShape" operation="Subtraction" material="Air" >
+                  <shape type="Tube" rmin="FTD_inner_radius_new"   rmax="FTD_outer_radius" dz="FTD_half_length"  />
+                  <shape type="Tube" rmin="0." rmax="FTD_outer_radius+env_safety" dz="FTD_min_z_0" />
+                </shape>
+		<shape type="Tube" rmin="FTD_outer_radius_1" rmax="FTD_outer_radius+env_safety" dz="FTD_min_z_2-FTD_layer_shift"/>
+              </shape>
+              <shape type="Tube" rmin="FTD_outer_radius_2" rmax="FTD_outer_radius+env_safety" dz="FTD_min_z_2" />
+            </shape>
+            <shape type="Cone" rmin1="0" rmax1="FTD_inner_radius_new" rmin2="0" rmax2="FTD_cone_radius_new"
+                   z="(FTD_half_length-BeamPipe_CentralAl_zmax)/2. + env_safety "/>
+            <position x="0" y="0" z="BeamPipe_CentralAl_zmax+(FTD_half_length-BeamPipe_CentralAl_zmax)/2."/>
+          </shape>
+          <shape type="Cone" rmin1="0" rmax1="FTD_inner_radius_new" rmin2="0" rmax2="FTD_cone_radius_new"
+                 z="(FTD_half_length-BeamPipe_CentralAl_zmax)/2. + env_safety "/>
+          <position x="0" y="0" z="-BeamPipe_CentralAl_zmax-(FTD_half_length-BeamPipe_CentralAl_zmax)/2."/>
+          <rotation x="0" y="180.*deg" z="0" />
+        </shape-->
+      </envelope>
+
+      <type_flags type="DetType_TRACKER +  DetType_ENDCAP  + DetType_PIXEL + DetType_STRIP "/>
+
+      <!-- SQL command: "select * from common_parameters;"  same as ftd_cepc_v4 checked by fucd, no support_spaceframe_width in ftd_cepc_v4-->
+      <common_parameters ftd1_vtx3_distance_z="top_FTD1_vtx3_distance_z"
+                         ftd7_ecal_distance_z="top_FTD7_ecal_distance_z" ftd1_sit1_radial_diff="-1*mm" ftd2_sit1_radial_diff="-1*mm" ftd3_sit2_radial_diff="-1*mm"
+                         ftd4to7_tpc_radial_gap="20*mm" beamtube_clearance="15*mm" cables_thickness="0.08*mm" cable_shield_thickness="0.1*mm" outer_cylinder_total_thickness="1*mm"
+                         petal_half_angle_support="11.25*deg" petal_y_ratio="0.5015"
+                         support_spaceframe_width="10*mm"/>
+
+      <!-- SQL command: "select * from extended_reconstruction_parameters;"  same as ftd_cepc_v4 checked by fucd -->
+      <extended_reconstruction_parameters strip_width="0.001*mm" strip_length="250*mm" strip_pitch="0.01*mm" strip_angle="5*deg"  />
+
+      <!-- SQL command: "select * from disks;"  same as ftd_cepc_v4 checked by fucd, but overlap exist, reduce petal_cp_support_dxMax from 72mm to 71.4mm/71.8mm-->
+      <disk disk_number="1" z_position_ReltoTPCLength="0"                            disk_si_thickness="0.02*mm" petal_cp_support_dxMax="71.4*mm" padUp_Si_dxMax="68*mm" petal_cp_support_thickness="1*mm" petal_support_zoffset="1.5*mm" sensor_is_pixel="1" double_sided="0"  />
+      <disk disk_number="2" z_position_ReltoTPCLength="FTD_disk2_zPosRelToTpcLength" disk_si_thickness="0.02*mm" petal_cp_support_dxMax="71.8*mm" padUp_Si_dxMax="68*mm" petal_cp_support_thickness="1*mm" petal_support_zoffset="1.5*mm" sensor_is_pixel="1" double_sided="0"  />
+      <disk disk_number="3" z_position_ReltoTPCLength="FTD_disk3_zPosRelToTpcLength" disk_si_thickness="0.20*mm" petal_cp_support_dxMax="122.49*mm" padUp_Si_dxMax="118.46*mm" petal_cp_support_thickness="2*mm" petal_support_zoffset="1.5*mm" sensor_is_pixel="0" double_sided="1"  />
+      <disk disk_number="4" z_position_ReltoTPCLength="FTD_disk4_zPosRelToTpcLength" disk_si_thickness="0.20*mm" petal_cp_support_dxMax="122.49*mm" padUp_Si_dxMax="118.46*mm" petal_cp_support_thickness="2*mm" petal_support_zoffset="1.5*mm" sensor_is_pixel="0" double_sided="1"  />
+      <disk disk_number="5" z_position_ReltoTPCLength="FTD_disk5_zPosRelToTpcLength" disk_si_thickness="0.20*mm" petal_cp_support_dxMax="122.49*mm" padUp_Si_dxMax="118.46*mm" petal_cp_support_thickness="2*mm" petal_support_zoffset="1.5*mm" sensor_is_pixel="0" double_sided="1"  />
+      <!--disk disk_number="6" z_position_ReltoTPCLength="FTD_disk6_zPosRelToTpcLength" disk_si_thickness="0.20*mm" petal_cp_support_dxMax="122.49*mm" padUp_Si_dxMax="118.46*mm" petal_cp_support_thickness="2*mm" petal_support_zoffset="1.5*mm" sensor_is_pixel="0" double_sided="1"  /-->
+      <!--disk disk_number="7" z_position_ReltoTPCLength="0"                            disk_si_thickness="0.20*mm" petal_cp_support_dxMax="122.49*mm" padUp_Si_dxMax="118.46*mm" petal_cp_support_thickness="2*mm" petal_support_zoffset="1.5*mm" sensor_is_pixel="0" double_sided="1"  /-->
+
+    </detector>
+  </detectors>
+
+  <readouts>
+    <readout name="FTDCollection">
+      <id>system:5,side:-2,layer:9,module:8,sensor:8</id>
+    </readout>
+  </readouts>
+</lccdd>

Detector/DetCEPCv4/compact/hcal_defs.xml

 <define>
-
-
   <constant name="Hcal_radiator_thickness" value="20.0*mm"/>
-  <constant name="Hcal_chamber_thickness" value="6.73*mm"/>
-  <constant name="Hcal_back_plate_thickness" value="15*mm"/>
-  <constant name="Hcal_lateral_structure_thickness" value="10*mm"/>
-  <constant name="Hcal_stave_gaps" value="3*mm"/>
-  <constant name="Hcal_modules_gap" value="0.001*mm"/>
-  <constant name="Hcal_layer_air_gap" value="2*mm"/>
-  <constant name="Hcal_middle_stave_gaps" value="10*mm"/>
+  <constant name="Hcal_airgap_thickness" value="1*mm"/>
+  <constant name="Hcal_mylar_cathode_thickness" value="0.18*mm"/>
+  <constant name="Hcal_graphite_cathode_thickness" value="0.05*mm"/>
+  <constant name="Hcal_glass_cathode_thickness" value="1.1*mm"/>
+  <constant name="Hcal_sensitive_gas_gap" value="1.2*mm"/>
+  <constant name="Hcal_glass_anode_thickness" value="0.7*mm"/>
+  <constant name="Hcal_graphite_anode_thickness" value="0.05*mm"/>
+  <constant name="Hcal_mylar_anode_thickness" value="0.05*mm"/>
+  <constant name="Hcal_PCB_thickness" value="0.8*mm"/>
+  <constant name="Hcal_electronics_mask_thickness" value="1.6*mm"/>
+  
   <constant name="Hcal_nlayers" value="40"/>
-  <constant name="Hcal_fiber_gap" value="1.5*mm"/>
-  <constant name="Hcal_Cu_thickness" value="0.1*mm"/>
-  <constant name="Hcal_PCB_thickness" value="0.7*mm"/>
-  <constant name="Hcal_scintillator_thickness" value="3.0*mm"/>
+  <constant name="Hcal_endcap_nlayers" value="Hcal_nlayers"/>
+  <constant name="Hcal_ring_nlayers"         value="7"/>
   <constant name="Hcal_cells_size" value="10*mm"/>
-  <constant name="Hcal_endcap_lateral_structure_thickness" value="5.0*mm"/>
-  <constant name="Hcal_endcap_layer_air_gap" value="2.5*mm"/>
-  <constant name="Hcal_endcap_nlayers" value="40"/> <!-- needed for ring only? -->
-
-  <!-- fg:
-      copy extra parameters for SDHcal from ILD_o2_v01 here
-      maybe they should all be renamed to SDHCal_ for clarity ? 
-     TK: Yes, here are they ... HcalSD_  
-  -->
-  <constant name="HcalSD_cells_size" value="10.406*mm"/>
-  <constant name="HcalSD_pad_separation" value="0.406*mm"/>
-  <constant name="HcalSD_radiator_thickness" value="15.0*mm"/>
-  <constant name="HcalSD_sensitive_gas_gap" value="1.2*mm"/>
-  <constant name="HcalSD_graphite_cathode_thickness" value="0.05*mm"/>
-  <constant name="HcalSD_graphite_anode_thickness" value="0.05*mm"/>
-  <constant name="HcalSD_glass_cathode_thickness" value="1.1*mm"/>
-  <constant name="HcalSD_glass_anode_thickness" value="0.7*mm"/>
-  <constant name="HcalSD_g10_thickness" value="1.4*mm"/>
-  <constant name="HcalSD_mylar_anode_thickness" value="0.05*mm"/>
-  <constant name="HcalSD_mylar_cathode_thickness" value="0.175*mm"/>
-  <constant name="HcalSD_mylar_thickness" value="0.2*mm"/>
-  <constant name="HcalSD_PCB_thickness" value="1.2*mm"/>
-  <constant name="HcalSD_electronics_mask_thickness" value="1.6*mm"/>
-  <constant name="HcalSD_steel_casette_thickness" value="2.5*mm"/>
-  <constant name="HcalSD_airgap_thickness" value="0.5*mm"/>
-  <constant name="HcalSD_back_plate_thickness" value="10*mm"/>
-  <constant name="HcalSD_barrel_end_module_type" value="1"/>
-  <constant name="HcalSD_stave_gaps" value="10*mm"/>
-  <constant name="HcalSD_lateral_structure_thickness" value="10*mm"/>
-  <constant name="HcalSD_layer_air_gap" value="2*mm"/>
-  <constant name="HcalSD_endcap_lateral_structure_thickness" value="5.0*mm"/>
-
-  <constant name="HcalSD_module_wall_thickness" value="10*mm"/>   
-
-  <constant name="HcalBarrelSD_nlayers" value="40"/>
-  <constant name="HcalSD_MinNumCellsInTransvPlane" value="1"/>
-  <constant name="HcalBarrelSD_number_modules" value="5"/>
-  <constant name="HcalEndcap_symmetry" value="Hcal_outer_symmetry"/>
-  <constant name="HcalEndcapRingSD_inner_symmetry"  value="Ecal_Hcal_symmetry"/>
-  <constant name="HcalEndcapRingSD_outer_symmetry"  value="HcalEndcap_symmetry"/>
-  <constant name="HcalEndcapRingSD_nlayers"         value="7"/>
-  <constant name="HcalEndcapSD_nlayers" value="40"/>
-
-  <constant name="HcalSD_gasInlet_length" value="3.0*mm"/>
-  <constant name="HcalSD_modules_gap" value="20*mm"/>
-  <constant name="HcalSD_spacer_separation" value="100*mm"/>
-  <constant name="HcalSD_spacer_thickness" value="8*mm"/>
-  <constant name="HcalSD_gasInlet_innerRadius" value="0.4*mm"/>
-  <constant name="HcalSD_gasInlet_outerRadius" value="0.5*mm"/>
-
-  
-
-  <!-- translations -->
-  <constant name="Hcal_endcap_zmin" value="HcalEndcap_min_z"/>
-
-  <!-- used for "hybrid" readout segmentation -->
-  <constant name="AHCal_cell_size" value="3.0*cm"/>
-  <constant name="SDHCal_cell_size" value="1.0*cm"/>
-  
-  <!-- TODO move these two element at the correct place -->
-  <!-- TODO create the additional detectors for the different options for l/s4 and l/s5 -->
-  <!-- TODO merge the two variables to only one for both barrel and endcap -->
-  <!-- barrel and endcvap constructors use the slices in reversed order ! -->
-  <!-- <constant name="Hcal_readout_segmentation_slice_barrel" value="3"/> -->
-  <!-- <constant name="Hcal_readout_segmentation_slice_endcap" value="3"/> -->
-
 
+  <constant name="Hcal_gas_edge_width" value="1*mm"/>
+  <constant name="Hcal_MinNumCellsInTransvPlane" value="11"/>
+  <constant name="Hcal_barrel_number_modules" value="5"/>
+  <constant name="Hcal_chamber_thickness" value="6.73*mm"/>
+  <constant name="Hcal_back_plate_thickness" value="15*mm"/>
+  <constant name="Hcal_lateral_structure_thickness" value="10*mm"/>
+  <constant name="Hcal_stave_gaps" value="0*mm"/>
+  <constant name="Hcal_modules_gap" value="2*mm"/>
+
+  <constant name="Hcal_pad_separation" value="0*mm"/>
+  <constant name="Hcal_gasInlet_length" value="3.0*mm"/>
+  <constant name="Hcal_spacer_separation" value="100*mm"/>
+  <constant name="Hcal_spacer_thickness" value="8*mm"/>
+  <constant name="Hcal_gasInlet_inner_radius" value="0.4*mm"/>
+  <constant name="Hcal_gasInlet_outer_radius" value="0.5*mm"/>
+
+  <constant name="Hcal_endcap_outer_symmetry" value="Hcal_outer_symmetry"/>
+  <constant name="Hcal_ring_inner_symmetry"  value="Ecal_Hcal_symmetry"/>
+  <constant name="Hcal_ring_outer_symmetry"  value="Hcal_endcap_outer_symmetry"/>
+
+  <constant name="Hcal_graphite_thickness" value="Hcal_graphite_cathode_thickness+Hcal_graphite_anode_thickness"/>
+  <constant name="Hcal_mylar_thickness" value="Hcal_mylar_cathode_thickness+Hcal_mylar_anode_thickness"/>
+  <constant name="Hcal_g10_thickness" value="Hcal_PCB_thickness+Hcal_electronics_mask_thickness"/>
+  <constant name="Hcal_mix_thickness" value="Hcal_airgap_thickness+Hcal_graphite_thickness+Hcal_mylar_thickness+Hcal_g10_thickness"/>
+  <constant name="Hcal_mix_density" value="Hcal_airgap_thickness/Hcal_mix_thickness*0.00120479 + Hcal_graphite_thickness/Hcal_mix_thickness*2.21 +
+                                           Hcal_mylar_thickness/Hcal_mix_thickness*1.4 + Hcal_g10_thickness/Hcal_mix_thickness*1.7"/>
+  <constant name="Hcal_airgap_fraction" value="Hcal_airgap_thickness/Hcal_mix_thickness*0.00120479/Hcal_mix_density"/>
+  <constant name="Hcal_graphite_fraction" value="Hcal_graphite_thickness/Hcal_mix_thickness*2.21/Hcal_mix_density"/>
+  <constant name="Hcal_mylar_fraction" value="Hcal_mylar_thickness/Hcal_mix_thickness*1.4/Hcal_mix_density"/>
+  <constant name="Hcal_g10_fraction" value="Hcal_g10_thickness/Hcal_mix_thickness*1.7/Hcal_mix_density"/>
 </define>

Detector/DetCEPCv4/compact/materials.xml

@@ -548,5 +548,20 @@
        <fraction n="0.194" ref="Cu" />
     </material>
 
+    <material name="G4_PARAFFIN">
+      <D type="density" value="0.93" unit="g/cm3" />
+       <fraction n="0.148605" ref="H" />
+       <fraction n="0.851395" ref="C" />
+    </material>
+
+    <material name="superconductor">
+      <D type="density" value="6.78" unit="g/cm3" />
+       <fraction n="0.56" ref="Ni" />
+       <fraction n="0.44" ref="Ti" />
+    </material>
 
+    <material name="lN2">
+      <D type="density" value="0.807" unit="g/cm3" />
+       <fraction n="1" ref="N" />
+    </material>
   </materials>

Detector/DetCEPCv4/compact/services_defs.xml

@@ -39,6 +39,7 @@
   <constant name="SServices_FTD2_cone_thickness" value="0.040*mm"/>
   <constant name="SServices_FTD3_cone_thickness" value="0.020*mm"/>
   <constant name="SServices_FTD7_cables_thickness" value="0.85*mm"/>
+  <constant name="FTD_layer_shift" value="petal_cp_support_thickness+petal_support_zoffset+1*mm"/>
 
   <constant name="VXD_cable_cross_section_area" value="25.0*mm*mm"/>
   <constant name="VXD_cable_inner1_radius" value="30.0*mm"/>

Detector/DetCEPCv4/compact/top_defs.xml

@@ -10,11 +10,11 @@
   <constant name="CepC_Main_Crossing_Angle" value="33*mrad"/>
 
   <!-- the field inside and outside the solenoid -->
-  <constant name="outerField_nominal_value" value="-1.5*tesla"/>
-
+  <constant name="Field_outer_nominal_value" value="-1.33716*tesla"/>
+  <constant name="Field_outer_thickness" value="2550*mm"/>
 
   <!-- VXD -->
-  <constant name="top_VXD_inner_radius"   value="15.95*mm "/>
+  <constant name="top_VXD_inner_radius"   value="15.5*mm "/>
   <constant name="top_VXD_outer_radius"   value="101*mm "/>
   <constant name="top_VXD_half_length"    value="200*mm "/>
 
@@ -58,16 +58,17 @@
   <constant name="Ecal_EC_Ring_gap" value="10*mm"/>
 
   <!-- HCAL -->
-  <constant name="Hcal_barrel_thickness" value="1272.3*mm"/>
+  <!--constant name="Hcal_barrel_thickness" value="1086.43*mm"/-->
   <constant name="Hcal_Coil_additional_gap" value="29.5*mm"/>
   <!--constant name="Hcal_outer_symmetry" value="16"/-->
   <constant name="Hcal_outer_symmetry" value="8"/>
 
   <constant name="Hcal_endcap_center_box_size" value="700.0*mm"/>
   <constant name="Hcal_endcap_zmin" value="2650*mm" />
-  <constant name="Hcal_endcap_thickness" value="1287.0*mm"/>
+  <constant name="Hcal_endcap_thickness" value="1084.2*mm"/>
   <constant name="Hcal_radial_ring_inner_gap" value="50*mm"/>
-  <constant name="Hcal_endcap_cryostat_gap" value="170*mm"/>
+  <constant name="Hcal_endcap_cryostat_gap" value="0*mm"/>
+  <constant name="Hcal_endcap_ecal_gap" value="15*mm"/>
 
   <!-- coil -->
   <constant name="Coil_extra_size" value="1522*mm"/>
@@ -80,8 +81,9 @@
        <constant name="top_Yoke_inner_radius"    value="4424.0*mm"/>
        <constant name="top_Yoke_outer_radius"    value="7725.0*mm"/>
        -->
-  <constant name="top_Hcal_Yoke_gap"       value="300*mm"/>
-  <constant name="top_Yoke_thickness"      value="2550*mm"/>
+  <constant name="Coil_Yoke_radial_clearance" value="250*mm"/>
+  <constant name="top_Hcal_Yoke_gap"       value="Hcal_Coil_additional_gap+Coil_thickness+Coil_Yoke_radial_clearance"/>
+  <constant name="top_Yoke_thickness"      value="3241*mm"/>
 
   <constant name="top_Yoke_half_length"     value="4047.0*mm"/>
   <constant name="Yoke_Z_start_endcaps"     value="4072.0*mm"/>

Detector/DetCEPCv4/compact/tpc10_01.xml

@@ -6,7 +6,7 @@
 
   <detectors>
 
-    <detector name="TPC" type="TPC10" vis="TPCVis" id="ILDDetID_TPC" limits="Tracker_limits" readout="TPCCollection" insideTrackingVolume="true">
+    <detector name="TPC" type="TPC10" vis="TPCVis" id="ILDDetID_TPC" limits="TPC_limits" readout="TPCCollection" insideTrackingVolume="true">
 
 
       <envelope vis="ILD_TPCVis">
@@ -37,25 +37,25 @@
       <!-- SQL command: "SELECT * FROM `innerWall`;"  -->
       <innerWall>
 	<!-- updates from Dimitra 4/7/17 -->
-	<row dr="0.07*mm" material="G4_Cu"  />
+	<row dr="0.01*mm" material="G4_Al"  />
 	<row dr="0.05*mm" material="G4_KAPTON"  />
 	<row dr="0.3*mm" material="g10"  />
 	<row dr="24.22*mm" material="G4_AIR"  />
 	<row dr="0.3*mm" material="g10"  />
 	<row dr="0.05*mm" material="G4_KAPTON"  />
-	<row dr="0.01*mm" material="G4_Al"  />
+	<row dr="0.07*mm" material="G4_Cu"  />
       </innerWall>
       <!-- SQL command: "SELECT * FROM `outerWall`;"  -->
       <outerWall>
 	<!-- updates from Dimitra 4/7/17 --> <!--recover to tpc10_01 matching CEPC_v4, by fucd-->
-	<row dr="0.01*mm" material="G4_Al"  />
+	<row dr="0.07*mm" material="G4_Cu"  />
 	<row dr="0.05*mm" material="G4_KAPTON"  />
 	<row dr="0.3*mm" material="g10"  />
 	<!-- row dr="57.66*mm" material="G4_AIR"  / -->
 	<row dr="59.22*mm" material="G4_AIR"  /> <!-- removed 5 mm to accomadate fat ecal: to be finalised when numbers available -->
 	<row dr="0.3*mm" material="g10"  />
 	<row dr="0.05*mm" material="G4_KAPTON"  />
-	<row dr="0.07*mm" material="G4_Cu"  />
+	<row dr="0.01*mm" material="G4_Al"  />
       </outerWall>
       <!-- SQL command: "SELECT * FROM `readout`;"  -->
       <readout>
@@ -86,8 +86,7 @@
 
  <readouts>
     <readout name="TPCCollection">
-      <!-- fixme: for now DD4hep cannot handle signed values - side should actually be "-2" -->
-      <id>system:5,side:2,layer:9,module:8,sensor:8</id>
+      <id>system:5,side:-2,layer:13,module:8,sensor:8</id>
     </readout>
  </readouts>
 

Detector/DetCEPCv4/compact/vxd07.xml

-<!-- 
-     VXD parameters for ILD_o1_v5  
--->
-
-<lccdd>
-<detectors>
-
-<detector name="VXD" type="VXD04" vis="VXDVis" id="ILDDetID_VXD" limits="Tracker_limits" readout="VXDCollection" insideTrackingVolume="true">
-  
-  <envelope vis="ILD_VXDVis">
-    <shape type="BooleanShape" operation="Subtraction" material="Air" >
-      <shape type="BooleanShape" operation="Subtraction" material="Air" >
-	<shape type="BooleanShape" operation="Subtraction" material="Air" >
-	  <shape type="BooleanShape" operation="Subtraction" material="Air" >
-	    <shape type="Tube" rmin="VXD_inner_radius" rmax="VXD_outer_radius" dz="VXD_half_length" />
-	    <shape type="Tube" rmin="0." rmax="VXD_inner_radius_1" dz="(VXD_half_length - VXD_cone_max_z)/2. + env_safety " />
-	    <position x="0" y="0" z="VXD_half_length-(VXD_half_length - VXD_cone_max_z)/2.+ env_safety"/> 
-	  </shape>
-	  <shape type="Tube" rmin="0." rmax="VXD_inner_radius_1" dz="(VXD_half_length - VXD_cone_max_z)/2. + env_safety " />
-	  <position x="0" y="0" z="- ( VXD_half_length-(VXD_half_length - VXD_cone_max_z)/2.+ env_safety ) "/> 
-	  <rotation x="0" y="180.*deg" z="0" />
-	</shape>
-	<shape type="Cone" rmin1="0" rmax1="VXD_inner_radius" rmin2="0" rmax2="VXD_inner_radius_1" 
-	       z="(VXD_cone_max_z-VXD_cone_min_z)/2. + env_safety "/>
-	<position x="0" y="0" z="VXD_cone_min_z+(VXD_cone_max_z-VXD_cone_min_z)/2."/> 
-      </shape>
-      <shape type="Cone" rmin1="0" rmax1="VXD_inner_radius" rmin2="0" rmax2="VXD_inner_radius_1" 
-	     z="(VXD_cone_max_z-VXD_cone_min_z)/2. + env_safety "/>
-      <position x="0" y="0" z="-(VXD_cone_min_z+(VXD_cone_max_z-VXD_cone_min_z)/2.)"/> 
-      <rotation x="0" y="180.*deg" z="0" />
-    </shape>
-  </envelope>
-
-  <!-- set the detecor type flag - note: using the '+' operator here as the evaluator does not understand '|' 
-       -> be carefull not to add any flags twice !!!     -->
-  <type_flags type=" DetType_TRACKER + DetType_PIXEL + DetType_VERTEX "/>
-  
-  <!-- database : TMP_DB10 -->
-  <!-- SQL command: "select * from layers_common_parameters;"  -->
-  <layers_common_parameters id="1"
-			    electronics_structure_thickness="0.1*mm"
-			    active_silicon_thickness="0.05*mm"
-			    support_structure_radial_thickness="0.49392*mm"
-			    end_electronics_half_z="5*mm" 
-			    strip_final_beampipe_radious="VXD_inner_radius_1"	
-			    side_band_electronics_option="1"
-			    end_ladd_electronics_option="1"
-			    side_band_electronics_width="0.5*mm" 
-			    side_band_electronics_thickness="0.05*mm"
-			    active_side_band_electronics_option="0"
-			    layer_gap="2*mm"
-			    flex_cable_material="G4_KAPTON"
-			    flex_cable_thickness="0.05*mm"
-			    foam_spacer_material="SiC_foam"
-			    foam_spacer_thickness="0.94*mm"
-			    metal_traces_material="G4_Al"
-			    metal_traces_thickness="0.01*mm"
-			    cool_pipe_material="titanium" 
-			    cool_pipe_inner_radius="0.75*mm"
-			    cool_pipe_outer_radius="1*mm"
-			    external_kapton_thickness="0.05*mm"
-			    external_metal_thickness="0.009*mm"  />
-  <!-- SQL command: "SELECT * FROM cryostat;"  -->
-  <cryostat id="1" alu_skin_inner_radious="100*mm" alu_skin_tickness="0.5*mm" foam_inner_radious="90*mm" foam_tickness="10*mm" foam_half_z="166.6*mm" 
-	    endplate_inner_radious="VXD_inner_radius_1+5.6*mm" 
-	    cryostat_option="1" cryostat_apperture="30*mm" cryostat_apperture_radius="1.5*mm"  />
-  <!-- SQL command: "select * from support_shell;"  -->
-  <support_shell id="0" inner_radious="65*mm" half_z="145*mm" thickess="0.49392*mm" endplate_inner_radious="30*mm" endplate_inner_radius_L1="15.7*mm" endplate_outer_radius_L1="20*mm" 
-		 offset_ladder_block="0.28224*mm" beryllium_ladder_block_length="5*mm" beryllium_ladder_block_thickness="0.25*mm" shell_endplate_thickness="2*mm" forward_shell_half_z="6.5*mm"  />
-  <!-- SQL command: "select * from layer;"  -->
-  <layer id="0" layer_radius="VXD_radius_r1" ladder_length="VXD_length_r1" ladder_width="5.5*mm" nb_ladder="10" ladder_gap="0" strip_line_final_z="150*mm" end_electronics_width="5.5*mm" 
-	 initial_kapton_striplines_thickness="0.04566*mm" final_kapton_striplines_thickness="0.02435*mm" initial_metal_striplines_thickness="0.00806*mm" 
-	 final_metal_striplines_thickness="0.0043*mm" support_width="4.5*mm"  />
-  <layer id="1" layer_radius="VXD_radius_r1" ladder_length="VXD_length_r1" ladder_width="5.5*mm" nb_ladder="10" ladder_gap="0" strip_line_final_z="150*mm" end_electronics_width="5.5*mm" 
-	 initial_kapton_striplines_thickness="0.04566*mm" final_kapton_striplines_thickness="0.02435*mm" initial_metal_striplines_thickness="0.00806*mm" 
-	 final_metal_striplines_thickness="0.0043*mm" support_width="4.5*mm"  />
-  <layer id="2" layer_radius="VXD_radius_r3" ladder_length="VXD_length_r3" ladder_width="11*mm" nb_ladder="11" ladder_gap="0*mm" strip_line_final_z="150*mm" end_electronics_width="11*mm" 
-	 initial_kapton_striplines_thickness="0.04102*mm" final_kapton_striplines_thickness="0.05059*mm" initial_metal_striplines_thickness="0.00724*mm" 
-	 final_metal_striplines_thickness="0.00893*mm" support_width="10*mm"  />
-  <layer id="3" layer_radius="VXD_radius_r3" ladder_length="VXD_length_r3" ladder_width="11*mm" nb_ladder="11" ladder_gap="0*mm" strip_line_final_z="150*mm" end_electronics_width="11*mm" 
-	 initial_kapton_striplines_thickness="0.04102*mm" final_kapton_striplines_thickness="0.05059*mm" initial_metal_striplines_thickness="0.00724*mm" 
-	 final_metal_striplines_thickness="0.00893*mm" support_width="10*mm"  />
-  <layer id="4" layer_radius="VXD_radius_r5" ladder_length="VXD_length_r3" ladder_width="11*mm" nb_ladder="17" ladder_gap="0*mm" strip_line_final_z="150*mm" end_electronics_width="11*mm" 
-	 initial_kapton_striplines_thickness="0.04044*mm" final_kapton_striplines_thickness="0.07819*mm" initial_metal_striplines_thickness="0.00714*mm" 
-	 final_metal_striplines_thickness="0.0138*mm" support_width="10*mm"  />
-  <layer id="5" layer_radius="VXD_radius_r5" ladder_length="VXD_length_r3" ladder_width="11*mm" nb_ladder="17" ladder_gap="0*mm" strip_line_final_z="150*mm" end_electronics_width="11*mm" 
-	 initial_kapton_striplines_thickness="0.04044*mm" final_kapton_striplines_thickness="0.07819*mm" initial_metal_striplines_thickness="0.00714*mm" 
-	 final_metal_striplines_thickness="0.0138*mm" support_width="10*mm"  />
-</detector> <!--vxd-->
-
-</detectors>
-
-  <readouts>
-    <readout name="VXDCollection">
-      <!-- fixme: for now DD4hep cannot handle signed values - side should actually be "-2" -->
-      <id>system:5,side:-2,layer:9,module:8,sensor:8,barrelside:-2</id>
-    </readout>
-  </readouts>
-
-
-
-</lccdd>

Detector/DetCEPCv4/compact/vxd07_01.xml

+<!-- 
+     VXD parameters for ILD_o1_v5  
+-->
+
+<lccdd>
+  <detectors>
+    <detector name="VXD" type="VXD04" vis="VXDVis" id="ILDDetID_VXD" limits="Tracker_limits" readout="VXDCollection" insideTrackingVolume="true">
+  
+      <envelope vis="ILD_VXDVis">
+	<shape type="BooleanShape" operation="Subtraction" material="Air" >
+	  <shape type="BooleanShape" operation="Subtraction" material="Air" >
+	    <shape type="BooleanShape" operation="Subtraction" material="Air" >
+	      <shape type="BooleanShape" operation="Subtraction" material="Air" >
+		<shape type="Tube" rmin="VXD_inner_radius" rmax="VXD_outer_radius" dz="VXD_half_length" />
+		<shape type="Tube" rmin="0." rmax="VXD_inner_radius_1" dz="(VXD_half_length - VXD_cone_max_z)/2. + env_safety " />
+		<position x="0" y="0" z="VXD_half_length-(VXD_half_length - VXD_cone_max_z)/2.+ env_safety"/> 
+	      </shape>
+	      <shape type="Tube" rmin="0." rmax="VXD_inner_radius_1" dz="(VXD_half_length - VXD_cone_max_z)/2. + env_safety " />
+	      <position x="0" y="0" z="- ( VXD_half_length-(VXD_half_length - VXD_cone_max_z)/2.+ env_safety ) "/> 
+	      <rotation x="0" y="180.*deg" z="0" />
+	    </shape>
+	    <shape type="Cone" rmin1="0" rmax1="VXD_inner_radius" rmin2="0" rmax2="VXD_inner_radius_1" 
+		   z="(VXD_cone_max_z-VXD_cone_min_z)/2. + env_safety "/>
+	    <position x="0" y="0" z="VXD_cone_min_z+(VXD_cone_max_z-VXD_cone_min_z)/2."/> 
+	  </shape>
+	  <shape type="Cone" rmin1="0" rmax1="VXD_inner_radius" rmin2="0" rmax2="VXD_inner_radius_1" 
+		 z="(VXD_cone_max_z-VXD_cone_min_z)/2. + env_safety "/>
+	  <position x="0" y="0" z="-(VXD_cone_min_z+(VXD_cone_max_z-VXD_cone_min_z)/2.)"/> 
+	  <rotation x="0" y="180.*deg" z="0" />
+	</shape>
+      </envelope>
+      
+      <!-- set the detecor type flag - note: using the '+' operator here as the evaluator does not understand '|' 
+	   -> be carefull not to add any flags twice !!!     -->
+      <type_flags type=" DetType_TRACKER + DetType_PIXEL + DetType_VERTEX "/>
+      
+      <!-- database : TMP_DB10 -->
+      <!-- SQL command: "select * from layers_common_parameters;"  -->
+      <layers_common_parameters id="1"
+				electronics_structure_thickness="0.1*mm"
+				active_silicon_thickness="0.05*mm"
+				support_structure_radial_thickness="0.49392*mm"
+				end_electronics_half_z="5*mm" 
+				strip_final_beampipe_radious="VXD_inner_radius_1"	
+				side_band_electronics_option="1"
+				end_ladd_electronics_option="1"
+				side_band_electronics_width="0.5*mm" 
+				side_band_electronics_thickness="0.05*mm"
+				active_side_band_electronics_option="0"
+				layer_gap="2*mm"
+				flex_cable_material="G4_KAPTON"
+				flex_cable_thickness="0.05*mm"
+				foam_spacer_material="SiC_foam"
+				foam_spacer_thickness="0.94*mm"
+				metal_traces_material="G4_Al"
+				metal_traces_thickness="0.01*mm"
+				cool_pipe_material="titanium" 
+				cool_pipe_inner_radius="0.75*mm"
+				cool_pipe_outer_radius="1*mm"
+				external_kapton_thickness="0.05*mm"
+				external_metal_thickness="0.009*mm"  />
+      <!-- SQL command: "SELECT * FROM cryostat;"  -->
+      <cryostat id="1" alu_skin_inner_radious="100*mm" alu_skin_tickness="0.5*mm" foam_inner_radious="90*mm" foam_tickness="10*mm" foam_half_z="166.6*mm" 
+		endplate_inner_radious="VXD_inner_radius_1"
+		cryostat_option="1" cryostat_apperture="30*mm" cryostat_apperture_radius="1.5*mm"  />
+      <!-- SQL command: "select * from support_shell;"  -->
+      <support_shell id="0" inner_radious="65*mm" half_z="145*mm" thickess="0.49392*mm" endplate_inner_radious="30*mm" endplate_inner_radius_L1="15.7*mm" endplate_outer_radius_L1="20*mm" 
+		     offset_ladder_block="0.28224*mm" beryllium_ladder_block_length="5*mm" beryllium_ladder_block_thickness="0.25*mm" shell_endplate_thickness="2*mm" forward_shell_half_z="6.5*mm"  />
+      <!-- SQL command: "select * from layer;"  -->
+      <layer id="0" layer_radius="VXD_radius_r1" ladder_length="VXD_length_r1" ladder_width="5.5*mm" nb_ladder="10" ladder_gap="0" strip_line_final_z="150*mm" end_electronics_width="5.5*mm" 
+	     initial_kapton_striplines_thickness="0.04566*mm" final_kapton_striplines_thickness="0.02435*mm" initial_metal_striplines_thickness="0.00806*mm" 
+	     final_metal_striplines_thickness="0.0043*mm" support_width="4.5*mm"  />
+      <layer id="1" layer_radius="VXD_radius_r1" ladder_length="VXD_length_r1" ladder_width="5.5*mm" nb_ladder="10" ladder_gap="0" strip_line_final_z="150*mm" end_electronics_width="5.5*mm" 
+	     initial_kapton_striplines_thickness="0.04566*mm" final_kapton_striplines_thickness="0.02435*mm" initial_metal_striplines_thickness="0.00806*mm" 
+	     final_metal_striplines_thickness="0.0043*mm" support_width="4.5*mm"  />
+      <layer id="2" layer_radius="VXD_radius_r3" ladder_length="VXD_length_r3" ladder_width="11*mm" nb_ladder="11" ladder_gap="0*mm" strip_line_final_z="150*mm" end_electronics_width="11*mm" 
+	     initial_kapton_striplines_thickness="0.04102*mm" final_kapton_striplines_thickness="0.05059*mm" initial_metal_striplines_thickness="0.00724*mm" 
+	     final_metal_striplines_thickness="0.00893*mm" support_width="10*mm"  />
+      <layer id="3" layer_radius="VXD_radius_r3" ladder_length="VXD_length_r3" ladder_width="11*mm" nb_ladder="11" ladder_gap="0*mm" strip_line_final_z="150*mm" end_electronics_width="11*mm" 
+	     initial_kapton_striplines_thickness="0.04102*mm" final_kapton_striplines_thickness="0.05059*mm" initial_metal_striplines_thickness="0.00724*mm" 
+	     final_metal_striplines_thickness="0.00893*mm" support_width="10*mm"  />
+      <layer id="4" layer_radius="VXD_radius_r5" ladder_length="VXD_length_r3" ladder_width="11*mm" nb_ladder="17" ladder_gap="0*mm" strip_line_final_z="150*mm" end_electronics_width="11*mm" 
+	     initial_kapton_striplines_thickness="0.04044*mm" final_kapton_striplines_thickness="0.07819*mm" initial_metal_striplines_thickness="0.00714*mm" 
+	     final_metal_striplines_thickness="0.0138*mm" support_width="10*mm"  />
+      <layer id="5" layer_radius="VXD_radius_r5" ladder_length="VXD_length_r3" ladder_width="11*mm" nb_ladder="17" ladder_gap="0*mm" strip_line_final_z="150*mm" end_electronics_width="11*mm" 
+	     initial_kapton_striplines_thickness="0.04044*mm" final_kapton_striplines_thickness="0.07819*mm" initial_metal_striplines_thickness="0.00714*mm" 
+	     final_metal_striplines_thickness="0.0138*mm" support_width="10*mm"  />
+    </detector> <!--vxd-->
+    
+  </detectors>
+
+  <readouts>
+    <readout name="VXDCollection">
+      <!-- fixme: for now DD4hep cannot handle signed values - side should actually be "-2" -->
+      <id>system:5,side:-2,layer:9,module:8,sensor:8,barrelside:-2</id>
+    </readout>
+  </readouts>
+</lccdd>

Detector/DetCEPCv4/compact/vxd07_02.xml

+<!-- VXD parameters for updating new MDI on CEPCv4, only envelope changed-->
+<lccdd>
+  <define>
+    <constant name="VXD_inner_radius_center" value="BeamPipe_VertexRegion_rmax+env_safety"/>
+    <constant name="VXD_inner_radius_side"   value="BeamPipe_ForwardRegion_rmax+env_safety"/>
+  </define>
+
+  <detectors>
+    <detector name="VXD" type="VXD04" vis="VXDVis" id="ILDDetID_VXD" limits="Tracker_limits" readout="VXDCollection" insideTrackingVolume="true">
+      <envelope vis="ILD_VXDVis">
+        <shape type="BooleanShape" operation="Subtraction" material="Air" >
+          <shape type="BooleanShape" operation="Subtraction" material="Air" >
+            <shape type="BooleanShape" operation="Subtraction" material="Air" >
+              <shape type="BooleanShape" operation="Subtraction" material="Air" >
+                <shape type="Tube" rmin="VXD_inner_radius_center" rmax="VXD_outer_radius" dz="VXD_half_length" />
+                <shape type="Tube" rmin="0." rmax="VXD_inner_radius_side" dz="(VXD_half_length - VXD_cone_max_z)/2. + env_safety " />
+                <position x="0" y="0" z="VXD_half_length-(VXD_half_length - VXD_cone_max_z)/2.+ env_safety"/>
+              </shape>
+              <shape type="Tube" rmin="0." rmax="VXD_inner_radius_side" dz="(VXD_half_length - VXD_cone_max_z)/2. + env_safety " />
+              <position x="0" y="0" z="- ( VXD_half_length-(VXD_half_length - VXD_cone_max_z)/2.+ env_safety ) "/>
+              <rotation x="0" y="180.*deg" z="0" />
+            </shape>
+            <shape type="Cone" rmin1="0" rmax1="VXD_inner_radius_center" rmin2="0" rmax2="VXD_inner_radius_side"
+                   z="(VXD_cone_max_z-VXD_cone_min_z)/2. + env_safety "/>
+            <position x="0" y="0" z="VXD_cone_min_z+(VXD_cone_max_z-VXD_cone_min_z)/2."/>
+          </shape>
+          <shape type="Cone" rmin1="0" rmax1="VXD_inner_radius_center" rmin2="0" rmax2="VXD_inner_radius_side"
+                 z="(VXD_cone_max_z-VXD_cone_min_z)/2. + env_safety "/>
+          <position x="0" y="0" z="-(VXD_cone_min_z+(VXD_cone_max_z-VXD_cone_min_z)/2.)"/>
+          <rotation x="0" y="180.*deg" z="0" />
+        </shape>
+      </envelope>
+
+      <!-- set the detecor type flag - note: using the '+' operator here as the evaluator does not understand '|' 
+	   -> be carefull not to add any flags twice !!!     -->
+      <type_flags type=" DetType_TRACKER + DetType_PIXEL + DetType_VERTEX "/>
+      
+      <!-- database : TMP_DB10 -->
+      <!-- SQL command: "select * from layers_common_parameters;"  -->
+      <layers_common_parameters id="1"
+				electronics_structure_thickness="0.1*mm"
+				active_silicon_thickness="0.05*mm"
+				support_structure_radial_thickness="0.49392*mm"
+				end_electronics_half_z="5*mm" 
+				strip_final_beampipe_radious="VXD_inner_radius_1"	
+				side_band_electronics_option="1"
+				end_ladd_electronics_option="1"
+				side_band_electronics_width="0.5*mm" 
+				side_band_electronics_thickness="0.05*mm"
+				active_side_band_electronics_option="0"
+				layer_gap="2*mm"
+				flex_cable_material="G4_KAPTON"
+				flex_cable_thickness="0.05*mm"
+				foam_spacer_material="SiC_foam"
+				foam_spacer_thickness="0.94*mm"
+				metal_traces_material="G4_Al"
+				metal_traces_thickness="0.01*mm"
+				cool_pipe_material="titanium" 
+				cool_pipe_inner_radius="0.75*mm"
+				cool_pipe_outer_radius="1*mm"
+				external_kapton_thickness="0.05*mm"
+				external_metal_thickness="0.009*mm"  />
+      <!-- SQL command: "SELECT * FROM cryostat;"  -->
+      <cryostat id="1" alu_skin_inner_radious="100*mm" alu_skin_tickness="0.5*mm" foam_inner_radious="90*mm" foam_tickness="10*mm" foam_half_z="166.6*mm" 
+		endplate_inner_radious="VXD_inner_radius_1+5.6*mm" 
+		cryostat_option="1" cryostat_apperture="30*mm" cryostat_apperture_radius="1.5*mm"  />
+      <!-- SQL command: "select * from support_shell;"  -->
+      <support_shell id="0" inner_radious="65*mm" half_z="145*mm" thickess="0.49392*mm" endplate_inner_radious="30*mm" endplate_inner_radius_L1="15.7*mm" endplate_outer_radius_L1="20*mm" 
+		     offset_ladder_block="0.28224*mm" beryllium_ladder_block_length="5*mm" beryllium_ladder_block_thickness="0.25*mm" shell_endplate_thickness="2*mm" forward_shell_half_z="6.5*mm"  />
+      <!-- SQL command: "select * from layer;"  -->
+      <layer id="0" layer_radius="VXD_radius_r1" ladder_length="VXD_length_r1" ladder_width="5.5*mm" nb_ladder="10" ladder_gap="0" strip_line_final_z="150*mm" end_electronics_width="5.5*mm" 
+	     initial_kapton_striplines_thickness="0.04566*mm" final_kapton_striplines_thickness="0.02435*mm" initial_metal_striplines_thickness="0.00806*mm" 
+	     final_metal_striplines_thickness="0.0043*mm" support_width="4.5*mm"  />
+      <layer id="1" layer_radius="VXD_radius_r1" ladder_length="VXD_length_r1" ladder_width="5.5*mm" nb_ladder="10" ladder_gap="0" strip_line_final_z="150*mm" end_electronics_width="5.5*mm" 
+	     initial_kapton_striplines_thickness="0.04566*mm" final_kapton_striplines_thickness="0.02435*mm" initial_metal_striplines_thickness="0.00806*mm" 
+	     final_metal_striplines_thickness="0.0043*mm" support_width="4.5*mm"  />
+      <layer id="2" layer_radius="VXD_radius_r3" ladder_length="VXD_length_r3" ladder_width="11*mm" nb_ladder="11" ladder_gap="0*mm" strip_line_final_z="150*mm" end_electronics_width="11*mm" 
+	     initial_kapton_striplines_thickness="0.04102*mm" final_kapton_striplines_thickness="0.05059*mm" initial_metal_striplines_thickness="0.00724*mm" 
+	     final_metal_striplines_thickness="0.00893*mm" support_width="10*mm"  />
+      <layer id="3" layer_radius="VXD_radius_r3" ladder_length="VXD_length_r3" ladder_width="11*mm" nb_ladder="11" ladder_gap="0*mm" strip_line_final_z="150*mm" end_electronics_width="11*mm" 
+	     initial_kapton_striplines_thickness="0.04102*mm" final_kapton_striplines_thickness="0.05059*mm" initial_metal_striplines_thickness="0.00724*mm" 
+	     final_metal_striplines_thickness="0.00893*mm" support_width="10*mm"  />
+      <layer id="4" layer_radius="VXD_radius_r5" ladder_length="VXD_length_r3" ladder_width="11*mm" nb_ladder="17" ladder_gap="0*mm" strip_line_final_z="150*mm" end_electronics_width="11*mm" 
+	     initial_kapton_striplines_thickness="0.04044*mm" final_kapton_striplines_thickness="0.07819*mm" initial_metal_striplines_thickness="0.00714*mm" 
+	     final_metal_striplines_thickness="0.0138*mm" support_width="10*mm"  />
+      <layer id="5" layer_radius="VXD_radius_r5" ladder_length="VXD_length_r3" ladder_width="11*mm" nb_ladder="17" ladder_gap="0*mm" strip_line_final_z="150*mm" end_electronics_width="11*mm" 
+	     initial_kapton_striplines_thickness="0.04044*mm" final_kapton_striplines_thickness="0.07819*mm" initial_metal_striplines_thickness="0.00714*mm" 
+	     final_metal_striplines_thickness="0.0138*mm" support_width="10*mm"  />
+    </detector> <!--vxd-->
+    
+  </detectors>
+  
+  <readouts>
+    <readout name="VXDCollection">
+      <!-- fixme: for now DD4hep cannot handle signed values - side should actually be "-2" -->
+      <id>system:5,side:-2,layer:9,module:8,sensor:8,barrelside:-2</id>
+    </readout>
+  </readouts>
+</lccdd>