Skip to content
Snippets Groups Projects
Commit 2b4a1546 authored by FU Chengdong's avatar FU Chengdong
Browse files

Merge branch 'geo-update' into 'master'

Geo: update to first ITK version

See merge request !93
parents 5be02832 5a8ae37c
No related branches found
No related tags found
1 merge request!93Geo: update to first ITK version
Pipeline #12724 passed with stages
in 12 minutes and 46 seconds
<lccdd>
<define>
<constant name="SiliconThickness" value="0.2*mm"/>
<constant name="SupportThickness" value="1.4925*mm"/> <!--equivalent from carbon fiber to carbon/-->
<constant name="ModuleZGap" value="2.0*mm"/>
<constant name="ModuleRPhiGap" value="-10*mm"/>
<constant name="FTDPetalNumber" value="16"/>
</define>
<detectors>
<detector id="DetID_FTD" name="FTD" type="SiTrackerSkewRing_v01" vis="FTDVis" readout="FTDCollection" insideTrackingVolume="true" reflect="true">
<envelope>
<shape type="Assembly"/>
</envelope>
<type_flags type="DetType_TRACKER + DetType_ENDCAP + DetType_PIXEL "/>
<reconstruction strip_width="0.05*mm" strip_length="92*mm" strip_pitch="0" strip_angle="0"/>
<layer id="0" z="SiTracker_endcap_z1" dz="0.5*ModuleZGap" inner_r="SiTracker_endcap_inner_radius1" outer_r="SiTracker_endcap_outer_radius1"
skew="0" phi0="0" gap="ModuleRPhiGap" is_pixel="true" nmodules="FTDPetalNumber" vis="SeeThrough">
<component material="G4_Si" thickness="SiliconThickness" vis="FTDSensitiveVis" sensitive="yes"/>
<component material="Carbon" thickness="SupportThickness" vis="FTDSupportVis"/>
</layer>
<layer id="1" z="SiTracker_endcap_z2" dz="0.5*ModuleZGap" inner_r="SiTracker_endcap_inner_radius2" outer_r="SiTracker_endcap_outer_radius2"
skew="0" phi0="0" gap="ModuleRPhiGap" is_pixel="true" nmodules="FTDPetalNumber" vis="SeeThrough">
<component material="G4_Si" thickness="SiliconThickness" vis="FTDSensitiveVis" sensitive="yes"/>
<component material="Carbon" thickness="SupportThickness" vis="FTDSupportVis"/>
</layer>
<layer id="2" z="SiTracker_endcap_z3" dz="0.5*ModuleZGap" inner_r="SiTracker_endcap_inner_radius3" outer_r="SiTracker_endcap_outer_radius3"
skew="0" phi0="0" gap="ModuleRPhiGap" is_pixel="true" nmodules="FTDPetalNumber" vis="SeeThrough">
<component material="G4_Si" thickness="SiliconThickness" vis="FTDSensitiveVis" sensitive="yes"/>
<component material="Carbon" thickness="SupportThickness" vis="FTDSupportVis"/>
</layer>
<layer id="3" z="SiTracker_endcap_z4" dz="0.5*ModuleZGap" inner_r="SiTracker_endcap_inner_radius4" outer_r="SiTracker_endcap_outer_radius4"
skew="0" phi0="0" gap="ModuleRPhiGap" is_pixel="true" nmodules="FTDPetalNumber" vis="SeeThrough">
<component material="G4_Si" thickness="SiliconThickness" vis="FTDSensitiveVis" sensitive="yes"/>
<component material="Carbon" thickness="SupportThickness" vis="FTDSupportVis"/>
</layer>
<layer id="4" z="SiTracker_endcap_z5" dz="0.5*ModuleZGap" inner_r="SiTracker_endcap_inner_radius5" outer_r="SiTracker_endcap_outer_radius5"
phi0="0" gap="ModuleRPhiGap" is_pixel="true" nmodules="FTDPetalNumber" vis="SeeThrough">
<component material="G4_Si" thickness="SiliconThickness" vis="FTDSensitiveVis" sensitive="yes"/>
<component material="Carbon" thickness="SupportThickness" vis="FTDSupportVis"/>
</layer>
</detector>
</detectors>
<readouts>
<readout name="FTDCollection">
<id>system:5,side:-2,layer:9,module:8,sensor:8</id>
</readout>
</readouts>
</lccdd>
<lccdd>
<define>
<constant name="SiliconThickness" value="0.3*mm"/>
<constant name="SupportThickness" value="1.4925*mm"/> <!--equivalent from carbon fiber to carbon/-->
<constant name="ModuleZGap" value="2.0*mm"/>
<constant name="ModuleRPhiGap" value="-10*mm"/>
<constant name="FTDPetalNumber" value="16"/>
</define>
<detectors>
<detector id="DetID_FTD" name="FTD" type="SiTrackerSkewRing_v01" vis="FTDVis" readout="FTDCollection" insideTrackingVolume="true" reflect="true">
<envelope>
<shape type="Assembly"/>
</envelope>
<type_flags type="DetType_TRACKER + DetType_ENDCAP + DetType_PIXEL "/>
<reconstruction strip_width="0.05*mm" strip_length="92*mm" strip_pitch="0" strip_angle="0"/>
<layer id="0" z="SiTracker_endcap_z1" dz="0.5*ModuleZGap" inner_r="SiTracker_endcap_inner_radius1" outer_r="SiTracker_endcap_outer_radius1"
skew="0" phi0="0" gap="ModuleRPhiGap" is_pixel="true" nmodules="FTDPetalNumber" vis="SeeThrough">
<component material="G4_Si" thickness="SiliconThickness" vis="FTDSensitiveVis" sensitive="yes"/>
<component material="Carbon" thickness="SupportThickness" vis="FTDSupportVis"/>
<component material="Carbon" thickness="SupportThickness" vis="FTDSupportVis"/>
<component material="G4_Si" thickness="SiliconThickness" vis="FTDSensitiveVis" sensitive="yes"/>
</layer>
<layer id="1" z="SiTracker_endcap_z2" dz="0.5*ModuleZGap" inner_r="SiTracker_endcap_inner_radius2" outer_r="SiTracker_endcap_outer_radius2"
skew="0" phi0="0" gap="ModuleRPhiGap" is_pixel="true" nmodules="FTDPetalNumber" vis="SeeThrough">
<component material="G4_Si" thickness="SiliconThickness" vis="FTDSensitiveVis" sensitive="yes"/>
<component material="Carbon" thickness="SupportThickness" vis="FTDSupportVis"/>
<component material="Carbon" thickness="SupportThickness" vis="FTDSupportVis"/>
<component material="G4_Si" thickness="SiliconThickness" vis="FTDSensitiveVis" sensitive="yes"/>
</layer>
<layer id="2" z="SiTracker_endcap_z3" dz="0.5*ModuleZGap" inner_r="SiTracker_endcap_inner_radius3" outer_r="SiTracker_endcap_outer_radius3"
skew="0" phi0="0" gap="ModuleRPhiGap" is_pixel="true" nmodules="FTDPetalNumber" vis="SeeThrough">
<component material="G4_Si" thickness="SiliconThickness" vis="FTDSensitiveVis" sensitive="yes"/>
<component material="Carbon" thickness="SupportThickness" vis="FTDSupportVis"/>
<component material="Carbon" thickness="SupportThickness" vis="FTDSupportVis"/>
<component material="G4_Si" thickness="SiliconThickness" vis="FTDSensitiveVis" sensitive="yes"/>
</layer>
<layer id="3" z="SiTracker_endcap_z4" dz="0.5*ModuleZGap" inner_r="SiTracker_endcap_inner_radius4" outer_r="SiTracker_endcap_outer_radius4"
skew="0" phi0="0" gap="ModuleRPhiGap" is_pixel="true" nmodules="FTDPetalNumber" vis="SeeThrough">
<component material="G4_Si" thickness="SiliconThickness" vis="FTDSensitiveVis" sensitive="yes"/>
<component material="Carbon" thickness="SupportThickness" vis="FTDSupportVis"/>
<component material="Carbon" thickness="SupportThickness" vis="FTDSupportVis"/>
<component material="G4_Si" thickness="SiliconThickness" vis="FTDSensitiveVis" sensitive="yes"/>
</layer>
<layer id="4" z="SiTracker_endcap_z5" dz="0.5*ModuleZGap" inner_r="SiTracker_endcap_inner_radius5" outer_r="SiTracker_endcap_outer_radius5"
phi0="0" gap="ModuleRPhiGap" is_pixel="true" nmodules="FTDPetalNumber" vis="SeeThrough">
<component material="G4_Si" thickness="SiliconThickness" vis="FTDSensitiveVis" sensitive="yes"/>
<component material="Carbon" thickness="SupportThickness" vis="FTDSupportVis"/>
</layer>
</detector>
</detectors>
<readouts>
<readout name="FTDCollection">
<id>system:5,side:-2,layer:9,module:8,sensor:8</id>
</readout>
</readouts>
</lccdd>
<lccdd>
<define>
<!--0.17mm silicon + 1.0mm carbon -> 0.65% of X0-->
<constant name="SIT_sensitive_thickness" value="0.17*mm"/>
<constant name="SIT_support_thickness" value="1*mm"/>
<constant name="SIT_sensor_length" value="143*mm"/>
<!--constant name="SIT_inner_radius" value="SIT1_inner_radius"/>
<constant name="SIT_inner_radius_1" value="SIT_inner_radius + env_safety"/>
<constant name="SIT_outer_radius_1" value="SIT_inner_radius_1/cos(pi/8)"/>
<constant name="SIT_inner_radius_2" value="SIT2_inner_radius"/>
<constant name="SIT_outer_radius" value="OuterTracker_inner_radius"/>
<constant name="SIT_half_length" value="SIT2_half_length"/>
<constant name="SIT_half_length_1" value="SIT1_half_length"/>
<constant name="SIT_layer_gap" value="2.5*mm"/-->
</define>
<detectors>
<detector id="DetID_SIT" name="SIT" type="SIT_Simple_Pixel" vis="SITVis" readout="SITCollection" insideTrackingVolume="true">
<envelope>
<shape type="Assembly"/>
<!--shape type="BooleanShape" operation="Union" material="Air" >
<shape type="Tube" rmin="SIT_inner_radius" rmax="SIT_outer_radius_1" dz="SIT_half_length_1" />
<shape type="Tube" rmin="SIT_inner_radius_2" rmax="SIT_outer_radius" dz="SIT_half_length" />
</shape-->
</envelope>
<type_flags type="DetType_TRACKER + DetType_BARREL + DetType_PIXEL "/>
<reconstruction strip_width="0." strip_length="0." strip_pitch="0." strip_angle="0*deg" />
<global sensitive_thickness="SIT_sensitive_thickness" support_thickness="SIT_support_thickness" sensor_length="SIT_sensor_length"
sensitive_mat="G4_Si" support_mat="G4_C" sensitive_threshold_KeV="64*keV" />
<display ladder="SeeThrough" support="SITSupportVis" sens_env="SeeThrough" sens="SITSensitiveVis" />
<layer layer_id="0" sensitive_radius="SIT1_inner_radius+0.5*SIT_sensitive_thickness" n_sensors_per_ladder="SIT1_half_length*2/SIT_sensor_length"
n_ladders="40" ladder_clearance="0.1*mm" faces_IP="1" is_SIT1="1" is_SIT2="0" />
<layer layer_id="1" sensitive_radius="SIT2_inner_radius+0.5*SIT_sensitive_thickness" n_sensors_per_ladder="SIT2_half_length*2/SIT_sensor_length"
n_ladders="116" ladder_clearance="0.1*mm" faces_IP="1" is_SIT1="0" is_SIT2="1" />
<layer layer_id="2" sensitive_radius="SIT3_inner_radius+0.5*SIT_sensitive_thickness" n_sensors_per_ladder="SIT3_half_length*2/SIT_sensor_length"
n_ladders="192" ladder_clearance="0.1*mm" faces_IP="1" is_SIT1="0" is_SIT2="0" />
</detector>
</detectors>
<readouts>
<readout name="SITCollection">
<id>system:5,side:-2,layer:9,module:8,sensor:8,barrelside:-2</id>
</readout>
</readouts>
</lccdd>
......@@ -95,7 +95,7 @@
<constant name="Vertex_inner_radius" value="BeamPipe_Central_inner_radius+BeamPipe_Be_total_thickness"/>
<constant name="Vertex_outer_radius" value="72.5*mm"/>
<constant name="Vertex_half_length" value="750*mm"/>
<constant name="Vertex_half_length" value="510*mm"/>
<!--constant name="BeamPipe_VertexRegion_rmax" value="BeamPipe_Central_inner_radius+BeamPipe_Al_thickness
+(BeamPipe_FirstExpand_width/2-BeamPipe_Central_inner_radius)/(BeamPipe_ExpandAl_zmax-BeamPipe_CentralAl_zmax)*(Vertex_half_length-BeamPipe_CentralAl_zmax)"/-->
......@@ -108,14 +108,6 @@
<constant name="TPC_half_length" value="2900*mm"/>
<constant name="OuterTracker_half_length" value="TPC_half_length"/>
<!--constant name="SIT1_inner_radius" value="150*mm"/>
<constant name="SIT2_inner_radius" value="250*mm"/>
<constant name="SIT3_inner_radius" value="500*mm"/>
<constant name="SIT1_half_length" value="243*mm"/>
<constant name="SIT2_half_length" value="405*mm"/>
<constant name="SIT3_half_length" value="810*mm"/-->
<!-- <constant name="SIT_sensor_length" value="81*mm"/> <!-\-There should be something call for this!!!-\-> -->
<constant name="SIT1_inner_radius" value="240*mm"/>
<constant name="SIT2_inner_radius" value="350*mm"/>
<constant name="SIT3_inner_radius" value="(600-30)*mm"/>
......@@ -134,34 +126,26 @@
<constant name="SET_inner_radius" value="1800*mm"/>
<constant name="SiTracker_region1_costheta" value="0.85"/>
<constant name="SiTracker_region2_costheta" value="0.9"/>
<constant name="SiTracker_region3_costheta" value="0.95"/>
<constant name="SiTracker_endcap_barrel_zgap" value="5*mm"/>
<constant name="SiTracker_endcap_barrel_rgap" value="10*mm"/>
<constant name="SiTracker_endcap_gas_zgap" value="3*mm"/>
<constant name="SiTracker_endcap_gas_rgap" value="20*mm"/>
<!--constant name="SiTracker_endcap_z1" value="Vertex_half_length"/>
<constant name="SiTracker_endcap_z2" value="SIT3_half_length+SiTracker_endcap_barrel_zgap"/>
<constant name="SiTracker_endcap_z3" value="TPC_inner_radius/tan(acos(SiTracker_region2_costheta))"/>
<constant name="SiTracker_endcap_z4" value="TPC_inner_radius/tan(acos(SiTracker_region3_costheta))"/>
<constant name="SiTracker_endcap_z5" value="TPC_half_length+SiTracker_endcap_gas_zgap"/>
<constant name="SiTracker_endcap_outer_radius1" value="SiTracker_endcap_z1*tan(acos(SiTracker_region1_costheta))"/>
<constant name="SiTracker_endcap_outer_radius2" value="SIT3_inner_radius"/>
<constant name="SiTracker_endcap_outer_radius3" value="TPC_inner_radius-SiTracker_endcap_gas_rgap"/>
<constant name="SiTracker_endcap_outer_radius4" value="TPC_inner_radius-SiTracker_endcap_gas_rgap"/>
<constant name="SiTracker_endcap_outer_radius5" value="TPC_outer_radius+SiTracker_endcap_barrel_rgap"/-->
<constant name="SiTracker_endcap_z1" value="500.5*mm"/>
<constant name="SiTracker_endcap_z2" value="715*mm"/>
<constant name="SiTracker_endcap_z3" value="1001*mm"/>
<constant name="SiTracker_endcap_z1" value="SIT1_half_length+SiTracker_endcap_barrel_zgap"/>
<constant name="SiTracker_endcap_z2" value="SIT2_half_length+SiTracker_endcap_barrel_zgap"/>
<constant name="SiTracker_endcap_z3" value="SIT3_half_length+SiTracker_endcap_barrel_zgap"/>
<constant name="SiTracker_endcap_z4" value="1500*mm"/>
<constant name="SiTracker_endcap_z5" value="TPC_half_length+SiTracker_endcap_gas_zgap"/>
<constant name="SiTracker_endcap_outer_radius1" value="240*mm"/>
<constant name="SiTracker_endcap_outer_radius2" value="350*mm"/>
<constant name="SiTracker_endcap_outer_radius3" value="(600-30.0)*mm"/>
<constant name="SiTracker_endcap_outer_radius4" value="(600)*mm"/>
<constant name="SiTracker_endcap_outer_radius1" value="SIT1_inner_radius"/>
<constant name="SiTracker_endcap_outer_radius2" value="SIT2_inner_radius"/>
<constant name="SiTracker_endcap_outer_radius3" value="SIT3_inner_radius-SiTracker_endcap_gas_rgap"/>
<constant name="SiTracker_endcap_outer_radius4" value="SIT3_inner_radius-SiTracker_endcap_gas_rgap"/>
<constant name="SiTracker_endcap_outer_radius5" value="TPC_outer_radius+SiTracker_endcap_barrel_rgap"/>
<constant name="SiTracker_endcap_inner_radius1" value="75*mm"/>
<constant name="SiTracker_endcap_inner_radius2" value="101.9*mm"/>
<constant name="SiTracker_endcap_inner_radius3" value="142.6*mm"/>
<constant name="SiTracker_endcap_inner_radius4" value="214*mm"/>
<constant name="SiTracker_endcap_inner_radius5" value="350*mm"/>
<!--obseleted constance, used by old construct, should be removed while creating new constrcut-->
<constant name="TPC_Ecal_Hcal_barrel_halfZ" value="TPC_half_length"/>
......@@ -172,7 +156,7 @@
<constant name="Ecal_barrel_symmetry" value="32"/>
<constant name="Ecal_Tpc_gap" value="Ecal_barrel_inner_radius-TPC_outer_radius"/>
<constant name="Ecal_endcap_inner_radius" value="400*mm"/>
<constant name="Ecal_endcap_inner_radius" value="350*mm"/>
<constant name="Ecal_endcap_outer_radius" value="Ecal_barrel_outer_radius"/>
<constant name="Ecal_endcap_zmin" value="2930*mm"/>
<constant name="Ecal_endcap_thickness" value="Ecal_barrel_thickness"/>
......@@ -329,7 +313,7 @@
<limit name="step_length_max" particles="*" value="5.0" unit="mm" />
</limitset>
<limitset name="detail_limits">
<limit name="step_length_max" particles="*" value="1.0" unit="mm" />
<limit name="step_length_max" particles="*" value="0.005" unit="mm" />
</limitset>
<limitset name="support_limits">
<limit name="step_length_max" particles="*" value="10.0" unit="mm" />
......
......@@ -30,10 +30,8 @@
<include ref="../CRD_common_v02/Beampipe_v01_03.xml"/>
<!--preliminary vertex and tracker, to update/-->
<include ref="../CRD_common_v02/VXD_StaggeredLadder_v02_01.xml"/>
<include ref="../CRD_common_v02/FTD_SkewRing_v01_06.xml"/>
<include ref="../CRD_common_v02/SIT_StaggeredStave_v02.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_v02/FTD_SkewRing_v01_07.xml"/>
<include ref="../CRD_common_v02/SIT_SimplePixel_v01_04.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"/>
......
<?xml version="1.0" encoding="UTF-8"?>
<lccdd xmlns:compact="http://www.lcsim.org/schemas/compact/1.0"
xmlns:xs="http://www.w3.org/2001/XMLSchema"
xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/compact/1.0/compact.xsd">
<info name="TDR_o1_v01"
title="CepC reference detctor for TDR"
author=""
url="http://cepc.ihep.ac.cn"
status="developing"
version="v01">
<comment>CepC reference detector simulation models used for TDR </comment>
</info>
<includes>
<gdmlFile ref="${DD4hepINSTALL}/DDDetectors/compact/elements.xml"/>
<gdmlFile ref="../CRD_common_v02/materials.xml"/>
</includes>
<define>
<constant name="world_size" value="10*m"/>
<constant name="world_x" value="world_size"/>
<constant name="world_y" value="world_size"/>
<constant name="world_z" value="world_size"/>
<include ref="${DD4hepINSTALL}/DDDetectors/compact/detector_types.xml"/>
</define>
<include ref="./TDR_Dimensions_v01_01.xml"/>
<!--TODO: vertex cooling-->
<include ref="../CRD_common_v02/Beampipe_v01_03.xml"/>
<!--preliminary vertex and tracker, to update/-->
<include ref="../CRD_common_v02/VXD_StaggeredLadder_v02_01.xml"/>
<include ref="../CRD_common_v02/FTD_SkewRing_v01_08.xml"/>
<include ref="../CRD_common_v02/SIT_SimplePixel_v01_04.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/Ecal_Crystal_Barrel_v01_02.xml"/>
<!--preliminary EcalEndcaps/-->
<include ref="../CRD_common_v02/EcalEndcaps_Polyhedra_v01_01.xml"/>
<include ref="../CRD_common_v01/SHcalGlass_Barrel_v05.xml"/>
<!--preliminary HcalEndcaps/-->
<include ref="../CRD_common_v02/HcalEndcaps_Polyhedra_v01_01.xml"/>
<!--Lumical to update-->
<include ref="../CRD_common_v01/Lumical_o1_v01.xml"/>
<!--preliminary Magnet, to update/-->
<include ref="../CRD_common_v02/Coil_Simple_v01_02.xml"/>
<!--preliminary Muon, obselete/-->
<!--include ref="../CRD_common_v02/Yoke_Polyhedra_Barrel_v01_01.xml"/>
<include ref="../CRD_common_v02/Yoke_Polyhedra_Endcaps_v01_01.xml"/-->
<!--muon detector-->
<include ref="../CRD_common_v01/Muon_Barrel_v01_01.xml"/>
<include ref="../CRD_common_v01/Muon_Endcap_v01_01.xml"/>
<fields>
<field name="InnerSolenoid" type="solenoid"
inner_field="Field_nominal_value"
outer_field="0"
zmax="SolenoidCoil_half_length"
inner_radius="SolenoidCoil_center_radius"
outer_radius="Solenoid_outer_radius">
</field>
<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>
</fields>
</lccdd>
......@@ -31,9 +31,8 @@
<include ref="../CRD_common_v02/Beampipe_v01_03.xml"/>
<!--preliminary vertex and tracker, to update/-->
<include ref="../CRD_common_v02/VXD_StaggeredLadder_v02_01.xml"/>
<include ref="../CRD_common_v02/FTD_SkewRing_v01_05.xml"/>
<!-- <include ref="../CRD_common_v02/SIT_StaggeredStave_v02.xml"/> -->
<include ref="../CRD_common_v02/SIT_SimplePixel_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_v01/TPC_Simple_v10_02.xml"/-->
<!--use 10 rows clustering version/-->
<include ref="../CRD_common_v02/TPC_ModularEndcap_o1_v02.xml"/>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment