Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • 1810337/CEPCSW
  • shexin/CEPCSW
  • dudejing/CEPCSW
  • yudian2002/cepcsw-otb-development
  • cepcsw/CEPCSW
  • cepc/CEPCSW
  • shixin/CEPCSW
  • lizhan/CEPCSW
  • 1365447033/CEPCSW
  • shihy/CEPCSW
  • sunwy/CEPCSW
  • guofangyi/cepcsw-release
  • lintao/CEPCSW
  • tanggy/CEPCSW
  • gongjd1119/CEPCSW
  • 221840222/CEPCSW
  • lihn/CEPCSW
  • thinking/CEPCSW
  • myliu/CEPCSW
  • shihy/cepcsw-dose
  • zhaog/CEPCSW
  • 201840277/CEPCSW
  • wangchu/CEPCSW
  • xiaolin.wang/CEPCSW
  • fucd/CEPCSW1
  • tyzhang/CEPCSW
  • yudian2002/cepcsw-ote-development
  • songwz/cepcsw-tdr
  • luhc/CEPCSW
  • tangyb/CEPCSW
  • dhb112358/CEPCSW
  • chenbp/CEPCSW
  • guolei/CEPCSW
  • yudian2002/cepcsw-otk-end-cap-development
  • jiangxj/CEPCSW
  • yudian2002/cepcsw-geo-upgrade
  • fangwx/CEPCSW
  • yudian2002/cepcsw-geo-upgrade-v-2
  • mengwq/CEPCSW
  • zhangxm/CEPCSW
  • chenye/CEPCSW
  • wuchonghao9612/CEPCSW
  • xuchj7/CEPCSW
  • yudian2002/cepcsw-otk-endcap-update-01
  • lizhihao/CEPCSW
  • laipz/CEPCSW
  • zhangkl/CEPCSW
  • lihp29/CEPCSW
  • shuxian/CEPCSW
  • zhangyz/CEPCSW
  • zhangjinxian/CEPCSW_20250110
  • glliu/CEPCSW
  • shuohan/CEPCSW
  • fucd/CEPCSW
  • starr136a/CEPCSW
  • yudian2002/CEPCSW
  • wanjw03/CEPCSW
  • zyjonah/CEPCSW
  • maxt/CEPCSW
  • wangshi/CEPCSW
60 results
Show changes
Hide whitespace changes
Inline Side-by-side
Showing
with 612 additions and 258 deletions
Detector/DetCEPCv4/compact/SEcal05_siw_Barrel.xml
View file @ 52b9e663
...@@ -23,23 +23,29 @@ ...@@ -23,23 +23,29 @@
<slice material = "G4_AIR" thickness = "Ecal_Alveolus_Air_Gap/2." vis="Invisible" /> <slice material = "G4_AIR" thickness = "Ecal_Alveolus_Air_Gap/2." vis="Invisible" />
<slice material = "G4_Al" thickness = "Ecal_Slab_shielding" vis="Invisible" /> <slice material = "G4_Al" thickness = "Ecal_Slab_shielding" vis="Invisible" />
<slice material = "G4_Cu" thickness = "Ecal_Slab_copper_thickness" vis="Invisible" /> <slice material = "G4_Cu" thickness = "Ecal_Slab_copper_thickness" vis="Invisible" />
<slice material = "G4_AIR" thickness = "Ecal_Slab_ASIC_thickness" vis="Invisible"/> <!--slice material = "G4_AIR" thickness = "Ecal_Slab_ASIC_thickness" vis="Invisible"/-->
<slice material = "PCB" thickness = "Ecal_Slab_PCB_thickness" vis="Invisible"/> <slice material = "PCB" thickness = "Ecal_Slab_PCB_thickness" vis="Invisible"/>
<!--slice material = "G4_AIR" thickness = "2e-9*mm" vis="Invisible" /-->
<slice material = "G4_AIR" thickness = "Ecal_Slab_glue_gap" vis="Invisible" /> <slice material = "G4_AIR" thickness = "Ecal_Slab_glue_gap" vis="Invisible" />
<!--slice material = "G4_AIR" thickness = "2e-9*mm" vis="Invisible" /-->
<slice material = "Si" thickness = "Ecal_Si_thickness" sensitive = "yes" vis="Invisible" /> <slice material = "Si" thickness = "Ecal_Si_thickness" sensitive = "yes" vis="Invisible" />
<!--slice material = "G4_AIR" thickness = "2e-9*mm" vis="Invisible" /--> <!--slice material = "G4_AIR" thickness = "2e-9*mm" vis="Invisible" /-->
<slice material = "GroundOrHVMix" thickness = "Ecal_Slab_ground_thickness" vis="Invisible" /> <slice material = "GroundOrHVMix" thickness = "Ecal_Slab_ground_thickness" vis="Invisible" />
<!--slice material = "G4_AIR" thickness = "1e-9*mm" vis="Invisible" /--> <!--slice material = "G4_AIR" thickness = "1e-9*mm" vis="Invisible" /-->
<slice material = "CarbonFiber" thickness = "Ecal_fiber_thickness_slabAbs" vis="Invisible" /> <!--slice material = "CarbonFiber" thickness = "Ecal_fiber_thickness_slabAbs" vis="Invisible" /-->
<slice material = "g10" thickness = "Ecal_fiber_thickness_slabAbs" vis="Invisible" />
<slice material = "G4_W" thickness = "Ecal_radiator_layers_set1_thickness" vis="BlueVis" radiator="yes"/> <slice material = "G4_W" thickness = "Ecal_radiator_layers_set1_thickness" vis="BlueVis" radiator="yes"/>
<slice material = "CarbonFiber" thickness = "Ecal_fiber_thickness_slabAbs" vis="Invisible" /> <!--slice material = "CarbonFiber" thickness = "Ecal_fiber_thickness_slabAbs" vis="Invisible" /-->
<slice material = "g10" thickness = "Ecal_fiber_thickness_slabAbs" vis="Invisible" />
<!--slice material = "G4_AIR" thickness = "1e-9*mm" vis="Invisible" /--> <!--slice material = "G4_AIR" thickness = "1e-9*mm" vis="Invisible" /-->
<slice material = "GroundOrHVMix" thickness = "Ecal_Slab_ground_thickness" vis="Invisible" /> <slice material = "GroundOrHVMix" thickness = "Ecal_Slab_ground_thickness" vis="Invisible" />
<!--slice material = "G4_AIR" thickness = "2e-9*mm" vis="Invisible" /--> <!--slice material = "G4_AIR" thickness = "2e-9*mm" vis="Invisible" /-->
<slice material = "Si" thickness = "Ecal_Si_thickness" sensitive = "yes" vis="Invisible" /> <slice material = "Si" thickness = "Ecal_Si_thickness" sensitive = "yes" vis="Invisible" />
<!--slice material = "G4_AIR" thickness = "2e-9*mm" vis="Invisible" /-->
<slice material = "G4_AIR" thickness = "Ecal_Slab_glue_gap" vis="Invisible" /> <slice material = "G4_AIR" thickness = "Ecal_Slab_glue_gap" vis="Invisible" />
<!--slice material = "G4_AIR" thickness = "2e-9*mm" vis="Invisible" /-->
<slice material = "PCB" thickness = "Ecal_Slab_PCB_thickness" vis="Invisible"/> <slice material = "PCB" thickness = "Ecal_Slab_PCB_thickness" vis="Invisible"/>
<slice material = "G4_AIR" thickness = "Ecal_Slab_ASIC_thickness" vis="Invisible"/> <!--slice material = "G4_AIR" thickness = "Ecal_Slab_ASIC_thickness" vis="Invisible"/-->
<slice material = "G4_Cu" thickness = "Ecal_Slab_copper_thickness" vis="Invisible" /> <slice material = "G4_Cu" thickness = "Ecal_Slab_copper_thickness" vis="Invisible" />
<slice material = "G4_Al" thickness = "Ecal_Slab_shielding" vis="Invisible" /> <slice material = "G4_Al" thickness = "Ecal_Slab_shielding" vis="Invisible" />
<slice material = "G4_AIR" thickness = "Ecal_Alveolus_Air_Gap/2." vis="Invisible" /> <slice material = "G4_AIR" thickness = "Ecal_Alveolus_Air_Gap/2." vis="Invisible" />
...@@ -49,23 +55,29 @@ ...@@ -49,23 +55,29 @@
<slice material = "G4_AIR" thickness = "Ecal_Alveolus_Air_Gap/2." vis="Invisible" /> <slice material = "G4_AIR" thickness = "Ecal_Alveolus_Air_Gap/2." vis="Invisible" />
<slice material = "G4_Al" thickness = "Ecal_Slab_shielding" vis="Invisible" /> <slice material = "G4_Al" thickness = "Ecal_Slab_shielding" vis="Invisible" />
<slice material = "G4_Cu" thickness = "Ecal_Slab_copper_thickness" vis="Invisible" /> <slice material = "G4_Cu" thickness = "Ecal_Slab_copper_thickness" vis="Invisible" />
<slice material = "G4_AIR" thickness = "Ecal_Slab_ASIC_thickness" vis="Invisible"/> <!--slice material = "G4_AIR" thickness = "Ecal_Slab_ASIC_thickness" vis="Invisible"/-->
<slice material = "PCB" thickness = "Ecal_Slab_PCB_thickness" vis="Invisible"/> <slice material = "PCB" thickness = "Ecal_Slab_PCB_thickness" vis="Invisible"/>
<!--slice material = "G4_AIR" thickness = "2e-9*mm" vis="Invisible" /-->
<slice material = "G4_AIR" thickness = "Ecal_Slab_glue_gap" vis="Invisible" /> <slice material = "G4_AIR" thickness = "Ecal_Slab_glue_gap" vis="Invisible" />
<!--slice material = "G4_AIR" thickness = "2e-9*mm" vis="Invisible" /-->
<slice material = "Si" thickness = "Ecal_Si_thickness" sensitive = "yes" vis="Invisible" /> <slice material = "Si" thickness = "Ecal_Si_thickness" sensitive = "yes" vis="Invisible" />
<!--slice material = "G4_AIR" thickness = "2e-9*mm" vis="Invisible" /--> <!--slice material = "G4_AIR" thickness = "2e-9*mm" vis="Invisible" /-->
<slice material = "GroundOrHVMix" thickness = "Ecal_Slab_ground_thickness" vis="Invisible" /> <slice material = "GroundOrHVMix" thickness = "Ecal_Slab_ground_thickness" vis="Invisible" />
<!--slice material = "G4_AIR" thickness = "1e-9*mm" vis="Invisible" /--> <!--slice material = "G4_AIR" thickness = "1e-9*mm" vis="Invisible" /-->
<slice material = "CarbonFiber" thickness = "Ecal_fiber_thickness_slabAbs" vis="Invisible" /> <!--slice material = "CarbonFiber" thickness = "Ecal_fiber_thickness_slabAbs" vis="Invisible" /-->
<slice material = "g10" thickness = "Ecal_fiber_thickness_slabAbs" vis="Invisible" />
<slice material = "G4_W" thickness = "Ecal_radiator_layers_set2_thickness" vis="BlueVis" radiator="yes"/> <slice material = "G4_W" thickness = "Ecal_radiator_layers_set2_thickness" vis="BlueVis" radiator="yes"/>
<slice material = "CarbonFiber" thickness = "Ecal_fiber_thickness_slabAbs" vis="Invisible" /> <!--slice material = "CarbonFiber" thickness = "Ecal_fiber_thickness_slabAbs" vis="Invisible" /-->
<slice material = "g10" thickness = "Ecal_fiber_thickness_slabAbs" vis="Invisible" />
<!--slice material = "G4_AIR" thickness = "1e-9*mm" vis="Invisible" /--> <!--slice material = "G4_AIR" thickness = "1e-9*mm" vis="Invisible" /-->
<slice material = "GroundOrHVMix" thickness = "Ecal_Slab_ground_thickness" vis="Invisible" /> <slice material = "GroundOrHVMix" thickness = "Ecal_Slab_ground_thickness" vis="Invisible" />
<!--slice material = "G4_AIR" thickness = "2e-9*mm" vis="Invisible" /--> <!--slice material = "G4_AIR" thickness = "2e-9*mm" vis="Invisible" /-->
<slice material = "Si" thickness = "Ecal_Si_thickness" sensitive = "yes" vis="Invisible" /> <slice material = "Si" thickness = "Ecal_Si_thickness" sensitive = "yes" vis="Invisible" />
<!--slice material = "G4_AIR" thickness = "2e-9*mm" vis="Invisible" /-->
<slice material = "G4_AIR" thickness = "Ecal_Slab_glue_gap" vis="Invisible" /> <slice material = "G4_AIR" thickness = "Ecal_Slab_glue_gap" vis="Invisible" />
<!--slice material = "G4_AIR" thickness = "2e-9*mm" vis="Invisible" /-->
<slice material = "PCB" thickness = "Ecal_Slab_PCB_thickness" vis="Invisible"/> <slice material = "PCB" thickness = "Ecal_Slab_PCB_thickness" vis="Invisible"/>
<slice material = "G4_AIR" thickness = "Ecal_Slab_ASIC_thickness" vis="Invisible"/> <!--slice material = "G4_AIR" thickness = "Ecal_Slab_ASIC_thickness" vis="Invisible"/-->
<slice material = "G4_Cu" thickness = "Ecal_Slab_copper_thickness" vis="Invisible" /> <slice material = "G4_Cu" thickness = "Ecal_Slab_copper_thickness" vis="Invisible" />
<slice material = "G4_Al" thickness = "Ecal_Slab_shielding" vis="Invisible" /> <slice material = "G4_Al" thickness = "Ecal_Slab_shielding" vis="Invisible" />
<slice material = "G4_AIR" thickness = "Ecal_Alveolus_Air_Gap/2." vis="Invisible" /> <slice material = "G4_AIR" thickness = "Ecal_Alveolus_Air_Gap/2." vis="Invisible" />
...@@ -76,7 +88,8 @@ ...@@ -76,7 +88,8 @@
<readouts> <readouts>
<readout name="EcalBarrelCollection"> <readout name="EcalBarrelCollection">
<segmentation type="MegatileLayerGridXY"/> <segmentation type="MegatileLayerGridXY" grid_size_x="10.1667*mm" grid_size_y="10.1667*mm"/>
<!--segmentation type="WaferGridXY" 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> <id>system:5,module:3,stave:4,tower:5,layer:6,wafer:6,cellX:32:-16,cellY:-16</id>
</readout> </readout>
</readouts> </readouts>
......
Detector/DetCEPCv4/compact/SEcal05_siw_ECRing.xml deleted 100644 → 0
View file @ c20de884
<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="Air">
<shape type="BooleanShape" operation="Subtraction" material="Air">
<shape type="Box" dx="EcalEndcapRing_outer_radius + env_safety" dy="EcalEndcapRing_outer_radius + env_safety"
dz="EcalEndcapRing_max_z + env_safety"/>
<shape type="Tube" rmin="0" rmax="EcalEndcapRing_inner_radius - env_safety" dz="2.0*EcalEndcapRing_max_z + env_safety"/>
<position x="0.5*(EcalEndcapRing_min_z + EcalEndcapRing_max_z)*tan(CepC_Main_Crossing_Angle/2)" y="0" z="0"/>
<!-- position x="0" y="0" z="0"/ -->
</shape>
<shape type="Box" dx="EcalEndcapRing_outer_radius + 1.5*env_safety" dy="EcalEndcapRing_outer_radius + 1.5*env_safety"
dz="EcalEndcapRing_min_z - env_safety"/>
</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 = "G4_AIR" thickness = "Ecal_Alveolus_Air_Gap/2." vis="Invisible" />
<slice material = "G4_Al" thickness = "Ecal_Slab_shielding" vis="Invisible" />
<slice material = "G4_Cu" thickness = "Ecal_Slab_copper_thickness" vis="Invisible" />
<slice material = "G4_AIR" thickness = "Ecal_Slab_ASIC_thickness" vis="Invisible"/>
<slice material = "PCB" thickness = "Ecal_Slab_PCB_thickness" vis="Invisible"/>
<slice material = "G4_AIR" thickness = "Ecal_Slab_glue_gap" vis="Invisible" />
<slice material = "Si" thickness = "Ecal_Si_thickness" sensitive = "yes" limits="cal_limits" vis="RedVis" />
<!--slice material = "G4_AIR" thickness = "2e-9*mm" vis="Invisible" /-->
<slice material = "GroundOrHVMix" thickness = "Ecal_Slab_ground_thickness" vis="Invisible" />
<!--slice material = "G4_AIR" thickness = "1e-9*mm" vis="Invisible" /-->
<slice material = "CarbonFiber" thickness = "Ecal_fiber_thickness_slabAbs" vis="Invisible" />
<slice material = "G4_W" thickness = "Ecal_radiator_layers_set1_thickness" vis="GreenVis" />
<slice material = "CarbonFiber" thickness = "Ecal_fiber_thickness_slabAbs" vis="Invisible" />
<!--slice material = "G4_AIR" thickness = "1e-9*mm" vis="Invisible" /-->
<slice material = "GroundOrHVMix" thickness = "Ecal_Slab_ground_thickness" vis="Invisible" />
<!--slice material = "G4_AIR" thickness = "2e-9*mm" vis="Invisible" /-->
<slice material = "Si" thickness = "Ecal_Si_thickness" sensitive = "yes" limits="cal_limits" vis="RedVis" />
<slice material = "G4_AIR" thickness = "Ecal_Slab_glue_gap" vis="Invisible" />
<slice material = "PCB" thickness = "Ecal_Slab_PCB_thickness" vis="Invisible"/>
<slice material = "G4_AIR" thickness = "Ecal_Slab_ASIC_thickness" vis="Invisible"/>
<slice material = "G4_Cu" thickness = "Ecal_Slab_copper_thickness" vis="Invisible" />
<slice material = "G4_Al" thickness = "Ecal_Slab_shielding" vis="Invisible" />
<slice material = "G4_AIR" thickness = "Ecal_Alveolus_Air_Gap/2." vis="Invisible" />
</layer>
<layer repeat="(Ecal_nlayers2+1)/2" vis="SeeThrough">
<slice material = "G4_AIR" thickness = "Ecal_Alveolus_Air_Gap/2." vis="Invisible" />
<slice material = "G4_Al" thickness = "Ecal_Slab_shielding" vis="Invisible" />
<slice material = "G4_Cu" thickness = "Ecal_Slab_copper_thickness" vis="Invisible" />
<slice material = "G4_AIR" thickness = "Ecal_Slab_ASIC_thickness" vis="Invisible"/>
<slice material = "PCB" thickness = "Ecal_Slab_PCB_thickness" vis="Invisible"/>
<slice material = "G4_AIR" thickness = "Ecal_Slab_glue_gap" vis="Invisible" />
<slice material = "Si" thickness = "Ecal_Si_thickness" sensitive = "yes" limits="cal_limits" vis="RedVis" />
<!--slice material = "G4_AIR" thickness = "2e-9*mm" vis="Invisible" /-->
<slice material = "GroundOrHVMix" thickness = "Ecal_Slab_ground_thickness" vis="Invisible" />
<!--slice material = "G4_AIR" thickness = "1e-9*mm" vis="Invisible" /-->
<slice material = "CarbonFiber" thickness = "Ecal_fiber_thickness_slabAbs" vis="Invisible" />
<slice material = "G4_W" thickness = "Ecal_radiator_layers_set2_thickness" vis="GreenVis" />
<slice material = "CarbonFiber" thickness = "Ecal_fiber_thickness_slabAbs" vis="Invisible" />
<!--slice material = "G4_AIR" thickness = "1e-9*mm" vis="Invisible" /-->
<slice material = "GroundOrHVMix" thickness = "Ecal_Slab_ground_thickness" vis="Invisible" />
<!--slice material = "G4_AIR" thickness = "2e-9*mm" vis="Invisible" /-->
<slice material = "Si" thickness = "Ecal_Si_thickness" sensitive = "yes" limits="cal_limits" vis="RedVis" />
<slice material = "G4_AIR" thickness = "Ecal_Slab_glue_gap" vis="Invisible" />
<slice material = "PCB" thickness = "Ecal_Slab_PCB_thickness" vis="Invisible"/>
<slice material = "G4_AIR" thickness = "Ecal_Slab_ASIC_thickness" vis="Invisible"/>
<slice material = "G4_Cu" thickness = "Ecal_Slab_copper_thickness" vis="Invisible" />
<slice material = "G4_Al" thickness = "Ecal_Slab_shielding" vis="Invisible" />
<slice material = "G4_AIR" thickness = "Ecal_Alveolus_Air_Gap/2." 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_ECRing_01.xml 0 → 100644
View file @ 52b9e663
<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="Air">
<shape type="BooleanShape" operation="Subtraction" material="Air">
<shape type="Box" dx="EcalEndcapRing_outer_radius + env_safety" dy="EcalEndcapRing_outer_radius + env_safety"
dz="EcalEndcapRing_max_z + env_safety"/>
<shape type="Tube" rmin="0" rmax="EcalEndcapRing_inner_radius - env_safety" 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="EcalEndcapRing_outer_radius + 1.5*env_safety" dy="EcalEndcapRing_outer_radius + 1.5*env_safety"
dz="EcalEndcapRing_min_z - env_safety"/>
</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"
offset_x="-0.5*Ecal_ECRing_Siplate_Size+0.5*Ecal_cells_size" offset_y="-0.5*Ecal_ECRing_Siplate_Size+0.5*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_ECRing_02.xml 0 → 100644
View file @ 52b9e663
<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
View file @ 52b9e663
...@@ -12,8 +12,8 @@ ...@@ -12,8 +12,8 @@
<shape type="PolyhedraRegular" numsides="EcalEndcap_symmetry" rmin="0" <shape type="PolyhedraRegular" numsides="EcalEndcap_symmetry" rmin="0"
rmax="EcalEndcap_outer_radius + 2.*env_safety" dz="2.0*EcalEndcap_min_z - env_safety"/> rmax="EcalEndcap_outer_radius + 2.*env_safety" dz="2.0*EcalEndcap_min_z - env_safety"/>
</shape> </shape>
<shape type="Box" dx="EcalEndcap_inner_radius - env_safety" <shape type="Box" dx="EcalEndcap_inner_radius"
dy="EcalEndcap_inner_radius - env_safety" dz="(EcalEndcap_max_z + env_safety )"/> dy="EcalEndcap_inner_radius" dz="(EcalEndcap_max_z + env_safety )"/>
<rotation x="0*deg" y="0*deg" z="-180*deg/EcalEndcap_symmetry"/> <rotation x="0*deg" y="0*deg" z="-180*deg/EcalEndcap_symmetry"/>
</shape> </shape>
<rotation x="0*deg" y="0*deg" z="180*deg/EcalEndcap_symmetry"/> <rotation x="0*deg" y="0*deg" z="180*deg/EcalEndcap_symmetry"/>
...@@ -27,16 +27,16 @@ ...@@ -27,16 +27,16 @@
<slice material = "G4_AIR" thickness = "Ecal_Alveolus_Air_Gap/2." vis="Invisible" /> <slice material = "G4_AIR" thickness = "Ecal_Alveolus_Air_Gap/2." vis="Invisible" />
<slice material = "G4_Al" thickness = "Ecal_Slab_shielding" vis="Invisible" /> <slice material = "G4_Al" thickness = "Ecal_Slab_shielding" vis="Invisible" />
<slice material = "G4_Cu" thickness = "Ecal_Slab_copper_thickness" vis="Invisible" /> <slice material = "G4_Cu" thickness = "Ecal_Slab_copper_thickness" vis="Invisible" />
<slice material = "G4_AIR" thickness = "Ecal_Slab_ASIC_thickness" vis="Invisible"/> <!--slice material = "G4_AIR" thickness = "Ecal_Slab_ASIC_thickness" vis="Invisible"/-->
<slice material = "PCB" thickness = "Ecal_Slab_PCB_thickness" vis="Invisible"/> <slice material = "PCB" thickness = "Ecal_Slab_PCB_thickness" vis="Invisible"/>
<slice material = "G4_AIR" thickness = "Ecal_Slab_glue_gap" vis="Invisible" /> <slice material = "G4_AIR" thickness = "Ecal_Slab_glue_gap" vis="Invisible" />
<slice material = "Si" thickness = "Ecal_Si_thickness" sensitive = "yes" vis="RedVis" /> <slice material = "Si" thickness = "Ecal_Si_thickness" sensitive = "yes" vis="RedVis" />
<!--slice material = "G4_AIR" thickness = "2e-9*mm" vis="Invisible" /--> <!--slice material = "G4_AIR" thickness = "2e-9*mm" vis="Invisible" /-->
<slice material = "GroundOrHVMix" thickness = "Ecal_Slab_ground_thickness" vis="Invisible" /> <slice material = "GroundOrHVMix" thickness = "Ecal_Slab_ground_thickness" vis="Invisible" />
<!--slice material = "G4_AIR" thickness = "1e-9*mm" vis="Invisible" /--> <!--slice material = "G4_AIR" thickness = "1e-9*mm" vis="Invisible" /-->
<slice material = "CarbonFiber" thickness = "Ecal_fiber_thickness_slabAbs" vis="Invisible" /> <slice material = "g10" thickness = "Ecal_fiber_thickness_slabAbs" vis="Invisible" />
<slice material = "G4_W" thickness = "Ecal_radiator_layers_set1_thickness" vis="BlueVis" /> <slice material = "G4_W" thickness = "Ecal_radiator_layers_set1_thickness" vis="BlueVis" />
<slice material = "CarbonFiber" thickness = "Ecal_fiber_thickness_slabAbs" vis="Invisible" /> <slice material = "g10" thickness = "Ecal_fiber_thickness_slabAbs" vis="Invisible" />
<!--slice material = "G4_AIR" thickness = "1e-9*mm" vis="Invisible" /--> <!--slice material = "G4_AIR" thickness = "1e-9*mm" vis="Invisible" /-->
<slice material = "GroundOrHVMix" thickness = "Ecal_Slab_ground_thickness" vis="Invisible" /> <slice material = "GroundOrHVMix" thickness = "Ecal_Slab_ground_thickness" vis="Invisible" />
<!--slice material = "G4_AIR" thickness = "2e-9*mm" vis="Invisible" /--> <!--slice material = "G4_AIR" thickness = "2e-9*mm" vis="Invisible" /-->
...@@ -53,16 +53,16 @@ ...@@ -53,16 +53,16 @@
<slice material = "G4_AIR" thickness = "Ecal_Alveolus_Air_Gap/2." vis="Invisible" /> <slice material = "G4_AIR" thickness = "Ecal_Alveolus_Air_Gap/2." vis="Invisible" />
<slice material = "G4_Al" thickness = "Ecal_Slab_shielding" vis="Invisible" /> <slice material = "G4_Al" thickness = "Ecal_Slab_shielding" vis="Invisible" />
<slice material = "G4_Cu" thickness = "Ecal_Slab_copper_thickness" vis="Invisible" /> <slice material = "G4_Cu" thickness = "Ecal_Slab_copper_thickness" vis="Invisible" />
<slice material = "G4_AIR" thickness = "Ecal_Slab_ASIC_thickness" vis="Invisible"/> <!--slice material = "G4_AIR" thickness = "Ecal_Slab_ASIC_thickness" vis="Invisible"/-->
<slice material = "PCB" thickness = "Ecal_Slab_PCB_thickness" vis="Invisible"/> <slice material = "PCB" thickness = "Ecal_Slab_PCB_thickness" vis="Invisible"/>
<slice material = "G4_AIR" thickness = "Ecal_Slab_glue_gap" vis="Invisible" /> <slice material = "G4_AIR" thickness = "Ecal_Slab_glue_gap" vis="Invisible" />
<slice material = "Si" thickness = "Ecal_Si_thickness" sensitive = "yes" vis="RedVis" /> <slice material = "Si" thickness = "Ecal_Si_thickness" sensitive = "yes" vis="RedVis" />
<!--slice material = "G4_AIR" thickness = "2e-9*mm" vis="Invisible" /--> <!--slice material = "G4_AIR" thickness = "2e-9*mm" vis="Invisible" /-->
<slice material = "GroundOrHVMix" thickness = "Ecal_Slab_ground_thickness" vis="Invisible" /> <slice material = "GroundOrHVMix" thickness = "Ecal_Slab_ground_thickness" vis="Invisible" />
<!--slice material = "G4_AIR" thickness = "1e-9*mm" vis="Invisible" /--> <!--slice material = "G4_AIR" thickness = "1e-9*mm" vis="Invisible" /-->
<slice material = "CarbonFiber" thickness = "Ecal_fiber_thickness_slabAbs" vis="Invisible" /> <slice material = "g10" thickness = "Ecal_fiber_thickness_slabAbs" vis="Invisible" />
<slice material = "G4_W" thickness = "Ecal_radiator_layers_set2_thickness" vis="BlueVis" /> <slice material = "G4_W" thickness = "Ecal_radiator_layers_set2_thickness" vis="BlueVis" />
<slice material = "CarbonFiber" thickness = "Ecal_fiber_thickness_slabAbs" vis="Invisible" /> <slice material = "g10" thickness = "Ecal_fiber_thickness_slabAbs" vis="Invisible" />
<!--slice material = "G4_AIR" thickness = "1e-9*mm" vis="Invisible" /--> <!--slice material = "G4_AIR" thickness = "1e-9*mm" vis="Invisible" /-->
<slice material = "GroundOrHVMix" thickness = "Ecal_Slab_ground_thickness" vis="Invisible" /> <slice material = "GroundOrHVMix" thickness = "Ecal_Slab_ground_thickness" vis="Invisible" />
<!--slice material = "G4_AIR" thickness = "2e-9*mm" vis="Invisible" /--> <!--slice material = "G4_AIR" thickness = "2e-9*mm" vis="Invisible" /-->
...@@ -80,8 +80,8 @@ ...@@ -80,8 +80,8 @@
<readouts> <readouts>
<readout name="EcalEndcapsCollection"> <readout name="EcalEndcapsCollection">
<segmentation type="MegatileLayerGridXY"/> <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,cellX:32:-16,cellY:-16</id> <id>system:5,module:3,stave:4,tower:5,layer:6,wafer:6,x:32:-16,y:-16</id>
</readout> </readout>
</readouts> </readouts>
......
Detector/DetCEPCv4/compact/SHcalRpc01_Barrel_01.xml 0 → 100644
View file @ 52b9e663
<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 0 → 100644
View file @ 52b9e663
<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 0 → 100644
View file @ 52b9e663
<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
View file @ 52b9e663
<!-- comment>Calorimeters</comment --> <!-- comment>Calorimeters</comment -->
<lccdd> <lccdd>
<detectors> <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"> <envelope vis="ILD_YOKEVis">
<shape type="BooleanShape" operation="Intersection" material="Air" > <shape type="BooleanShape" operation="Intersection" material="Air" >
<shape type="Box" dx="Yoke_outer_radius + env_safety" dy="Yoke_outer_radius + env_safety" <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-->
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="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"/> <rotation x="0*deg" y="0*deg" z="90*deg-180*deg/Yoke_symmetry"/>
</shape> </shape>
</envelope> </envelope>
...@@ -28,7 +26,7 @@ ...@@ -28,7 +26,7 @@
</detectors> </detectors>
<readouts> <readouts>
<readout name="YokeBarrelCollection"> <readout name="MuonBarrelCollection">
<segmentation type="CartesianGridXZ" grid_size_x="Yoke_cells_size" grid_size_z="Yoke_cells_size"/> <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> <id>system:5,module:3,stave:4,tower:3,layer:6,x:32:-16,z:-16</id>
</readout> </readout>
......
Detector/DetCEPCv4/compact/Yoke05_Endcaps.xml
View file @ 52b9e663
<!-- comment>Calorimeters</comment --> <!-- comment>Calorimeters</comment -->
<lccdd> <lccdd>
<detectors> <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"> <envelope vis="ILD_YOKEVis">
<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">
...@@ -16,7 +15,7 @@ ...@@ -16,7 +15,7 @@
<shape type="Box" dx="YokeEndcap_outer_radius + 1.5*env_safety" dy="YokeEndcap_outer_radius + 1.5*env_safety" <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"/> dz="YokeEndcapPlug_min_z - env_safety"/>
</shape> </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" /> 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"/> <rotation x="0*deg" y="0*deg" z="90*deg-180*deg/YokeEndcapPlug_symmetry"/>
</shape> </shape>
...@@ -24,7 +23,7 @@ ...@@ -24,7 +23,7 @@
<type_flags type=" DetType_CALORIMETER + DetType_ENDCAP + DetType_MUON " /> <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"/> <material name="Iron"/>
<layer repeat="12" vis="SeeThrough"> <layer repeat="12" vis="SeeThrough">
<slice material = "Air" thickness = "15.0*mm" vis="YellowVis" /> <slice material = "Air" thickness = "15.0*mm" vis="YellowVis" />
...@@ -35,7 +34,7 @@ ...@@ -35,7 +34,7 @@
</detectors> </detectors>
<readouts> <readouts>
<readout name="YokeEndcapsCollection"> <readout name="MuonEndcapsCollection">
<segmentation type="CartesianGridXY" grid_size_x="Yoke_cells_size" grid_size_y="Yoke_cells_size"/> <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> <id>system:5,module:3,stave:4,tower:3,layer:6,x:32:-16,y:-16</id>
</readout> </readout>
......
Detector/DetCEPCv4/compact/coil03.xml
View file @ 52b9e663
...@@ -2,29 +2,29 @@ ...@@ -2,29 +2,29 @@
Coil parameters for ILD_o1_v5 Coil parameters for ILD_o1_v5
--> -->
<lccdd> <lccdd>
<detectors> <detectors>
<detector name="Coil" type="SCoil02" vis="ILD_COILVis" id="ILDDetID_COIL" insideTrackingVolume="false" readout="COILCollection">
<detector name="Coil" type="SCoil02" vis="CoilVis" id="ILDDetID_COIL" insideTrackingVolume="false" sensitive="no">
<!-- fg: taken from SCoil02.cc::PreLoadScriptAction() : <!-- 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 - 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 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 -> now (03/2015) done in main compact file ILD_l1_v01.xml
--> -->
<envelope vis="SeeThrough">
<envelope vis="ILD_COILVis"> <shape type="Tube" rmin="Coil_inner_radius" rmax="Coil_outer_radius" dz="Coil_half_length" material="Air"/>
<shape type="Tube" rmin="Coil_inner_radius" rmax="Coil_outer_radius" </envelope>
dz="Coil_half_length" material="Air"/>
</envelope> <type_flags type=" DetType_SUPPORT + DetType_COIL " />
<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"/>
<!--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" </detector>
dz="Coil_half_length-env_safety" material="G4_Al"/> </detectors>
</detector> <readouts>
<readout name="COILCollection">
</detectors> <id>system:5,side:-2,layer:9,module:8,sensor:8,barrelside:-2</id>
</readout>
</readouts>
</lccdd> </lccdd>
Detector/DetCEPCv4/compact/ecal_defs.xml
View file @ 52b9e663
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<constant name="Ecal_Barrel_halfZ" value="TPC_Ecal_Hcal_barrel_halfZ"/> <constant name="Ecal_Barrel_halfZ" value="TPC_Ecal_Hcal_barrel_halfZ"/>
<constant name="Ecal_nlayers1" value="20"/> <constant name="Ecal_nlayers1" value="20"/>
<constant name="Ecal_nlayers2" value="10"/> <constant name="Ecal_nlayers2" value="9"/>
<constant name="Ecal_nlayers3" value="0"/> <constant name="Ecal_nlayers3" value="0"/>
<constant name="Ecal_radiator_layers_set1_thickness" value="2.1*mm"/> <constant name="Ecal_radiator_layers_set1_thickness" value="2.1*mm"/>
<constant name="Ecal_radiator_layers_set2_thickness" value="4.2*mm"/> <constant name="Ecal_radiator_layers_set2_thickness" value="4.2*mm"/>
...@@ -11,14 +11,20 @@ ...@@ -11,14 +11,20 @@
<constant name="Ecal_barrel_number_of_towers" value="5"/> <constant name="Ecal_barrel_number_of_towers" value="5"/>
<constant name="Ecal_fiber_thickness_structure" value="0.42*mm"/> <!-- 0.5*(3.82 - 2.1 - 2*0.44)= --> <!--constant name="Ecal_fiber_thickness_structure" value="0.42*mm"/--> <!-- 0.5*(3.82 - 2.1 - 2*0.44)= -->
<constant name="Ecal_fiber_thickness_alveolus" value="0.44*mm"/> <!-- 0.88 / 2 --> <constant name="Ecal_fiber_thickness_structure" value="0.3*mm"/>
<!--constant name="Ecal_fiber_thickness_alveolus" value="0.44*mm"/--> <!-- 0.88 / 2 -->
<constant name="Ecal_fiber_thickness_alveolus" value="0.45*mm"/>
<constant name="Ecal_fiber_thickness_slabAbs" value="0.15*mm"/> <constant name="Ecal_fiber_thickness_slabAbs" value="0.15*mm"/>
<constant name="Ecal_front_face_thickness" value="0.66*mm"/> <!-- 4.04 - 2.1 - 0.44 - 2*0.42 = 0.66 --> <!--constant name="Ecal_front_face_thickness" value="0.66*mm"/--> <!-- 4.04 - 2.1 - 0.44 - 2*0.42 = 0.66 -->
<constant name="Ecal_support_thickness" value="14.49*mm"/> <!-- 14.93 - 0.44 --> <constant name="Ecal_front_face_thickness" value="2.0*mm"/>
<!--constant name="Ecal_support_thickness" value="14.49*mm"/--> <!-- 14.93 - 0.44 -->
<constant name="Ecal_support_thickness" value="9.3*mm"/>
<constant name="Ecal_support_material" type="string" value="g10"/>
<constant name="Ecal_lateral_face_thickness" value="(1.10+0.5)*mm"/> <!-- 1.54 - 0.44 --> <!-- 0.5 for the 1mm tolerance between modules --> <!--constant name="Ecal_lateral_face_thickness" value="(1.10+0.5)*mm"/--> <!-- 1.54 - 0.44 --> <!-- 0.5 for the 1mm tolerance between modules -->
<constant name="Ecal_lateral_face_thickness" value="2.0*mm"/>
<constant name="Ecal_Alveolus_Air_Gap" value="0.5*mm"/> <constant name="Ecal_Alveolus_Air_Gap" value="0.5*mm"/>
<constant name="Ecal_Si_thickness" value=".5*mm"/> <constant name="Ecal_Si_thickness" value=".5*mm"/>
...@@ -34,24 +40,27 @@ ...@@ -34,24 +40,27 @@
<constant name="Ecal_n_wafers_per_tower" value="2"/> <constant name="Ecal_n_wafers_per_tower" value="2"/>
<constant name="Ecal_barrel_z_modules" value="5"/> <constant name="Ecal_barrel_z_modules" value="5"/>
<constant name="Ecal_Barrel_Preshower" value="0"/> <constant name="Ecal_Barrel_Preshower" value="1"/>
<constant name="Ecal_layer_pattern" type="string" value="0"/> <constant name="Ecal_layer_pattern" type="string" value="0"/>
<constant name="Ecal_end_of_slab_strategy" value="1"/> <constant name="Ecal_end_of_slab_strategy" value="1"/>
<constant name="Ecal_cells_across_megatile" value="18"/> <constant name="Ecal_cells_across_megatile" value="9"/>
<constant name="Ecal_strips_across_megatile" value="1"/> <constant name="Ecal_strips_across_megatile" value="1"/>
<constant name="Ecal_strips_along_megatile" value="1"/> <constant name="Ecal_strips_along_megatile" value="1"/>
<constant name="Ecal_Endcap_Preshower" value="0"/> <constant name="Ecal_Endcap_Preshower" value="1"/>
<!-- constant name="Ecal_cables_gap" value="100.*mm"/ --> <!-- constant name="Ecal_cables_gap" value="100.*mm"/ -->
<constant name="Ecal_cables_gap" value="Ecal_endcap_zmin-TPC_Ecal_Hcal_barrel_halfZ"/> <constant name="Ecal_cables_gap" value="Ecal_endcap_zmin-TPC_Ecal_Hcal_barrel_halfZ"/>
<constant name="Ecal_Slab_Plug_length" value="8*mm"/> <!--constant name="Ecal_Slab_Plug_length" value="8*mm"/-->
<constant name="Ecal_Slab_Plug_length" value="0*mm"/>
<!-- needed only for ecal ring driver... --> <!-- needed only for ecal ring driver... -->
<constant name="Ecal_cells_size" value="10.*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_reflector_thickness" value="0.057*mm"/>
<constant name="Ecal_Sc_thickness" value="2.0*mm"/> <constant name="Ecal_Sc_thickness" value="2.0*mm"/>
<constant name="Ecal_Slab_Sc_PCB_thickness" value="0.8*mm"/> <constant name="Ecal_Slab_Sc_PCB_thickness" value="0.8*mm"/>
<constant name="Ecal_ECRing_Crossing_Angle" value="0"/>
<constant name="Ecal_ECRing_structure_thickness" value="0.875*mm"/>
</define> </define>
Detector/DetCEPCv4/compact/envelope_defs.xml
View file @ 52b9e663
...@@ -34,9 +34,12 @@ ...@@ -34,9 +34,12 @@
<!-- a few defined parameters needed for envelopes --> <!-- a few defined parameters needed for envelopes -->
<constant name="TUBE_IPOuterTube_start_radius" value="TUBE_IPInnerBulge_end_innerradius"/> <constant name="TUBE_IPOuterTube_start_radius" value="TUBE_IPInnerBulge_end_innerradius"/>
<constant name="TUBE_IPOuterBulge_end_z" value="top_Lcal_z_begin - TUBE_Lcal_clearance"/> <!--constant name="TUBE_IPOuterBulge_end_z" value="top_Lcal_z_begin - TUBE_Lcal_clearance"/-->
<constant name="TUBE_IPOuterBulge_end_radius" value="Lcal_outer_radius-LumiCal_tubebulge_overshoot"/> <constant name="TUBE_IPOuterBulge_end_z" value="2364.5*mm"/>
<constant name="TUBE_IPInnerBulge_end_envradius" value="TUBE_IPInnerBulge_end_innerradius + TUBE_inner_maxthick"/> <!--constant name="TUBE_IPOuterBulge_end_radius" value="Lcal_outer_radius-LumiCal_tubebulge_overshoot"/-->
<constant name="TUBE_IPOuterBulge_end_radius" value="30*mm"/>
<!--constant name="TUBE_IPInnerBulge_end_envradius" value="TUBE_IPInnerBulge_end_innerradius + TUBE_inner_maxthick"/-->
<constant name="TUBE_IPInnerBulge_end_envradius" value="18.5*mm"/>
<constant name="TUBE_IPOuterTube_end_envradius" value="TUBE_IPInnerBulge_end_envradius"/> <constant name="TUBE_IPOuterTube_end_envradius" value="TUBE_IPInnerBulge_end_envradius"/>
<constant name="TUBE_IPOuterBulge_start_envradius" value="TUBE_IPInnerBulge_end_innerradius+TUBE_outer_maxthick"/> <constant name="TUBE_IPOuterBulge_start_envradius" value="TUBE_IPInnerBulge_end_innerradius+TUBE_outer_maxthick"/>
...@@ -47,12 +50,13 @@ ...@@ -47,12 +50,13 @@
<constant name="VXD_inner_radius" value="top_VXD_inner_radius"/> <constant name="VXD_inner_radius" value="top_VXD_inner_radius"/>
<constant name="VXD_outer_radius" value="top_VXD_outer_radius"/> <constant name="VXD_outer_radius" value="top_VXD_outer_radius"/>
<constant name="VXD_half_length" value="top_VXD_half_length"/> <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="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_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_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_inner_radius" value="SIT1_Radius - env_safety"/>
<constant name="SIT_outer_radius_1" value="SIT2_Radius - env_safety"/> <constant name="SIT_outer_radius_1" value="SIT2_Radius - env_safety"/>
...@@ -89,7 +93,8 @@ ...@@ -89,7 +93,8 @@
<constant name="Ecal_symmetry" value="Ecal_Hcal_symmetry"/> <constant name="Ecal_symmetry" value="Ecal_Hcal_symmetry"/>
<constant name="Hcal_inner_radius" value="Ecal_outer_radius+Hcal_Ecal_gap"/> <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_half_length" value="TPC_Ecal_Hcal_barrel_halfZ"/>
<constant name="Hcal_inner_symmetry" value="Ecal_Hcal_symmetry"/> <constant name="Hcal_inner_symmetry" value="Ecal_Hcal_symmetry"/>
...@@ -115,7 +120,8 @@ ...@@ -115,7 +120,8 @@
<constant name="Coil_outer_radius" value="Hcal_outer_radius+Hcal_Coil_additional_gap+Coil_thickness"/> <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="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_outer_radius" value="Yoke_inner_radius+top_Yoke_thickness"/>
<constant name="Yoke_half_length" value="top_Yoke_half_length"/> <constant name="Yoke_half_length" value="top_Yoke_half_length"/>
<constant name="Yoke_symmetry" value="top_Yoke_symmetry"/> <constant name="Yoke_symmetry" value="top_Yoke_symmetry"/>
......
Detector/DetCEPCv4/compact/ftd_cepc_01.xml 0 → 100644
View file @ 52b9e663
<!--
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">
<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" 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-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" rmin2="0" rmax2="FTD_cone_radius"
z="(FTD_half_length-FTD_cone_min_z)/2. + env_safety "/>
<position x="0" y="0" z="FTD_cone_min_z+(FTD_half_length-FTD_cone_min_z)/2."/>
</shape>
<shape type="Cone" rmin1="0" rmax1="FTD_inner_radius" rmin2="0" rmax2="FTD_cone_radius"
z="(FTD_half_length-FTD_cone_min_z)/2. + env_safety "/>
<position x="0" y="0" z="-FTD_cone_min_z-(FTD_half_length-FTD_cone_min_z)/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/ftd_cepc_02.xml 0 → 100644
View file @ 52b9e663
<!-- 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
View file @ 52b9e663
<define> <define>
<constant name="Hcal_radiator_thickness" value="20.0*mm"/> <constant name="Hcal_radiator_thickness" value="20.0*mm"/>
<constant name="Hcal_chamber_thickness" value="6.73*mm"/> <constant name="Hcal_airgap_thickness" value="1*mm"/>
<constant name="Hcal_back_plate_thickness" value="15*mm"/> <constant name="Hcal_mylar_cathode_thickness" value="0.18*mm"/>
<constant name="Hcal_lateral_structure_thickness" value="10*mm"/> <constant name="Hcal_graphite_cathode_thickness" value="0.05*mm"/>
<constant name="Hcal_stave_gaps" value="3*mm"/> <constant name="Hcal_glass_cathode_thickness" value="1.1*mm"/>
<constant name="Hcal_modules_gap" value="0.001*mm"/> <constant name="Hcal_sensitive_gas_gap" value="1.2*mm"/>
<constant name="Hcal_layer_air_gap" value="2*mm"/> <constant name="Hcal_glass_anode_thickness" value="0.7*mm"/>
<constant name="Hcal_middle_stave_gaps" value="10*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_nlayers" value="40"/>
<constant name="Hcal_fiber_gap" value="1.5*mm"/> <constant name="Hcal_endcap_nlayers" value="Hcal_nlayers"/>
<constant name="Hcal_Cu_thickness" value="0.1*mm"/> <constant name="Hcal_ring_nlayers" value="7"/>
<constant name="Hcal_PCB_thickness" value="0.7*mm"/>
<constant name="Hcal_scintillator_thickness" value="3.0*mm"/>
<constant name="Hcal_cells_size" value="10*mm"/> <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> </define>
Detector/DetCEPCv4/compact/materials.xml
View file @ 52b9e663
...@@ -548,5 +548,20 @@ ...@@ -548,5 +548,20 @@
<fraction n="0.194" ref="Cu" /> <fraction n="0.194" ref="Cu" />
</material> </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> </materials>
Detector/DetCEPCv4/compact/services_defs.xml
View file @ 52b9e663
...@@ -39,6 +39,7 @@ ...@@ -39,6 +39,7 @@
<constant name="SServices_FTD2_cone_thickness" value="0.040*mm"/> <constant name="SServices_FTD2_cone_thickness" value="0.040*mm"/>
<constant name="SServices_FTD3_cone_thickness" value="0.020*mm"/> <constant name="SServices_FTD3_cone_thickness" value="0.020*mm"/>
<constant name="SServices_FTD7_cables_thickness" value="0.85*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_cross_section_area" value="25.0*mm*mm"/>
<constant name="VXD_cable_inner1_radius" value="30.0*mm"/> <constant name="VXD_cable_inner1_radius" value="30.0*mm"/>
......
Detector/DetCEPCv4/compact/sit_simple_planar_sensors_01.xml 0 → 100644
View file @ 52b9e663
<!--
SIT parameters for ILD_o1_v5
-->
<lccdd>
<detectors>
<detector name="SIT" type="SIT_Simple_Planar" vis="ILD_SITVis" id="ILDDetID_SIT" readout="SITCollection" insideTrackingVolume="true">
<envelope vis="ILD_SITVis">
<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_outer_radius_1" rmax="SIT_outer_radius" dz="SIT_half_length" />
</shape>
</envelope>
<type_flags type="DetType_TRACKER + DetType_BARREL + DetType_STRIP "/>
<!-- database : sit_simple_planar_sensors_03 -->
<!-- SQL command: "select * from extended_reconstruction_parameters;" -->
<reconstruction strip_width="0.0125*mm" strip_length="92*mm" strip_pitch="0.05*mm" strip_angle="7*deg" />
<!-- SQL command: "select * from global;" -->
<global sensitive_thickness="0.2*mm" support_thickness="1*mm" sensor_length="92*mm"
sensitive_mat="G4_Si" support_mat="G4_C" sensitive_threshold_KeV="64*keV" />
<!-- SQL command: "select * from sit_layers;" -->
<layer layer_id="0" sensitive_radius="153*mm" n_sensors_per_ladder="8" n_ladders="10"
ladder_clearance="0.1*mm" faces_IP="1" is_SIT1="1" is_SIT2="0" />
<layer layer_id="1" sensitive_radius="155.5*mm" n_sensors_per_ladder="8" n_ladders="10"
ladder_clearance="0.1*mm" faces_IP="0" is_SIT1="0" is_SIT2="0" />
<layer layer_id="2" sensitive_radius="300*mm" n_sensors_per_ladder="14" n_ladders="19"
ladder_clearance="0.1*mm" faces_IP="1" is_SIT1="0" is_SIT2="1" />
<layer layer_id="3" sensitive_radius="302.5*mm" n_sensors_per_ladder="14" n_ladders="19"
ladder_clearance="0.1*mm" faces_IP="0" is_SIT1="0" is_SIT2="0" />
</detector>
</detectors>
<readouts>
<readout name="SITCollection">
<!-- 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>
</readout>
</readouts>
</lccdd>
Detector/DetCEPCv4/compact/top_defs.xml
View file @ 52b9e663
...@@ -10,11 +10,11 @@ ...@@ -10,11 +10,11 @@
<constant name="CepC_Main_Crossing_Angle" value="33*mrad"/> <constant name="CepC_Main_Crossing_Angle" value="33*mrad"/>
<!-- the field inside and outside the solenoid --> <!-- 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 --> <!-- 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_outer_radius" value="101*mm "/>
<constant name="top_VXD_half_length" value="200*mm "/> <constant name="top_VXD_half_length" value="200*mm "/>
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
<!-- SIT --> <!-- SIT -->
<constant name="SIT1_Half_Length_Z" value="368.00*mm"/> <constant name="SIT1_Half_Length_Z" value="368.00*mm"/>
<constant name="SIT1_Radius" value="153.00*mm"/> <constant name="SIT1_Radius" value="152.90*mm"/>
<constant name="SIT2_Half_Length_Z" value="644.00*mm"/> <constant name="SIT2_Half_Length_Z" value="644.00*mm"/>
<constant name="SIT2_Radius" value="299.90*mm"/> <constant name="SIT2_Radius" value="299.90*mm"/>
...@@ -44,7 +44,8 @@ ...@@ -44,7 +44,8 @@
<constant name="Ecal_Tpc_gap" value="35*mm"/> <constant name="Ecal_Tpc_gap" value="35*mm"/>
<constant name="Ecal_Hcal_symmetry" value="8"/> <constant name="Ecal_Hcal_symmetry" value="8"/>
<constant name="Ecal_barrel_thickness" value="196.96*mm"/> <!--constant name="Ecal_barrel_thickness" value="196.96*mm"/-->
<constant name="Ecal_barrel_thickness" value="185.*mm"/>
<constant name="Hcal_Ecal_gap" value="30*mm"/> <constant name="Hcal_Ecal_gap" value="30*mm"/>
...@@ -57,16 +58,17 @@ ...@@ -57,16 +58,17 @@
<constant name="Ecal_EC_Ring_gap" value="10*mm"/> <constant name="Ecal_EC_Ring_gap" value="10*mm"/>
<!-- HCAL --> <!-- 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_Coil_additional_gap" value="29.5*mm"/>
<!--constant name="Hcal_outer_symmetry" value="16"/--> <!--constant name="Hcal_outer_symmetry" value="16"/-->
<constant name="Hcal_outer_symmetry" value="8"/> <constant name="Hcal_outer_symmetry" value="8"/>
<constant name="Hcal_endcap_center_box_size" value="700.0*mm"/> <constant name="Hcal_endcap_center_box_size" value="700.0*mm"/>
<constant name="Hcal_endcap_zmin" value="2650*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_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 --> <!-- coil -->
<constant name="Coil_extra_size" value="1522*mm"/> <constant name="Coil_extra_size" value="1522*mm"/>
...@@ -79,8 +81,9 @@ ...@@ -79,8 +81,9 @@
<constant name="top_Yoke_inner_radius" value="4424.0*mm"/> <constant name="top_Yoke_inner_radius" value="4424.0*mm"/>
<constant name="top_Yoke_outer_radius" value="7725.0*mm"/> <constant name="top_Yoke_outer_radius" value="7725.0*mm"/>
--> -->
<constant name="top_Hcal_Yoke_gap" value="300*mm"/> <constant name="Coil_Yoke_radial_clearance" value="250*mm"/>
<constant name="top_Yoke_thickness" value="2550*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="top_Yoke_half_length" value="4047.0*mm"/>
<constant name="Yoke_Z_start_endcaps" value="4072.0*mm"/> <constant name="Yoke_Z_start_endcaps" value="4072.0*mm"/>
...@@ -90,7 +93,7 @@ ...@@ -90,7 +93,7 @@
<constant name="top_Lcal_inner_radius" value="30.0*mm"/> <constant name="top_Lcal_inner_radius" value="30.0*mm"/>
<constant name="Lcal_outer_radius" value="100.0*mm"/> <constant name="Lcal_outer_radius" value="100.0*mm"/>
<constant name="LumiCal_tubebulge_overshoot" value="11.2*mm"/> <constant name="LumiCal_tubebulge_overshoot" value="11.2*mm"/>
<constant name="top_Lcal_z_begin" value="Ecal_endcap_zmin" /> <constant name="top_Lcal_z_begin" value="951.9*mm" />
<!-- lhcal --> <!-- lhcal -->
<constant name="top_LHCal_thickness" value="480*mm"/> <constant name="top_LHCal_thickness" value="480*mm"/>
...@@ -112,20 +115,20 @@ ...@@ -112,20 +115,20 @@
<constant name="BCal_rOuter" value="140*mm"/> <constant name="BCal_rOuter" value="140*mm"/>
<!-- the beam tube --> <!-- the beam tube -->
<constant name="TUBE_IPInnerTube_end_z" value="500*mm"/> <constant name="TUBE_IPInnerTube_end_z" value="230*mm"/>
<constant name="TUBE_central_inner_radius" value="14*mm"/> <constant name="TUBE_central_inner_radius" value="14*mm"/>
<constant name="TUBE_central_thickness" value="0.5*mm"/> <constant name="TUBE_central_thickness" value="0.5*mm"/>
<constant name="TUBE_IPInnerBulge_end_z" value="700*mm"/> <constant name="TUBE_IPInnerBulge_end_z" value="970*mm"/>
<constant name="TUBE_IPInnerBulge_end_innerradius" value="17.5*mm"/> <constant name="TUBE_IPInnerBulge_end_innerradius" value="14*mm"/>
<constant name="TUBE_IPOuterTube_start_z" value="700*mm"/> <constant name="TUBE_IPOuterTube_start_z" value="500*mm"/>
<constant name="TUBE_IPOuterTube_end_z" value="700*mm"/> <constant name="TUBE_IPOuterTube_end_z" value="230*mm"/>
<constant name="TUBE_Lcal_clearance" value="20*mm"/> <constant name="TUBE_Lcal_clearance" value="20*mm"/>
<!-- space left for envelopes (counting from inner beampipe surface) --> <!-- space left for envelopes (counting from inner beampipe surface) -->
<constant name="TUBE_inner_maxthick" value="1.0*mm"/> <constant name="TUBE_inner_maxthick" value="1.0*mm"/>
<constant name="TUBE_outer_maxthick" value="3.0*mm"/> <constant name="TUBE_outer_maxthick" value="1.0*mm"/>
</define> </define>