.gitlab-ci.yml

@@ -37,19 +37,13 @@ stages:
 .envvar_template:
   variables:
     CEPCSW_LCG_RELEASE: LCG
-    CEPCSW_LCG_PLATFORM: x86_64-centos7-gcc11-opt
-    CEPCSW_LCG_VERSION: 103.0.2
-
-.build_template:
-  extends: .envvar_template
-  stage: build
-  script:
-    - bash ./.build.ci.sh
-    - bash ./.test.ci.sh
+    CEPCSW_LCG_PLATFORM: x86_64-el9-gcc11-opt
+    CEPCSW_LCG_VERSION: 105.0.0
 
 # for k8s
 .build_template_k8s:
   extends: .envvar_template
+  image: cepc/cepcsw-cvmfs:el9
   stage: build
   tags:
     - k8s # using k8s as runner
@@ -59,44 +53,26 @@ stages:
     - bash ./.build.ci.sh
     - bash ./.test.ci.sh
 
-##############################################################################
-# Build & Test in CentOS 7 (LCG)
-##############################################################################
-build:lcg:el7:
-  extends: .build_template
-  tags:
-    - centos7
-  artifacts:
-    paths:
-      - InstallArea
-      - TDR_o1_v01.tgeo.root
-      - TDR_o1_v02.tgeo.root
-    reports:
-      junit: build.${CEPCSW_LCG_VERSION}.${CEPCSW_LCG_PLATFORM}/cepcsw-ctest-result.xml
-
-
 ##############################################################################
 # Build & Test in k8s (LCG)
 ##############################################################################
-build:lcg:el7:k8s:
-  extends: .build_template_k8s
-  image: cepc/cepcsw-cvmfs:el7
-
 build:lcg:el9:k8s:
   extends: .build_template_k8s
-  image: cepc/cepcsw-cvmfs:el9
-  variables:
-    CEPCSW_LCG_PLATFORM: x86_64-el9-gcc11-opt
-    CEPCSW_LCG_VERSION: 105.0.0
+  rules:
+    - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
+      when: manual
+  artifacts:
+    reports:
+      junit: build.${CEPCSW_LCG_VERSION}.${CEPCSW_LCG_PLATFORM}/cepcsw-ctest-result.xml
 
 ##############################################################################
 # Build the docs
 ##############################################################################
 build:docs:k8s:
   extends: .build_template_k8s
-  image: cepc/cepcsw-cvmfs:el9
+  image: sphinxdoc/sphinx
   script:
-    - bash ./.build.ci.sh docs
+    - bash build-docs.sh
   artifacts:
     paths:
       - docs/build/html/

Detector/DetCEPCv4/src/calorimeter/SHcalSc04_Barrel_v04.cpp

@@ -539,7 +539,7 @@ static Ref_t create_detector(Detector &theDetector, xml_h element, SensitiveDete
             cell_x_offset -= total_cell_size_abnormal / 2.;
           }
         }
-        printf("layerID: %2d, x_length: %3.3lf, x_cell: %3.3lf, x_cell_abnormal: %3.3lf, x_dead: %3.3lf, z_length: %3.3lf,z_cell: %3.3lf, z_dead: %3.3lf,\n", layer_id,  2 * x_halflength,  n_x * total_cell_size,  nx_abnormal * total_cell_size_abnormal,  2 * x_halflength - n_x * total_cell_size - nx_abnormal * total_cell_size_abnormal,  2 * z_halfwidth,  n_z * total_cell_size,  2 * z_halfwidth - n_z * total_cell_size);
+        //printf("layerID: %2d, x_length: %3.3lf, x_cell: %3.3lf, x_cell_abnormal: %3.3lf, x_dead: %3.3lf, z_length: %3.3lf,z_cell: %3.3lf, z_dead: %3.3lf,\n", layer_id,  2 * x_halflength,  n_x * total_cell_size,  nx_abnormal * total_cell_size_abnormal,  2 * x_halflength - n_x * total_cell_size - nx_abnormal * total_cell_size_abnormal,  2 * z_halfwidth,  n_z * total_cell_size,  2 * z_halfwidth - n_z * total_cell_size);
         // Reset counters to measure "outside" quantitites
         nRadiationLengths = 0.;
         nInteractionLengths = 0.;

Detector/DetCRD/CMakeLists.txt

@@ -21,12 +21,14 @@ gaudi_add_module(DetCRD
                          src/Muon/Muon_Barrel_v01_04.cpp
                          src/Muon/Muon_Endcap_v01_02.cpp
                          src/Tracker/SiTrackerSkewRing_v01_geo.cpp
+                         src/Tracker/ITK_EndCap_v01.cpp
                          src/Tracker/SiTrackerStitching_v01_geo.cpp
                          src/Tracker/SiTrackerStaggeredLadder_v01_geo.cpp
                          src/Tracker/SiTrackerStaggeredLadder_v02_geo.cpp
                          src/Tracker/SiTrackerStaggeredLadder_v03_geo.cpp
                          src/Tracker/SiTrackerComposite_v01_geo.cpp
                          src/Tracker/SiTrackerComposite_v02_geo.cpp
+                         src/Tracker/SiTrackerComposite_v03_geo.cpp
                          src/Tracker/TPC_Simple_o1_v01.cpp
                          src/Tracker/TPC_ModularEndcap_o1_v01.cpp
 			 src/Tracker/SiTracker_itkbarrel_v01_geo.cpp
@@ -38,6 +40,7 @@ gaudi_add_module(DetCRD
                          src/Tracker/SiTracker_otkbarrel_v02_geo.cpp
                          src/Tracker/SiTracker_otkendcap_v02_geo.cpp
                          src/Other/ParaffinEndcap_v01.cpp
+                         src/Other/ConcreteWall_v01.cpp
 
 		 LINK ${DD4hep_COMPONENT_LIBRARIES}
                       DetIdentifier

Detector/DetCRD/compact/CRD_common_v01/ConcreteWall_v01_01.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<lccdd>
+ 
+<define>
+    <constant name="concrete_position_z" value="592.5*cm"/>
+    <constant name="concrete_hole_rmin" value="65*cm"/>
+    <constant name="concrete_wall_size" value="520*cm"/>
+    <constant name="concrete_wall_hz" value="50*cm"/>
+</define>
+
+<detectors>
+    <detector name="ConcreteWall" type="ConcreteWall_v01" vis="VisibleBrown" material="Concrete">
+      <!-- Use cm as unit if you want to use Pandora for reconstruction -->
+      <position x="0"  y="0"  z="concrete_position_z"/>
+      <dimensions rmax="concrete_wall_size" rmin="concrete_hole_rmin" dz="concrete_wall_hz"/>
+    </detector>
+</detectors>  
+
+</lccdd>

Detector/DetCRD/compact/CRD_common_v01/Ecal_Crystal_Barrel_v02_02.xml

@@ -38,7 +38,7 @@
   </regions>
 
   <detectors>
-    <detector id="DetID_ECAL" name="CaloDetector" type="LongCrystalBarBarrelCalorimeter32Polygon_v02" readout="EcalBarrelCollection" vis="Invisible" sensitive="true" region="EcalBarrelRegion">
+    <detector id="DetID_ECAL" name="EcalBarrel" type="LongCrystalBarBarrelCalorimeter32Polygon_v02" readout="EcalBarrelCollection" vis="Invisible" sensitive="true" region="EcalBarrelRegion">
       <!-- Use cm as unit if you want to use Pandora for reconstruction -->
     </detector>
   </detectors>

Detector/DetCRD/compact/CRD_common_v01/Lumical_o1_v01.xml

@@ -44,31 +44,31 @@
                 </slice>
             </layer>
             <layer name = "Flange">
-                <slice type="Tubs" rmin="18.5*mm" rmax="100*mm" z="30*mm" phi1="0*deg" phi2="360*deg" material="stainless_steel" vis="FlangeVis">
+                <slice type="Tubs" rmin="19.5*mm" rmax="100*mm" z="30*mm" phi1="0*deg" phi2="360*deg" material="stainless_steel" vis="FlangeVis">
                     <position x="0" y="0*mm" z="685*mm"/>
                 </slice>
-                <slice type="Tubs" rmin="18.5*mm" rmax="95*mm" z="20*mm" phi1="0*deg" phi2="360*deg" material="stainless_steel" vis="LumicalFlangeVis">
+                <slice type="Tubs" rmin="19.5*mm" rmax="95*mm" z="20*mm" phi1="0*deg" phi2="360*deg" material="stainless_steel" vis="LumicalFlangeVis">
                     <position x="0" y="0*mm" z="710*mm"/>
                 </slice>
-                <slice type="Tubs" rmin="18.5*mm" rmax="98*mm" z="20*mm" phi1="0*deg" phi2="360*deg" material="stainless_steel" vis="LumicalFlangeVis">
+                <slice type="Tubs" rmin="19.5*mm" rmax="98*mm" z="20*mm" phi1="0*deg" phi2="360*deg" material="stainless_steel" vis="LumicalFlangeVis">
                     <position x="0" y="0*mm" z="730*mm"/>
                 </slice>
-                <slice type="Tubs" rmin="18.5*mm" rmax="95*mm" z="1*mm" phi1="0*deg" phi2="360*deg" material="stainless_steel" vis="LumicalFlangeVis">
+                <slice type="Tubs" rmin="19.5*mm" rmax="95*mm" z="1*mm" phi1="0*deg" phi2="360*deg" material="stainless_steel" vis="LumicalFlangeVis">
                     <position x="0" y="0*mm" z="750*mm"/>
                 </slice>
-                <slice type="Tubs" rmin="18.5*mm" rmax="95*mm" z="1*mm" phi1="0*deg" phi2="360*deg" material="stainless_steel" vis="LumicalFlangeVis">
+                <slice type="Tubs" rmin="19.5*mm" rmax="95*mm" z="1*mm" phi1="0*deg" phi2="360*deg" material="stainless_steel" vis="LumicalFlangeVis">
                     <position x="0" y="0*mm" z="755*mm"/>
                 </slice>
-                <slice type="Tubs" rmin="18.5*mm" rmax="95*mm" z="1*mm" phi1="0*deg" phi2="360*deg" material="stainless_steel" vis="LumicalFlangeVis">
+                <slice type="Tubs" rmin="19.5*mm" rmax="95*mm" z="1*mm" phi1="0*deg" phi2="360*deg" material="stainless_steel" vis="LumicalFlangeVis">
                     <position x="0" y="0*mm" z="760*mm"/>
                 </slice>
-                <slice type="Tubs" rmin="18.5*mm" rmax="95*mm" z="1*mm" phi1="0*deg" phi2="360*deg" material="stainless_steel" vis="LumicalFlangeVis">
+                <slice type="Tubs" rmin="19.5*mm" rmax="95*mm" z="1*mm" phi1="0*deg" phi2="360*deg" material="stainless_steel" vis="LumicalFlangeVis">
                     <position x="0" y="0*mm" z="765*mm"/>
                 </slice>
-                <slice type="Tubs" rmin="18.5*mm" rmax="95*mm" z="1*mm" phi1="0*deg" phi2="360*deg" material="stainless_steel" vis="LumicalFlangeVis">
+                <slice type="Tubs" rmin="19.5*mm" rmax="95*mm" z="1*mm" phi1="0*deg" phi2="360*deg" material="stainless_steel" vis="LumicalFlangeVis">
                     <position x="0" y="0*mm" z="770*mm"/>
                 </slice>
-                <slice type="Tubs" rmin="18.5*mm" rmax="95*mm" z="1*mm" phi1="0*deg" phi2="360*deg" material="stainless_steel" vis="LumicalFlangeVis">
+                <slice type="Tubs" rmin="19.5*mm" rmax="95*mm" z="1*mm" phi1="0*deg" phi2="360*deg" material="stainless_steel" vis="LumicalFlangeVis">
                     <position x="0" y="0*mm" z="775*mm"/>
                 </slice>
             </layer>
@@ -84,9 +84,6 @@
 	            <rotation x="0" y="0" z="0" />
                 </slice>
             </layer>
-            
-        
-            
         </detector>
     </detectors>
 
@@ -112,4 +109,4 @@
     </readout>
   </readouts>
 
-</lccdd>
\ No newline at end of file
+</lccdd>

Detector/DetCRD/compact/CRD_common_v01/OTKBarrel_v02.xml

@@ -26,7 +26,7 @@
 
     <detectors>
         <detector id="DetID_OTKBarrel" name="OTKBarrel" type="SiTracker_otkbarrel_v02" vis="OTKBarrelVis"
-                  readout="OTKBarrelCollection" insideTrackingVolume="true">
+                  readout="OTKBarrelCollection" combineHits="true" insideTrackingVolume="true">
             <type_flags type="DetType_TRACKER + DetType_BARREL + DetType_STRIP "/>
             <envelope vis="SeeThrough">
                 <shape type="Tube" rmin="OTKBarrel_inner_radius" rmax="OTKBarrel_outer_radius"
@@ -40,23 +40,23 @@
                     <module name="OTKBarrel_module" thickness="OTKBarrel_module_thickness" repeat="4"
                             width="OTKBarrel_module_width" length_inner="OTKBarrel_module_length_inner"
                             length_outer="OTKBarrel_module_length_outer" vis="SeeThrough">
-                        <layer name="glue" width="100.40*mm" thickness="300*um" material="Air" vis="BlackVis"/>
-                        <layer name="carbon_fiber_plane_inner" width="100.40*mm" thickness="0.3*mm" material="CarbonFiber" vis="BlackVis"/>
-                        <layer name="carbon_fiber_honeycomb" width="100.40*mm" thickness="6000*um" material="CarbonFiber" vis="BlackVis"/>
-                        <layer name="cooling_fluid" width="100.40*mm" thickness="35.76*0.105*100*um" material="G4_WATER" vis="BlackVis"/>
-                        <layer name="cooling_tube_wall" width="100.40*mm" thickness="3.560*0.169*100*um" material="G4_Ti" vis="BlackVis"/>
-                        <layer name="carbon_fiber_plane_outer" width="100.40*mm" thickness="0.3*mm" material="CarbonFiber" vis="BlackVis"/>
-                        <layer name="other_electronic" width="100.40*mm" thickness="32.6437*0.1*100*um" material="Kapton" vis="BlackVis"/>
-                        <layer name="glue_2" width="100.40*mm" thickness="100*um" material="Air" vis="BlackVis"/>
-                        <layer name="sensor" sensitive="True" width="OTKBarrel_module_width" thickness="0.3*mm" material="G4_Si" vis="FTDSensitiveVis"/>
-                        <layer name="pcb_insulating_layers" width="100.40*mm" thickness="28.41*0.07*100*um" material="Polyimide" vis="BlackVis"/>
-                        <layer name="pcb_metal_layers" width="100.40*mm" thickness="1.436*0.2*100*um" material="G4_Cu" vis="BlackVis"/>
-                        <data_aggregation name="first_data_aggregation" width="104*mm" thickness="0*mm" length="7.0*mm" vis="SeeThrough">
-                            <layer name="PCB" thickness="0*mm" width="OTKBarrel_module_width" length="7.0*mm" vis="GreenVis"/>
-                            <DC name="DC-DC" thickness="0*mm" width="10.0*mm" length="3.0*mm" vis="YellowVis"/>
+                        <layer name="carbon_fiber_plane_inner" width="100.40*mm" thickness="0.3*mm" material="CF_ITK" vis="GrayVis"/>
+                        <layer name="carbon_fiber_honeycomb" width="100.40*mm" thickness="6000*um" material="GraphiteFoam_OTK" vis="GrayVis"/>
+                        <layer name="cooling_fluid" width="100.40*mm" thickness="35.76*0.105*100*um" material="G4_WATER" vis="GrayVis"/>
+                        <layer name="cooling_tube_wall" width="100.40*mm" thickness="3.560*0.169*100*um" material="G4_Ti" vis="GrayVis"/>
+                        <layer name="carbon_fiber_plane_outer" width="100.40*mm" thickness="0.3*mm" material="CF_ITK" vis="GrayVis"/>
+			<layer name="glue" width="100.40*mm" thickness="300*um" material="CER_ITK" vis="GrayVis"/>
+			<layer name="sensor" sensitive="True" width="OTKBarrel_module_width" thickness="0.3*mm" material="G4_Si" vis="FTDSensitiveVis"/>
+			<layer name="glue_2" width="100.40*mm" thickness="100*um" material="CER_ITK" vis="LightGrayVis"/>
+			<layer name="pcb_insulating_layers" width="100.40*mm" thickness="28.41*0.07*100*um" material="Polyimide_ITK" vis="OrangeVis"/>
+                        <layer name="pcb_metal_layers" width="100.40*mm" thickness="1.436*0.2*100*um" material="G4_Cu" vis="OrangeVis"/>
+                        <layer name="other_electronic" width="100.40*mm" thickness="32.6437*0.1*100*um" material="Kapton" vis="OrangeVis"/>
+                        <data_aggregation name="first_data_aggregation" width="104*mm" thickness="2*mm" length="7.0*mm" vis="OrangeVis">
+                            <layer name="PCB" thickness="1*mm" width="OTKBarrel_module_width" length="7.0*mm" vis="GreenVis"/>
+                            <DC name="DC-DC" thickness="1*mm" width="10.0*mm" length="3.0*mm" vis="YellowVis"/>
                         </data_aggregation>
                     </module>
-                    <data_aggregation name="second_data_aggregation" thickness="0*mm" width="20.0*mm" length="10.0*mm" vis="YellowVis"/>
+                    <data_aggregation name="second_data_aggregation" thickness="1*mm" width="20.0*mm" length="10.0*mm" vis="YellowVis"/>
                 </ladder>
             </stave>
         </detector>
@@ -64,7 +64,7 @@
 
     <readouts>
         <readout name="OTKBarrelCollection">
-            <id>system:5,side:-2,layer:4,module:8,iladder:3,oladder:-4,mmodule:-6</id>
+            <id>system:5,side:-2,layer:9,module:8,iladder:32:4,oladder:-4,mmodule:-6</id>
         </readout>
     </readouts>
-</lccdd>
\ No newline at end of file
+</lccdd>

Detector/DetCRD/compact/CRD_common_v01/OTKEndcap_v02.xml

@@ -9,16 +9,16 @@
         <comment>CepC Outer Tracker</comment>
     </info>
     <define>
-        <constant name="OTKEndcap_inner_radius" value="400*mm"/>
+        <!--constant name="OTKEndcap_inner_radius" value="400*mm"/>
         <constant name="OTKEndcap_outer_radius" value="1820*mm"/>
         <constant name="OTKEndcap_zmin" value="2910*mm"/>
-        <constant name="OTKEndcap_zmax" value="2930*mm"/>
+        <constant name="OTKEndcap_zmax" value="2930*mm"/-->
     </define>
 
     <detectors>
         <type_flags type="DetType_TRACKER +  DetType_ENDCAP  + DetType_PIXEL "/>
         <detector id="DetID_OTKEndcap" name="OTKEndcap" type="SiTracker_otkendcap_v02" vis="OTKEndcapVis"
-                  readout="OTKEndcapCollection" insideTrackingVolume="true">
+                  readout="OTKEndcapCollection" combineHits="true" insideTrackingVolume="true">
             <type_flags type="DetType_TRACKER + DetType_ENDCAP "/>
             <envelope vis="SeeThrough">
                 <shape type="BooleanShape" operation="Subtraction" material="Air">
@@ -29,11 +29,11 @@
                 </shape>
             </envelope>
             <rings zmax="OTKEndcap_zmax">
-                <ring name="A1" inner_radius="406*mm" outer_radius="(534-0.2)*mm" repeat="16*5" aggregation="2" vis="SeeThrough"/>
-                <ring name="A2" inner_radius="534*mm" outer_radius="(662-0.5)*mm" repeat="16*5" aggregation="2" vis="SeeThrough"/>
-                <ring name="B1" inner_radius="662*mm" outer_radius="(790-0.2)*mm" repeat="16*7" aggregation="2" vis="SeeThrough"/>
-                <ring name="B2" inner_radius="790*mm" outer_radius="(862-0.2)*mm" repeat="16*7" aggregation="1" vis="SeeThrough"/>
-                <ring name="B3" inner_radius="862*mm" outer_radius="(1008-0.5)*mm" repeat="16*7" aggregation="2" vis="SeeThrough"/>
+                <ring name="A1" inner_radius=" 406*mm" outer_radius="( 534-0.2)*mm" repeat="16* 5" aggregation="2" vis="SeeThrough"/>
+                <ring name="A2" inner_radius=" 534*mm" outer_radius="( 662-0.5)*mm" repeat="16* 5" aggregation="2" vis="SeeThrough"/>
+                <ring name="B1" inner_radius=" 662*mm" outer_radius="( 790-0.2)*mm" repeat="16* 7" aggregation="2" vis="SeeThrough"/>
+                <ring name="B2" inner_radius=" 790*mm" outer_radius="( 862-0.2)*mm" repeat="16* 7" aggregation="1" vis="SeeThrough"/>
+                <ring name="B3" inner_radius=" 862*mm" outer_radius="(1008-0.5)*mm" repeat="16* 7" aggregation="2" vis="SeeThrough"/>
                 <ring name="C1" inner_radius="1008*mm" outer_radius="(1123-0.2)*mm" repeat="16*10" aggregation="2" vis="SeeThrough"/>
                 <ring name="C2" inner_radius="1123*mm" outer_radius="(1255-0.2)*mm" repeat="16*10" aggregation="2" vis="SeeThrough"/>
                 <ring name="C3" inner_radius="1255*mm" outer_radius="(1324-0.2)*mm" repeat="16*10" aggregation="1" vis="SeeThrough"/>
@@ -44,24 +44,24 @@
                 <ring name="D4" inner_radius="1668*mm" outer_radius="(1816-0.2)*mm" repeat="16*14" aggregation="2" vis="SeeThrough"/>
             </rings>
             <layers thickness="11.4*mm">
+	        <layer name="other_electronic" width="100.40*mm" thickness="32.6437*0.1*100*um" material="Kapton" vis="OrangeVis"/>
                 <layer name="PCB_metal_layers" thickness="1.436*0.2*100*um" material="G4_Cu" vis="FTDSupportVis"/>
-                <layer name="PCB_insulating_layers" thickness="28.41*0.07*100*um" material="Polyimide" vis="FTDSupportVis"/>
+                <layer name="PCB_insulating_layers" thickness="28.41*0.07*100*um" material="Polyimide_ITK" vis="FTDSupportVis"/>
+		<layer name="glue_1" thickness="100*um" material="CER_ITK" vis="LightGrayVis"/>
                 <layer name="sensor" sensitive="True" thickness="0.3*mm" material="G4_Si" vis="FTDSensitiveVis"/>
-                <layer name="glue_1" thickness="100*um" material="Air" vis="FTDSupportVis"/>
-                <layer name="other_electronic" width="100.40*mm" thickness="32.6437*0.1*100*um" material="Kapton" vis="BlackVis"/>
-                <layer name="carbon_fiber_plane" thickness="0.3*mm" material="CarbonFiber" vis="FTDSupportVis"/>
-                <layer name="cooling_tube_wall" thickness="3.560*0.169*100*um" material="G4_Ti" vis="FTDSupportVis"/>
-                <layer name="cooling_fluid" thickness="35.76*0.105*100*um" material="G4_WATER" vis="FTDSupportVis"/>
-                <layer name="graphite_foam_Honeycom" thickness="6000*um" material="Air" vis="FTDSupportVis"/>
-                <layer name="carbon_fiber_back_plate" thickness="0.3*mm" material="CarbonFiber" vis="FTDSupportVis"/>
-                <layer name="glue_2" thickness="200*um" material="Air" vis="FTDSupportVis"/>
+		<layer name="glue_2" thickness="200*um" material="Polyimide_ITK" vis="LightGrayVis"/>
+                <layer name="carbon_fiber_plane" thickness="0.3*mm" material="CF_ITK" vis="GrayVis"/>
+                <layer name="cooling_tube_wall" thickness="3.560*0.169*100*um" material="G4_Ti" vis="GrayVis"/>
+                <layer name="cooling_fluid" thickness="35.76*0.105*100*um" material="G4_WATER" vis="GrayVis"/>
+                <layer name="graphite_foam_Honeycom" thickness="6000*um" material="GraphiteFoam_OTK" vis="GrayVis"/>
+                <layer name="carbon_fiber_back_plate" thickness="0.3*mm" material="CF_ITK" vis="GrayVis"/>
             </layers>
         </detector>
     </detectors>
 
     <readouts>
         <readout name="OTKEndcapCollection">
-            <id>system:5,side:-2,layer:4,module:8,sensor:13</id>
+            <id>system:5,side:-2,layer:9,module:8,sensor:8</id>
         </readout>
     </readouts>
-</lccdd>
\ No newline at end of file
+</lccdd>

Detector/DetCRD/compact/CRD_common_v01/SHcalGlass_Endcaps_v01.xml

@@ -44,7 +44,7 @@
 
     <detectors>
         <detector id="DetID_HCAL_ENDCAP"
-                  name="HcalEndcaps"
+                  name="HcalEndcap"
                   type="SHcalSc04_Endcaps_v02"
                   readout="HcalEndcapsCollection"
                   vis="Invisible"

Detector/DetCRD/compact/CRD_common_v02/ITK_EndCap_v01.xml

+<lccdd>
+  <info name="ITKEndcap_v01"
+        title="CepC ITKEndcap"
+        author="Li Zhihao"
+        url="http://cepc.ihep.ac.cn"
+        contact="lizhihao@ihep.ac.cn"
+        status="developing"
+        version="v01">
+    <comment>CepC Inner Tracker EndCap</comment>
+  </info>
+  <define>
+    <constant name="ITKModuleLengthPhi" value="40.1*mm"/>
+  </define>
+
+  <detectors>
+    <detector id="DetID_ITKEndcap" name="ITKEndcap" type="ITK_EndCap_v01" vis="FTDVis" readout="ITKEndcapCollection" combineHits="true" insideTrackingVolume="true" reflect="true">
+      <envelope>
+	<shape type="Assembly"/>
+      </envelope>
+
+      <type_flags type="DetType_TRACKER +  DetType_ENDCAP  + DetType_PIXEL "/>
+
+      <support>
+        <slice name="Carbon_fiber_front" material="CF_ITK" thickness="150*um" vis="GrayVis"/>
+        <slice name="Cooling_tube_wall" material="G4_Ti" thickness="3.560*0.013*100*um" vis="GrayVis"/>
+        <slice name="Cooling_fluid" material="G4_WATER" thickness="35.76*0.105*100*um" vis="GrayVis"/>
+        <slice name="Graphite_foam_Honeycomb" material="GraphiteFoam_OTK" thickness="2000*um" vis="GrayVis"/>
+        <slice name="Carbon_fiber_back" material="CF_ITK" thickness="150*um" vis="GrayVis"/>
+      </support>
+
+      <sensor>
+	<slice name="GlueF" material="CER_ITK" thickness="200*um" vis="SeeThrough"/>
+        <slice name="Sensor" material="G4_Si" thickness="150*um" sensitive="true" vis="OrangeVis"/>
+	<slice name="GlueB" material="CER_ITK" thickness="100*um" vis="SeeThrough"/>
+        <slice name="FPC_Insulating_layers" material="Polyimide_ITK" thickness="100*um" vis="SeeThrough"/>
+        <slice name="FPC_metal_layer" material="G4_Al" thickness="50*um" vis="SeeThrough"/>
+	<slice name="Other_electronics" material="Kapton" thickness="32.6437*0.05*100*um" vis="SeeThrough"/>
+      </sensor>
+
+      <layers>
+	<layer id="0" z="505*mm" inner_r="81.5*mm" outer_r="245*mm" phi0="90*degree" vis="SeeThrough">
+	  <ring id="0" inner_r="81.5*mm"  outer_r="(163.4-0.1)*mm" module_dr="80.3*mm" module_dphi="40.1*mm" nmodule="13" vis="SeeThrough" />
+          <ring id="1" inner_r="163.4*mm" outer_r="245*mm" module_dr="80.3*mm" module_dphi="40.1*mm" nmodule="20" vis="SeeThrough"/>
+	</layer>
+	<layer id="1" z="718.5*mm" inner_r="110.5*mm" outer_r="355*mm" phi0="90*degree" vis="SeeThrough">
+          <ring id="0" inner_r="110.5*mm" outer_r="(192.2-0.1)*mm" module_dr="80.3*mm" module_dphi="40.1*mm" nmodule="16" vis="SeeThrough"/>
+          <ring id="1" inner_r="192.2*mm" outer_r="(273.4-0.1)*mm" module_dr="80.3*mm" module_dphi="40.1*mm" nmodule="24" vis="SeeThrough"/>
+          <ring id="2" inner_r="273.4*mm" outer_r="355*mm" module_dr="80.3*mm" module_dphi="40.1*mm" nmodule="28" vis="SeeThrough"/>
+	</layer>
+	<layer id="2" z="1000.3*mm" inner_r="160.5*mm" outer_r="565*mm" phi0="90*degree" vis="SeeThrough">
+          <ring id="0" inner_r="160.5*mm" outer_r="(282-0.1)*mm" module_dr="120.5*mm" module_dphi="40.1*mm" nmodule="24" vis="SeeThrough"/>
+          <ring id="1" inner_r="282*mm"   outer_r="(423.4-0.1)*mm" module_dr="140.6*mm" module_dphi="40.1*mm" nmodule="36" vis="SeeThrough"/>
+          <ring id="2" inner_r="423.4*mm" outer_r="565*mm" module_dr="140.6*mm" module_dphi="40.1*mm" nmodule="44" vis="SeeThrough"/>
+	</layer>
+	<layer id="3" z="1489*mm" inner_r="220.3*mm" outer_r="565*mm" phi0="90*degree" vis="SeeThrough">
+          <ring id="0" inner_r="220.3*mm" outer_r="(301.6-0.1)*mm" module_dr="80.3*mm" module_dphi="40.1*mm" nmodule="24" vis="SeeThrough"/>
+          <ring id="1" inner_r="301.6*mm" outer_r="(443.1-0.1)*mm" module_dr="140.6*mm" module_dphi="40.1*mm" nmodule="36" vis="SeeThrough"/>
+          <ring id="2" inner_r="443.1*mm" outer_r="565*mm" module_dr="120.5*mm" module_dphi="40.1*mm"  nmodule="44" vis="SeeThrough"/>
+	</layer>
+      </layers>
+
+    </detector>
+  </detectors>
+
+  <readouts>
+    <readout name="ITKEndcapCollection">
+      <id>system:5,side:-2,layer:9,module:8,sensor:8</id>
+    </readout>
+  </readouts>
+
+</lccdd>

Detector/DetCRD/compact/CRD_common_v02/VXD_Composite_v01_03.xml

+<lccdd>
+  <info name="VXD_Composite_v01_03"
+        title="CepC VXD with stitch and ladder module"
+        author=""
+        url="http://cepc.ihep.ac.cn"
+        status="developing"
+        version="v01">
+    <comment>CepC vertex detector</comment>
+  </info>
+  <define>
+    <constant name="VXD_inner_radius" value="Vertex_inner_radius"/>
+    <constant name="VXD_outer_radius" value="Vertex_outer_radius"/>
+    <constant name="VXD_half_length"  value="Vertex_half_length"/>
+    <!--ladder parameter-->
+    <constant name="VXD_ladder_length" value="682*mm"/>
+    <constant name="VXD_ladder_width"      value="17.3*mm"/>
+    <constant name="VXD_ladder_flex_width" value="VXD_ladder_width"/>
+    <!--stitching parameter-->
+    <constant name="VXD_sensor_backbone"   value="0.055*mm"/>
+    <constant name="VXD_sensor_switches"   value="0.019*mm"/>
+    <constant name="VXD_sensor_bias"       value="0.106*mm"/>
+    <constant name="VXD_sensor_periphery"  value="0.177*mm"/>
+    <!--equivalent to CFRP_CMS-->
+    <constant name="VXD_flex_thickness"    value="1.3*um"/>
+  </define>
+
+  <detectors>
+    <detector id="DetID_VXD" name="VXD" type="SiTrackerComposite_v03" vis="VXDVis" readout="VXDCollection" combineHits="true" insideTrackingVolume="true" printLevel="INFO">
+      <envelope>
+        <shape type="Assembly"/>
+      </envelope>
+
+      <type_flags type="DetType_TRACKER + DetType_BARREL + DetType_PIXEL "/>
+
+      <global sensitive_thickness="VXD_sensitive_thickness" support_thickness="VXD_support_thickness" sensor_length="VXD_sensor_length"
+              sensitive_mat="G4_Si" support_mat="G4_C" sensitive_threshold_KeV="64*keV"  />
+      <display ladder="SeeThrough" support="VXDSupportVis" flex="VXDFlexVis" sens_env="SeeThrough" sens="GrayVis" deadsensor="GreenVis" deadwire="RedVis"/>
+
+      <shell rmin="70*mm" rmax="72.5*mm" zhalf="510*mm" material="CFRP_CMS" vis="LightGrayVis"/>
+
+      <layer id="0" phi0="0" isBent="true">
+	<module offset="0" phi="0" radius="11.06254*mm" nx="48" ny="4" backbone="VXD_sensor_backbone" switches="VXD_sensor_switches"
+		bias="VXD_sensor_bias" periphery="VXD_sensor_periphery" mechanical_gap="0*mm" material="G4_Si">
+          <sensor thickness="50*um" width="8.409*mm" length="3.296*mm" material="G4_Si" vis="VXDVis"/>
+          <flex vis="GrayVis">
+            <!--slice thickness="0.4*um" material="G4_Al"/-->
+            <slice thickness="VXD_flex_thickness+45*um" material="CFRP_CMS"/>
+          </flex>
+          <readout thickness="50*um" width="4.155*mm" material="Kapton" vis="RedVis"/>
+	  <driver thickness="50*um" width="1.385*mm" material="Kapton" vis="BlueVis"/>
+        </module>
+
+	<module offset="0" phi="180*degree" radius="11.06254*mm" nx="48" ny="4" backbone="VXD_sensor_backbone" switches="VXD_sensor_switches"
+		bias="VXD_sensor_bias" periphery="VXD_sensor_periphery" mechanical_gap="0*mm" material="G4_Si">
+          <sensor thickness="50*um" width="8.409*mm" length="3.296*mm" material="G4_Si" vis="VXDVis"/>
+          <flex vis="GrayVis">
+            <!--slice thickness="0.4*um" material="G4_Al"/-->
+            <slice thickness="VXD_flex_thickness+45*um" material="CFRP_CMS"/>
+          </flex>
+          <readout thickness="50*um" width="4.155*mm" material="Kapton" vis="RedVis"/>
+          <driver thickness="50*um" width="1.385*mm" material="Kapton" vis="BlueVis"/>
+        </module>
+      </layer>
+
+      <layer id="1" phi0="11.4375*degree" isBent="true">
+	<module offset="0" phi="0" radius="16.56198*mm" nx="72" ny="6" backbone="VXD_sensor_backbone" switches="VXD_sensor_switches"
+		bias="VXD_sensor_bias" periphery="VXD_sensor_periphery" mechanical_gap="0.5*mm" material="G4_Si">
+          <sensor thickness="50*um" width="8.409*mm" length="3.296*mm" material="G4_Si" vis="VXDVis"/>
+          <flex vis="GrayVis">
+            <!--slice thickness="0.4*um" material="G4_Al"/-->
+            <slice thickness="VXD_flex_thickness+32*um" material="CFRP_CMS"/>
+          </flex>
+          <readout thickness="50*um" width="4.155*mm" material="Kapton" vis="RedVis"/>
+          <driver thickness="50*um" width="1.385*mm" material="Kapton" vis="BlueVis"/>
+        </module>
+
+        <module offset="0" phi="180*degree" radius="16.56198*mm" nx="72" ny="6" backbone="VXD_sensor_backbone" switches="VXD_sensor_switches"
+		bias="VXD_sensor_bias" periphery="VXD_sensor_periphery" mechanical_gap="0.5*mm" material="G4_Si">
+          <sensor thickness="50*um" width="8.409*mm" length="3.296*mm" material="G4_Si" vis="VXDVis"/>
+          <flex vis="GrayVis">
+            <!--slice thickness="0.4*um" material="G4_Al"/-->
+            <slice thickness="VXD_flex_thickness+32*um" material="CFRP_CMS"/>
+          </flex>
+          <readout thickness="50*um" width="4.155*mm" material="Kapton" vis="RedVis"/>
+          <driver thickness="50*um" width="1.385*mm" material="Kapton" vis="BlueVis"/>
+        </module>
+      </layer>
+
+      <layer id="2" phi0="-1.6875*degree" isBent="true">
+	<module offset="0" phi="0" radius="22.06142*mm" nx="96" ny="8" backbone="VXD_sensor_backbone" switches="VXD_sensor_switches"
+		bias="VXD_sensor_bias" periphery="VXD_sensor_periphery" mechanical_gap="0.5*mm" material="G4_Si">
+          <sensor thickness="50*um" width="8.409*mm" length="3.296*mm" material="G4_Si" vis="VXDVis"/>
+	  <flex vis="GrayVis">
+            <!--slice thickness="0.4*um" material="G4_Al"/-->
+            <slice thickness="VXD_flex_thickness+31*um" material="CFRP_CMS"/>
+          </flex>
+          <readout thickness="50*um" width="4.155*mm" material="Kapton" vis="RedVis"/>
+          <driver thickness="50*um" width="4.155*mm" material="Kapton" vis="BlueVis"/>
+        </module>
+
+        <module offset="0" phi="180*degree" radius="22.06142*mm" nx="96" ny="8" backbone="VXD_sensor_backbone" switches="VXD_sensor_switches"
+		bias="VXD_sensor_bias" periphery="VXD_sensor_periphery" mechanical_gap="0.5*mm" material="G4_Si">
+          <sensor thickness="50*um" width="8.409*mm" length="3.296*mm" material="G4_Si" vis="VXDVis"/>
+          <flex vis="GrayVis">
+            <!--slice thickness="0.4*um" material="G4_Al"/-->
+            <slice thickness="VXD_flex_thickness+31*um" material="CFRP_CMS"/>
+          </flex>
+          <readout thickness="50*um" width="4.155*mm" material="Kapton" vis="RedVis"/>
+          <driver thickness="50*um" width="4.155*mm" material="Kapton" vis="BlueVis"/>
+        </module>
+      </layer>
+
+      <layer id="3" phi0="-6.75*degree" isBent="true">
+	<module offset="0" phi="0" radius="27.56086*mm" nx="120" ny="10" backbone="VXD_sensor_backbone" switches="VXD_sensor_switches"
+		bias="VXD_sensor_bias" periphery="VXD_sensor_periphery" mechanical_gap="0.5*mm" material="G4_Si">
+          <sensor thickness="50*um" width="8.409*mm" length="3.296*mm" material="G4_Si" vis="VXDVis"/>
+          <flex vis="GrayVis">
+            <!--slice thickness="0.4*um" material="G4_Al"/-->
+            <slice thickness="VXD_flex_thickness+29*um" material="CFRP_CMS"/>
+          </flex>
+          <readout thickness="50*um" width="4.155*mm" material="Kapton" vis="RedVis"/>
+          <driver thickness="50*um" width="4.155*mm" material="Kapton" vis="BlueVis"/>
+        </module>
+
+        <module offset="0" phi="180*degree" radius="27.56086*mm" nx="120" ny="10" backbone="VXD_sensor_backbone" switches="VXD_sensor_switches"
+		bias="VXD_sensor_bias" periphery="VXD_sensor_periphery" mechanical_gap="0.5*mm" material="G4_Si">
+          <sensor thickness="50*um" width="8.409*mm" length="3.296*mm" material="G4_Si" vis="VXDVis"/>
+          <flex vis="GrayVis">
+	    <!--slice thickness="0.4*um" material="G4_Al"/-->
+            <slice thickness="VXD_flex_thickness+29*um" material="CFRP_CMS"/>
+          </flex>
+          <readout thickness="50*um" width="4.155*mm" material="Kapton" vis="RedVis"/>
+          <driver thickness="50*um" width="4.155*mm" material="Kapton" vis="BlueVis"/>
+        </module>
+      </layer>
+
+      <layer id="4" support_rmin="39.5*mm" rotate="13.5*degree" phi0="13.5*degree" n_ladders="24" n_sensors_per_side="0">
+        <ladder isDoubleSided="true">
+          <ladderSupport height="3.1988*mm" length="VXD_ladder_length" thickness="370*um" width="VXD_ladder_width" mat="CFRP_CMS"/>
+          <flex>
+            <slice length="VXD_ladder_length" thickness="12.5*um" width="VXD_ladder_flex_width" mat="Acrylicglue"/> <!--glue between flex and sensor/support-->
+            <slice length="VXD_ladder_length" thickness="12.5*um" width="VXD_ladder_flex_width" mat="Kapton"/>
+            <slice length="VXD_ladder_length" thickness="12.5*um" width="VXD_ladder_flex_width" mat="Acrylicglue"/>
+            <slice length="VXD_ladder_length" thickness=" 8.0*um" width="VXD_ladder_flex_width" mat="G4_Al"/>
+            <slice length="VXD_ladder_length" thickness="13.0*um" width="VXD_ladder_flex_width" mat="Kapton"/>
+            <slice length="VXD_ladder_length" thickness="12.5*um" width="VXD_ladder_flex_width" mat="Acrylicglue"/>
+            <slice length="VXD_ladder_length" thickness=" 8.0*um" width="VXD_ladder_flex_width" mat="G4_Al"/>
+            <slice length="VXD_ladder_length" thickness="13.0*um" width="VXD_ladder_flex_width" mat="Kapton"/>
+            <slice length="VXD_ladder_length" thickness="12.5*um" width="VXD_ladder_flex_width" mat="Acrylicglue"/>
+            <slice length="VXD_ladder_length" thickness="12.0*um" width="VXD_ladder_flex_width" mat="G4_Al"/>
+            <slice length="VXD_ladder_length" thickness="25.0*um" width="VXD_ladder_flex_width" mat="Kapton"/>
+            <slice length="VXD_ladder_length" thickness="12.0*um" width="VXD_ladder_flex_width" mat="G4_Al"/>
+            <slice length="VXD_ladder_length" thickness="12.5*um" width="VXD_ladder_flex_width" mat="Acrylicglue"/>
+            <slice length="VXD_ladder_length" thickness="13.0*um" width="VXD_ladder_flex_width" mat="Kapton"/>
+            <slice length="VXD_ladder_length" thickness=" 8.0*um" width="VXD_ladder_flex_width" mat="G4_Al"/>
+            <slice length="VXD_ladder_length" thickness="12.5*um" width="VXD_ladder_flex_width" mat="Acrylicglue"/>
+            <slice length="VXD_ladder_length" thickness="13.0*um" width="VXD_ladder_flex_width" mat="Kapton"/>
+            <slice length="VXD_ladder_length" thickness=" 8.0*um" width="VXD_ladder_flex_width" mat="G4_Al"/>
+            <slice length="VXD_ladder_length" thickness="12.5*um" width="VXD_ladder_flex_width" mat="Acrylicglue"/>
+            <slice length="VXD_ladder_length" thickness="12.5*um" width="VXD_ladder_flex_width" mat="Kapton"/>
+            <slice length="VXD_ladder_length" thickness="12.5*um" width="VXD_ladder_flex_width" mat="Acrylicglue"/> <!--glue between flex and sensor/support-->
+          </flex>
+          <sensor n_sensors="26" gap="0.1*mm" thickness="50*um" active_length="25.6*mm" active_width="12.8*mm" dead_width="2*mm" sensor_mat="G4_Si"
+                  deadwire_length="(26*(25.6+0.1)-0.1)*mm" deadwire_width="2.5*mm" deadwire_thickness="(50/10)*um" deadwire_mat="G4_Al"/>
+        </ladder>
+      </layer>
+    </detector>
+  </detectors>
+  
+  <readouts>
+    <readout name="VXDCollection">
+      <!--segmentation type="CartesianGridYZ" grid_size_y="0.016*mm" grid_size_z="0.016*mm"/>
+      <id>system:5,side:-2,layer:9,module:8,sensor:32:8,y:-12,z:-12</id-->
+      <!-- old tracking not use senor id: 24-31 bit-->
+      <id>system:5,side:-2,layer:9,module:8,sensor:32:16</id>
+    </readout>
+  </readouts>
+</lccdd>

Detector/DetCRD/compact/CRD_common_v02/materials.xml

@@ -852,6 +852,15 @@
       <composite n="1" ref="C" />
     </material>
 
+    <material name="Concrete">
+      <D value="2.4" unit="g/cm3"/>
+      <composite n="23" ref="Si"/>
+      <composite n="13" ref="O"/>
+      <composite n="5" ref="Ca"/>
+      <composite n="1" ref="Al"/>
+      <composite n="1" ref="Fe"/>
+    </material>
+
     <material name="CF_ITK">
       <D type="density" value="1.60885" unit="g/cm3"/>
       <fraction n="1.0" ref="CarbonFiber"/>
@@ -867,6 +876,13 @@
       <D type="density" value="2" unit="g/cm3"/>
       <fraction n="1.0" ref="G4_WATER"/>
     </material>
+
+    <material name="GraphiteFoam_OTK">
+      <D type="density" value="0.113776" unit="g/cm3"/>
+      <fraction n="1.0" ref="Graphite_ITK"/>
+      <fraction n="1.0" ref="CF_ITK"/>
+    </material>
+
   </materials>
 
   <surfaces>

Detector/DetCRD/compact/README.md

@@ -11,23 +11,10 @@ The following CRD detector models are available in CEPCSW
 | CRD_o1_v04    | smaller center beam pipe     | SIT+DC+SET  | crystal | RPC  | Scint | developing     |
 | CRD_o1_v05    | Use Ref-Det ECAL and HCAL    | SIT+TPC+SET | crystal | Glass| Scint | developing     |
 | ------------- | -----------------------------|-------------|---------|------|-------|----------------|
-
-# CRD detector models - Overview
-
-The following CRD detector models are available in CEPCSW
-
-| Model         |  Description                 | MainTracker |  Ecal   | Hcal | Status         |
-| ------------- | -----------------------------|------------ |---------|------|----------------|
-| CRD_o1_v01    | coil inside simulation model | SIT+DC+SET  | crystal | RPC  | developing     |
-| CRD_o1_v02    | strip SET                    | SIT+DC+SET  | crystal | RPC  | developing     |
-| CRD_o1_v03    | MOST2 vertex                 | SIT+DC+SET  | crystal | RPC  | developing     |
-| CRD_o1_v04    | smaller center beam pipe     | SIT+DC+SET  | crystal | RPC  | developing     |
-| CRD_o1_v05    | Use Ref-Det ECAL and HCAL    | SIT+TPC+SET | crystal | Glass| developing     |
-| ------------- | -----------------------------|-------------|---------|------|----------------|
-| TDR_o1_v01    | stitching and planar VXD, TPC| ITK+TPC+OTK | crystal | Glass| developing     |
-| TDR_o1_v02    | short barrel vertex, TPC     | SIT+TPC+SET | crystal | Glass| developing     |
-| TDR_o2_v01    | long barrel vertex,  DC      | SIT+DC +SET | crystal | Glass| developing     |
-| TDR_o2_v02    | short barrel vertex, DC      | SIT+DC +SET | crystal | Glass| developing     |
+| TDR_o1_v01    | stitching and planar VXD, TPC| ITK+TPC+OTK | crystal | Glass| Scint | developing     |
+| TDR_o1_v02    | short barrel vertex, TPC     | SIT+TPC+SET | crystal | Glass| Scint | developing     |
+| TDR_o2_v01    | long barrel vertex,  DC      | SIT+DC +SET | crystal | Glass| Scint | developing     |
+| TDR_o2_v02    | short barrel vertex, DC      | SIT+DC +SET | crystal | Glass| Scint | developing     |
  
 ## Details
 
@@ -90,7 +77,40 @@ The following CRD detector models are available in CEPCSW
   - compact files: 
         - [./CRD_o1_v05/CRD_o1_v05.xml]
 
-### TDR_o1_v01 (TODO)
+### TDR_o1_v01
+ - coil outside Hcal ref-TDR detector model
+ - BeamPipe
+         - with center pipe + crotch link to doubly-pipe
+         - CRD_common_v02/Beampipe_v01_07.xml: Detector/DetCRD/src/Other/CRDBeamPipe_v01_geo.cpp
+ - Vertex
+         - with silicon ladders (sitiching 4 layers + ladder double layers)
+         - CRD_common_v02/VXD_Composite_v01_03.xml: Detector/DetCRD/src/Tracker/SiTrackerComposite_v03_geo.cpp
+ - MainTracker
+         - with TPC + pixel silicon detector
+         - CRD_common_v02/TPC_ModularEndcap_o1_v02.xml:  Detector/DetCRD/src/Tracker/TPC_ModularEndcap_o1_v01.cpp
+         - CRD_common_v02/ITK_StaggeredStave_v03_01.xml: Detector/DetCRD/src/Tracker/SiTrackerStaggeredLadder_v03_geo.cpp
+         - CRD_common_v02/ITK_EndCap_v01.xml:            Detector/DetCRD/src/Tracker/ITK_EndCap_v01.cpp
+ - TOF & outer tracker
+         - with AC-LCAD
+         - OTKBarrel_v02.xml: Detector/DetCRD/src/Tracker/Detector/DetCRD/src/Tracker/SiTracker_otkbarrel_v02_geo.cpp
+         - OTKEndcap_v02.xml: Detector/DetCRD/src/Tracker/Detector/DetCRD/src/Tracker/SiTracker_otkendcap_v02_geo.cpp
+ - Ecal
+         - with crystal
+         - Ecal_Crystal_Barrel_v02_02.xml: Detector/DetCRD/src/Calorimeter/LongCrystalBarBarrelCalorimeter32Polygon_v02.cpp
+         - Ecal_Crystal_Endcap_v02_01.xml: Detector/DetCRD/src/Calorimeter/LongCrystalBarEndcapCalorimeter_v03.cpp
+ - Hcal
+         - with glass sensitive
+         - SHcalGlass_Barrel_v05.xml:  Detector/DetCEPCv4/src/calorimeter/SHcalSc04_Barrel_v04.cpp
+         - SHcalGlass_Endcaps_v01.xml: Detector/DetCEPCv4/src/calorimeter/SHcalSc04_Endcaps_v01.cpp
+ - Coil
+         - sub-layers using DD4hep_TubeSegment
+         - Coil_Simple_v01_03.xml
+ - Yoke & muon
+         - CRD_common_v01/Muon_Barrel_v01_04.xml: Detector/DetCRD/src/Muon/Muon_Barrel_v01_04.cpp 
+         - CRD_common_v01/Muon_Endcap_v01_02.xml: Detector/DetCRD/src/Muon/Muon_Endcap_v01_02.cpp
+ - LumiCal
+         - CRD_common_v01/Lumical_o1_v01.xml: Detector/DetCRD/src/Calorimeter/Lumical_v01_geo.cpp
+ - Service & others (TODO)
 
 ### TDR_o1_v02 (TODO)
 

Detector/DetCRD/compact/TDR_o1_v01/TDR_Dimensions_v01_01.xml

@@ -35,7 +35,7 @@
     <constant name="DetID_SET"          value="  5"/>
     <constant name="DetID_ETD"          value="  6"/>
     <constant name="DetID_ITKBarrel"    value="  2"/>
-    <constant name="DetID_ITKEndCap"    value="  3"/>
+    <constant name="DetID_ITKEndcap"    value="  3"/>
     <constant name="DetID_OTKBarrel"    value="  5"/>
     <constant name="DetID_OTKEndcap"    value="  6"/>
     
@@ -78,6 +78,9 @@
     <constant name="BeamPipe_FirstSeparated_zmax"  value="1110*mm"/>
     <constant name="BeamPipe_Mask_zmin"            value="1210*mm"/>
     <constant name="BeamPipe_Mask_zmax"            value="1230*mm"/>
+    <constant name="BeamPipe_SR_Mask_z1"           value="1850*mm"/>
+    <constant name="BeamPipe_SR_Mask_z2"           value="1870*mm"/>
+    <constant name="BeamPipe_SR_Mask_z3"           value="1880*mm"/>
     <constant name="BeamPipe_Q1a_zmin"             value="1900*mm"/>
     <constant name="BeamPipe_Q1a_zmax"             value="3110*mm"/>
     <constant name="BeamPipe_Q1b_zmin"             value="3190*mm"/>
@@ -86,11 +89,22 @@
     <constant name="BeamPipe_QF1_zmax"             value="6200*mm"/>
     <constant name="BeamPipe_end_z"                value="7050*mm"/>
 
-    <constant name="BeamPipe_Central_inner_radius"  value="10*mm"/>
+    <constant name="BeamPipe_AntiSolenoid1_zmin"         value="1130*mm"/>
+    <constant name="BeamPipe_AntiSolenoid1_zmax"         value="1900*mm"/>
+    <constant name="BeamPipe_AntiSolenoid1_inner_radius" value="90*mm"/>
+    <constant name="BeamPipe_AntiSolenoid2_zmin"         value="1930*mm"/>
+    <constant name="BeamPipe_AntiSolenoid2_zmax"         value="3964*mm"/>
+    <constant name="BeamPipe_AntiSolenoid2_inner_radius" value="120*mm"/>
+    <constant name="BeamPipe_AntiSolenoid3_zmin"         value="3970*mm"/>
+    <constant name="BeamPipe_AntiSolenoid3_zmax"         value="7000*mm"/>
+    <constant name="BeamPipe_AntiSolenoid3_inner_radius" value="185*mm"/>
+
+    <constant name="BeamPipe_Central_inner_radius"  value="9.995*mm"/>
     <constant name="BeamPipe_Fork_inner_radius"     value="10*mm"/>
     <constant name="BeamPipe_FirstExpand_width"     value="35*mm"/>
     <constant name="BeamPipe_SecondExpand_width"    value="39*mm"/>
     <constant name="BeamPipe_Mask_inner_radius"     value="6*mm"/>
+    <constant name="BeamPipe_Cu_thickness_SR_Mask_mid" value="7*mm"/>
     <constant name="BeamPipe_Q1a_inner_radius"      value="BeamPipe_Fork_inner_radius"/>
     <constant name="BeamPipe_Q1b_inner_radius"      value="11.5*mm"/>
     <constant name="BeamPipe_QF1_inner_radius"      value="16*mm"/>
@@ -116,20 +130,25 @@
     <constant name="ITKBarrel1_inner_radius"   value="235*mm"/>
     <constant name="ITKBarrel2_inner_radius"   value="345*mm"/>
     <constant name="ITKBarrel3_inner_radius"   value="555.6*mm"/>
-    <constant name="ITKBarrel1_half_length"    value="500.5*mm"/>
-    <constant name="ITKBarrel2_half_length"    value="715*mm"/>
-    <constant name="ITKBarrel3_half_length"    value="1001*mm"/>
+    <constant name="ITKBarrel1_half_length"    value="493.3*mm"/>
+    <constant name="ITKBarrel2_half_length"    value="704.8*mm"/>
+    <constant name="ITKBarrel3_half_length"    value="986.6*mm"/>
 
     <!-- Parameters of time of flight tracker -->
     <constant name="OTKBarrel_inner_radius" value="1800*mm"/>
     <constant name="OTKBarrel_outer_radius" value="1830*mm"/>
-    <!--constant name="OTKBarrel_half_length" value="2940*mm"/--><!--reach Ecal edge, wait mechanical design update-->
     <constant name="OTKBarrel_half_length" value="2930*mm"/>
     <constant name="OTKBarrelLayer1_half_length" value="OTKBarrel_half_length"/>
     <constant name="OTKBarrelLayer2_half_length" value="OTKBarrel_half_length"/>
     <constant name="OTKBarrel1_inner_radius" value="1805*mm"/>
     <constant name="OTKBarrel2_inner_radius" value="1820*mm"/>
 
+    <constant name="OTKEndcap_zmin"         value="2910*mm"/>
+    <constant name="OTKEndcap_zmax"         value="2930*mm"/>
+    <constant name="OTKEndcap_outer_radius" value="1820*mm"/>
+    <constant name="OTKEndcap_inner_radius" value="400*mm"/>
+
+    <!-- obselete -->
     <constant name="SET_inner_radius"    value="1800*mm"/>
 
     <constant name="SiTracker_endcap_barrel_zgap" value="5*mm"/>

Detector/DetCRD/compact/TDR_o1_v01/TDR_o1_v01-onlySIT.xml

@@ -25,11 +25,11 @@
   </define>
 
   <include ref="./TDR_Dimensions_v01_01.xml"/>
-  <include ref="../CRD_common_v02/SIT_StaggeredStave_v02.xml"/>
+<!--  <include ref="../CRD_common_v02/SIT_StaggeredStave_v02.xml"/>-->
   <!--include ref="../CRD_common_v02/SIT_StaggeredStave_v01.xml"/-->
-  <!--include ref="../CRD_common_v02/FTD_SkewRing_v01_05.xml"/>
-      <include ref="../CRD_common_v02/SIT_SimplePixel_v01_03.xml"/>
-  <include ref="../CRD_common_v01/SET_SimplePixel_v01_01.xml"/-->
+  <include ref="../CRD_common_v02/ITK_EndCap_v01.xml"/>
+<!--      <include ref="../CRD_common_v02/SIT_SimplePixel_v01_03.xml"/>-->
+<!--  <include ref="../CRD_common_v01/SET_SimplePixel_v01_01.xml"/&ndash;&gt;-->
   
   <fields>
     <field name="InnerSolenoid" type="solenoid"

Detector/DetCRD/compact/TDR_o1_v01/TDR_o1_v01-onlyTracker.xml

@@ -26,21 +26,23 @@
 
   <include ref="./TDR_Dimensions_v01_01.xml"/>
 
-  <include ref="../CRD_common_v02/Beampipe_v01_06.xml"/>
+  <include ref="../CRD_common_v02/Beampipe_v01_07.xml"/>
   <!--preliminary vertex and tracker, to update/-->
   <!--include ref="../CRD_common_v02/VXD_StaggeredLadder_v02_01.xml"/-->
-  <include ref="../CRD_common_v02/VXD_Composite_v01_02.xml"/>
-  <include ref="../CRD_common_v02/FTD_SkewRing_v01_07.xml"/>
+  <include ref="../CRD_common_v02/VXD_Composite_v01_03.xml"/>
+  <!--include ref="../CRD_common_v02/FTD_SkewRing_v01_09.xml"/-->
   <!--include ref="../CRD_common_v02/SIT_SimplePixel_v01_04.xml"/-->
   <!--include ref="../CRD_common_v02/SIT_StaggeredStave_v02.xml"/-->
   <include ref="../CRD_common_v02/ITK_StaggeredStave_v03_01.xml"/>
+  <include ref="../CRD_common_v02/ITK_EndCap_v01.xml"/>
   <!--include ref="../CRD_common_v01/TPC_Simple_v10_02.xml"/-->
   <!-- use 10 rows clustering version-->
   <include ref="../CRD_common_v02/TPC_ModularEndcap_o1_v02.xml"/>
   <!--include ref="../CRD_common_v01/SET_SimplePixel_v01_01.xml"/-->
-  <include ref="../CRD_common_v01/OTKBarrel_v01_01.xml"/>
-
+  <!--include ref="../CRD_common_v01/OTKBarrel_v01_01.xml"/-->
+  <include ref="../CRD_common_v01/OTKBarrel_v02.xml"/>
   <!--include ref="../CRD_common_v01/OTKEndcap_v01_01.xml"/-->
+  <include ref="../CRD_common_v01/OTKEndcap_v02.xml"/>
 
   <fields>
     <field name="InnerSolenoid" type="solenoid"

Detector/DetCRD/compact/TDR_o1_v01/TDR_o1_v01.xml

@@ -27,20 +27,23 @@
 
   <include ref="./TDR_Dimensions_v01_01.xml"/>
 
-  <include ref="../CRD_common_v02/Beampipe_v01_06.xml"/>
+  <include ref="../CRD_common_v02/Beampipe_v01_07.xml"/>
   <!--preliminary vertex and tracker, to update/-->
   <!--include ref="../CRD_common_v02/VXD_StaggeredLadder_v02_01.xml"/-->
-  <include ref="../CRD_common_v02/VXD_Composite_v01_02.xml"/>
-  <include ref="../CRD_common_v02/FTD_SkewRing_v01_07.xml"/>
+  <include ref="../CRD_common_v02/VXD_Composite_v01_03.xml"/>
+  <!--include ref="../CRD_common_v02/FTD_SkewRing_v01_07.xml"/-->
   <!--include ref="../CRD_common_v02/SIT_SimplePixel_v01_04.xml"/-->
   <!--include ref="../CRD_common_v02/SIT_StaggeredStave_v02.xml"/-->
   <include ref="../CRD_common_v02/ITK_StaggeredStave_v03_01.xml"/>
+  <include ref="../CRD_common_v02/ITK_EndCap_v01.xml"/>
   <!--include ref="../CRD_common_v01/TPC_Simple_v10_02.xml"/-->
-  <!--use 10 rows clustering version/-->
+  <!-- use 10 rows clustering version-->
   <include ref="../CRD_common_v02/TPC_ModularEndcap_o1_v02.xml"/>
   <!--include ref="../CRD_common_v01/SET_SimplePixel_v01_01.xml"/-->
-  <include ref="../CRD_common_v01/OTKBarrel_v01_01.xml"/>
+  <!--include ref="../CRD_common_v01/OTKBarrel_v01_01.xml"/-->
+  <include ref="../CRD_common_v01/OTKBarrel_v02.xml"/>
   <!--include ref="../CRD_common_v01/OTKEndcap_v01_01.xml"/-->
+  <include ref="../CRD_common_v01/OTKEndcap_v02.xml"/>
 
   <include ref="../CRD_common_v01/Ecal_Crystal_Barrel_v02_02.xml"/>
   <include ref="../CRD_common_v01/Ecal_Crystal_Endcap_v02_01.xml"/>
@@ -59,6 +62,7 @@
   <include ref="../CRD_common_v01/Muon_Barrel_v01_04.xml"/>
   <include ref="../CRD_common_v01/Muon_Endcap_v01_02.xml"/>
   <include ref="../CRD_common_v01/ParaffinEndcap_v01_01.xml"/>
+  <!--include ref="../CRD_common_v01/ConcreteWall_v01_01.xml"/-->
  
   <fields>
     <field name="InnerSolenoid" type="solenoid"
@@ -68,13 +72,14 @@
            inner_radius="SolenoidCoil_center_radius"
            outer_radius="Solenoid_outer_radius">
     </field>
-    <field name="OuterSolenoid" type="solenoid"
+    <!-- remove anti magnetic field in order to extrapolate to muon detector more easily-->
+    <!--field name="OuterSolenoid" type="solenoid"
            inner_field="0"
            outer_field="Field_outer_nominal_value"
            zmax="SolenoidCoil_half_length"
            inner_radius="Solenoid_outer_radius"
            outer_radius="Yoke_barrel_inner_radius">
-    </field>
+    </field-->
   </fields>
 
 </lccdd>