Skip to content

Commit

Permalink
Merge branch 'key4hep:main' into ILD4FCCmodels
Browse files Browse the repository at this point in the history
  • Loading branch information
@danieljeans
danieljeans committed Sep 20, 2024
2 parents 54e368d + 72c9480 commit a43d17e
Show file tree
Hide file tree
Showing 23 changed files with 3,985 additions and 897 deletions.
5 changes: 3 additions & 2 deletions FCCee/ALLEGRO/compact/ALLEGRO_o1_v03/ALLEGRO_o1_v03.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,9 @@
<!-- <include ref="../../../MDI/compact/MDI_o1_v01/BeamInstrumentation_o1_v01.xml"/> -->

<include ref="LumiCal.xml"/>
<include ref="Vertex_IDEA_o1_v01.xml"/> <!-- symbolic link to ../../../IDEA/compact/IDEA_o1_v03/Vertex_IDEA_o1_v01.xml"/>-->
<include ref="DriftChamber_o1_v02.xml"/> <!-- symbolic link to ../../../IDEA/compact/IDEA_o1_v03/DriftChamber_o1_v02.xml -->
<include ref="VertexComplete_IDEA_o1_v03.xml"/> <!-- symbolic link to ../../../IDEA/compact/IDEA_o1_v03/VertexComplete_IDEA_o1_v03.xml -->
<include ref="DriftChamber_o1_v02.xml"/> <!-- symbolic link to ../../../IDEA/compact/IDEA_o1_v03/DriftChamber_o1_v02.xml -->
<include ref="SiliconWrapper_o1_v03.xml"/> <!-- symbolic link to ../../../IDEA/compact/IDEA_o1_v03/SiliconWrapper_o1_v03.xml -->
<include ref="ECalBarrel_thetamodulemerged.xml"/> <!-- if you remove the ECalBarrel, you also have to remove or update the "GlobalSolenoid" field (it depends on ECAL dimensions) -->
<include ref="HCalBarrel_TileCal_v02.xml"/>
<include ref="ECalEndcaps_Turbine.xml"/>
Expand Down
105 changes: 65 additions & 40 deletions FCCee/ALLEGRO/compact/ALLEGRO_o1_v03/DectDimensions.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,36 +18,38 @@
<constant name="world_side" value="6100*mm"/>
<constant name="CrossingAngle" value="0.030*rad"/>

<constant name="GlobalTrackerReadoutID" type="string" value="system:5,layer:3,stave:6,module:5,sensor:2"/>
<constant name="GlobalTrackerReadoutID_OB" type="string" value="system:5,layer:1,stave:6,module:4,sensor:2"/>
<constant name="GlobalTrackerReadoutID_Disk" type="string" value="system:5,side:-2,layer:3,petal:3,stave:6,module:10,sensor:2"/>
<constant name="GlobalTrackerReadoutID_SiWrapperB" type="string" value="system:5,layer:1,stave:9,module:6,sensor:1"/>
<constant name="GlobalTrackerReadoutID_SiWrapperD" type="string" value="system:5,side:1,layer:1,module:6,sensor:1"/>
<constant name="GlobalTrackerReadoutID" type="string" value="system:5,side:-2,layer:3,module:16,sensor:6"/>

<constant name="SolenoidField" value="2*tesla"/>

<constant name="DetID_NOTUSED" value=" 0"/>
<constant name="DetID_VXD_IB" value=" 1"/>
<constant name="DetID_VXD_Disks" value=" 2"/>
<constant name="DetID_VXD_OB" value=" 20"/>
<constant name="DetID_DCH" value=" 3"/>
<constant name="DetID_ECAL_Barrel" value=" 4"/>
<constant name="DetID_ECAL_Endcap" value=" 5"/>
<!-- Detector IDs -->
<constant name="DetID_NOTUSED" value=" 0"/>

<constant name="DetID_VXD_Barrel" value=" 1"/>
<constant name="DetID_VXD_Disks" value=" 2"/>

<constant name="DetID_DCH" value=" 3"/>

<constant name="DetID_SiWr_Barrel" value=" 23"/>
<constant name="DetID_SiWr_Disks" value=" 24"/>

<constant name="DetID_ECAL_Barrel" value=" 4"/>
<constant name="DetID_ECAL_Endcap" value=" 5"/>

<constant name="DetID_HCAL_Barrel" value=" 8"/>
<constant name="DetID_HCAL_Endcap" value=" 9"/>
<constant name="DetID_HCAL_Barrel" value=" 8"/>
<constant name="DetID_HCAL_Endcap" value=" 9"/>

<constant name="DetID_Muon_Barrel" value=" 12"/>
<constant name="DetID_Muon_Endcap_1" value=" 13"/>
<constant name="DetID_Muon_Endcap_2" value=" 14"/>

<constant name="DetID_LumiCal" value=" 15"/>
<constant name="DetID_LumiCalInstrumentation" value=" 16"/>
<constant name="DetID_LumiCalCooling" value=" 17"/>
<constant name="DetID_LumiCalBackShield" value=" 18"/>
<constant name="DetID_HOMAbsorber" value=" 19"/>
<constant name="DetID_LumiCalNoseShield" value=" 22"/>
<constant name="DetID_Muon_Barrel" value=" 12"/>
<constant name="DetID_Muon_Endcap_1" value=" 13"/>
<constant name="DetID_Muon_Endcap_2" value=" 14"/>

<constant name="DetID_LumiCal" value=" 15"/>
<constant name="DetID_LumiCalInstrumentation" value=" 16"/>
<constant name="DetID_LumiCalCooling" value=" 17"/>
<constant name="DetID_LumiCalBackShield" value=" 18"/>
<constant name="DetID_HOMAbsorber" value=" 19"/>
<constant name="DetID_LumiCalNoseShield" value=" 22"/>

<!-- BPW: Beam Pipe Width -->
<constant name="BPWWall" value="0.35*mm" />
<constant name="BPWCool" value="1.0*mm" />
Expand Down Expand Up @@ -79,14 +81,29 @@

<constant name="env_safety" value="0.1*mm"/>

<!-- VTX parameters -->
<constant name="VertexClearanceTheta" value="0.110"/> <!-- Clearance of vertex detector in mrad-->
<constant name="VTXIB_r_clearance" value="1*mm"/> <!-- Clearance of vertex detector in radius, used for definiton of vertex DD4hep_SubdetectorAssembly -->
<constant name="VTXIB_r_min" value="13.7*mm"/> <!-- Start of inner vertex detector layers. To keep distance of 1.3 mm from outer beam pipe end (10+0.35+1+0.35 mm = 11.7 mm). This changes to 13.7 mm due to cooling issues (see https://indico.cern.ch/event/1176398/contributions/5207171/attachments/2581129/4451907/Krakow%202023_v23_final.pdf) -->
<constant name="VTXIB_r_max" value="31*mm"/> <!-- End of inner vertex detector layers (the ones with smaller pixels) -->
<constant name="VTXOB_r_min" value="320*mm"/> <!-- Start of outer vertex layers (the ones with larger pixels) -->
<constant name="VTXOB_r_max" value="340*mm"/> <!-- End of outer vertex layer (the one with larger pixels) -->
<constant name="Outer_Vertex_half_length" value="1050*mm"/>
<!-- Vertex detector. Changing the values here it not enough to resize the detector, contact expert (Armin Ilg) -->
<constant name="VertexClearanceTheta" value="0.1035*rad"/> <!-- Clearance of vertex detector in mrad from IP. !!!Too high currently, should be 110 mrad -> Need to adapt vertex disks!!! -->
<constant name="VTXIB_r_min_clearance" value="1.0*mm"/> <!-- Clearance of vertex detector in radius, used for definiton of vertex DD4hep_SubdetectorAssembly -->
<constant name="VTXIB_r_min_layer" value="13.7*mm"/> <!-- Start of inner vertex detector layers. To keep distance of 1.3 mm from outer beam pipe end (10+0.35+1+0.35 mm = 11.7 mm). This changes to 13.7 mm due to cooling issues (see https://indico.cern.ch/event/1176398/contributions/5207171/attachments/2581129/4451907/Krakow%202023_v23_final.pdf) -->
<constant name="VTXIB_r_max_layer" value="34.0*mm"/> <!-- Position of the outermost vertex inner barrel layer -->
<constant name="VTXIB_r_max" value="50.0*mm"/> <!-- End of inner vertex = outer radius of inner vertex tube -->
<constant name="VTXIB_half_length" value="556.2/2.*mm"/> <!-- 278.1*mm, half length of inner vertex tube -->

<constant name="VTXOB_r_min_layer" value="140*mm"/> <!-- R of the innermost layer of the outer vertex -->
<constant name="VTXOB_r_min_clearance" value="15.0*mm"/> <!-- Clearance of vertex detector in radius, used for definiton of vertex DD4hep_SubdetectorAssembly -->
<constant name="VTXOB_r_max_layer" value="315*mm"/> <!-- R of the outermost layer of the outer vertex -->
<constant name="VTXOB_rmax_clearance" value="15.0*mm"/> <!-- Clearance of vertex detector in radius, used for definiton of vertex DD4hep_SubdetectorAssembly -->

<constant name="VTXD_z_min" value="279.06*mm"/> <!-- Start of VTX disks in z -->
<constant name="VTXD_z_min_total" value="VTXD_z_min-1.5*cm"/> <!-- Outermost edge of VTX disks in z -->
<constant name="VTXD_z_max" value="918.641*mm"/> <!-- Outermost VTX disk in z -->
<constant name="VTXD_z_max_total" value="VTXD_z_max+4.5*cm"/> <!-- Outermost edge of VTX disk in z -->
<constant name="VTXD_r_min" value="34.5*mm"/> <!-- Start of VTX disks in r -->
<constant name="VTXD_r_max" value="315.0*mm"/> <!-- Start of VTX disks in r -->

<constant name="VTX_r_min" value="VTXIB_r_min_layer-VTXIB_r_min_clearance"/>
<constant name="VTX_r_max" value="VTXOB_r_max_layer+VTXOB_rmax_clearance"/>
<constant name="VTX_z_max" value="VTXD_z_max+4.5*cm"/>
<!-- End of VTX parameters -->

<!-- Drift Chamber parameters -->
Expand All @@ -96,6 +113,16 @@
<constant name="DCH_half_length_total" value=" 2250 * mm " />
<!-- End of Drift Chamber parameters -->

<!-- Silicon wrapper. Changing the values of the disk parameters is not enough, please contact the expert (Armin Ilg) -->
<constant name="SiWrB_inner_radius" value="2040*mm"/>
<constant name="SiWrB_outer_radius" value="2080*mm"/>
<constant name="SiWrB_half_length" value="2400*mm"/>
<constant name="SiWrD_inner_radius" value="350.0*mm"/>
<constant name="SiWrD_outer_radius" value="2040.0*mm"/>
<constant name="SiWrD_zmin" value="2300.0*mm"/>
<constant name="SiWrD_zmax" value="2340.0*mm"/>
<!-- End of Silicon Wrapper parameters -->

<!-- LAr ECAL Calo Barrel -->
<constant name="BarECal_id" value="DetID_ECAL_Barrel"/>
<constant name="BarECal_rmin" value="2100*mm"/>
Expand Down Expand Up @@ -213,18 +240,16 @@
</limits>
<regions>
<region name="BeampipeRegion"/>
<region name="VTXIBRegion"/>
<region name="VTXOBRegion"/>
<region name="VTXBRegion"/>
<region name="VTXDRegion"/>
<region name="SiWrapperBRegion"/>
<region name="SiWrapperDRegion"/>
<region name="SiWrBRegion"/>
<region name="SiWrDRegion"/>
</regions>


<display>
<vis name="VXDVis" alpha="0.1" r="0.1" g=".5" b=".5" showDaughters="true" visible="false"/>
<vis name="VXDLayerVis" alpha="1.0" r="0.1" g=".5" b=".5" showDaughters="true" visible="true"/>
<vis name="VXDSupportVis" alpha="1.0" r="0.0" g="1.0" b="0.0" showDaughters="true" visible="true"/>
<vis name="VXDVis" alpha="0.2" r="0.1" g=".5" b=".5" showDaughters="true" visible="true"/>
<vis name="SiWrVis" alpha="0.2" r="1.0" g="1.0" b="0.0" showDaughters="false" visible="true"/>
<vis name="ITVis" alpha="1.0" r="0.54" g="0.43" b="0.04" showDaughters="true" visible="true"/>
<vis name="OTVis" alpha="1.0" r="0.8" g="0.8" b="0.4" showDaughters="true" visible="false"/>
<vis name="ECALVis" alpha="1.0" r="0.2" g="0.6" b="0" showDaughters="true" visible="true"/>
Expand Down
1 change: 1 addition & 0 deletions FCCee/ALLEGRO/compact/ALLEGRO_o1_v03/SiliconWrapper_o1_v03.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../IDEA/compact/IDEA_o1_v03/SiliconWrapper_o1_v03.xml
1 change: 1 addition & 0 deletions FCCee/ALLEGRO/compact/ALLEGRO_o1_v03/VertexComplete_IDEA_o1_v03.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../IDEA/compact/IDEA_o1_v03/VertexComplete_IDEA_o1_v03.xml
1 change: 0 additions & 1 deletion FCCee/ALLEGRO/compact/ALLEGRO_o1_v03/Vertex_IDEA_o1_v01.xml
View file

This file was deleted.

7 changes: 6 additions & 1 deletion FCCee/ALLEGRO/compact/ALLEGRO_o1_v03/materials.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -236,14 +236,19 @@
<fraction n="0.35" ref="Epoxy"/>
</material>

<material name="CarbonFoam">
<D type="density" value="0.06" unit="g/cm3"/>
<fraction n="1" ref="C"/>
</material>

<material name="RohacellVtx"> <!-- (9*42.7 g/cm2 + 13*63.04 g/cm2 + 1*37.99 g/cm2 + 1*34.24 g/cm2)/(9+13+2+1)/x g/cm^3 = 563 cm -> density = 0.091 g/cm^3 , FIX COMPOSITION! -->
<D type="density" value="0.091" unit="g/cm3"/>
<composite n="9" ref="C"/>
<composite n="13" ref="H"/>
<composite n="2" ref="O"/>
<composite n="1" ref="N"/>
</material>

<material name="RohacellVtx66D"> <!-- (9*42.7 g/cm2 + 13*63.04 g/cm2 + 1*37.99 g/cm2 + 1*34.24 g/cm2)/(9+13+2+1)/x g/cm^3 = 563 cm -> density = 0.091 g/cm^3 , FIX COMPOSITION! Scaled down to 66% to account for fill factor of 66%-->
<D type="density" value="0.060" unit="g/cm3"/>
<composite n="9" ref="C"/>
Expand Down
Loading

0 comments on commit a43d17e

Please sign in to comment.