Skip to content

Commit

Permalink
add MDI elements to IDEA_o1_v03
Browse files Browse the repository at this point in the history
  • Loading branch information
@aciarma
aciarma committed Sep 2, 2024
1 parent 775610d commit 9f7db07
Show file tree
Hide file tree
Showing 5 changed files with 25 additions and 297 deletions.
80 changes: 2 additions & 78 deletions FCCee/IDEA/compact/IDEA_o1_v03/DectDimensions_IDEA_o1_v03.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,31 +57,8 @@
<constant name="DetID_FiberDRCalo" value=" 25"/>

<constant name="DetID_muonSystem" value=" 26"/>

<!-- BPW: Beam Pipe Width -->
<constant name="BPWWall" value="0.35*mm" />
<constant name="BPWCool" value="1.0*mm" />
<constant name="BeamPipeWidth" value="2.0*BPWWall + BPWCool"/>

<constant name="BeamPipeWidthFirstCone" value="2.0*mm" />
<constant name="CentralBeamPipe_zmax" value="9.0*cm"/> <!-- Shorter central beam pipe -->
<constant name="SeparatedBeamPipe_z" value="1190.0*mm"/> <!-- was 1159.97*mm in FCCDetectors/> -->
<constant name="CentralBeamPipe_rmax" value="10.0*mm"/>
<constant name="ConeBeamPipe_Rmax" value="28.9*mm" />
<constant name="BeamPipeGoldWidth" value="0.005*mm" />
<constant name="BeamPipeGoldTolerance" value="0.001*mm" /> <!-- dummy tolerance, some small non zero value -->
<constant name="BeamPipeConeHalfAngle" value="(ConeBeamPipe_Rmax + BeamPipeWidthFirstCone - CentralBeamPipe_rmax ) / (SeparatedBeamPipe_z - CentralBeamPipe_zmax)" />

<constant name="SeparatedBeamPipe_rmax" value="15*mm"/>
<constant name="BeamPipeTantalShieldWidth" value="15*mm"/>
<constant name="SideFillerShieldWidth" value="7*mm"/>
<constant name="TopFillerShieldWidth" value="8*mm"/>
<constant name="BeamPipe_end" value="12500*mm"/>

<!-- Mike Sullivan's Synch Rad mask -->
<constant name="MiddleOfSRMask_z" value="2.1*m" />
<constant name="SynchRadMaskSize" value="5*mm" /> <!-- mask tip is at 10 mm from the beamline -->
<constant name="mask_epsilon" value="0.001*mm" />
<constant name="DetID_FFQs" value="27"/>


<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 -->
Expand Down Expand Up @@ -123,61 +100,8 @@
<constant name="YokeEndcap_outer_symmetry" value="12"/>
<constant name="YokeEndcap_inner_symmetry" value="0"/>

<constant name="CompSol_min_z" value="1230*mm"/>

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

<constant name="LumiCal_max_z" value="1186.5*mm" />
<constant name="LumiCal_min_z" value="1074*mm"/>

<constant name="LumiCal_dz" value="(LumiCal_max_z-LumiCal_min_z)/2.0"/>

<constant name="LumiCal_inner_radius" value="55.0*mm"/>
<constant name="LumiCal_outer_radius" value="112.0*mm- env_safety"/>

<constant name="LumiCal_Instr_thickness" value="20*mm"/>
<constant name="LumiCal_Instr_inner_radius" value="LumiCal_outer_radius"/>
<constant name="LumiCal_Instr_outer_radius" value="LumiCal_outer_radius+LumiCal_Instr_thickness - env_safety"/>

<constant name="LumiCal_Cool_thickness" value="9.75*mm"/>
<constant name="LumiCal_Cool_inner_radius" value="LumiCal_Instr_outer_radius"/>
<constant name="LumiCal_Cool_outer_radius" value="LumiCal_Instr_outer_radius+LumiCal_Cool_thickness"/>

<constant name="Lcal_services_rmax" value="LumiCal_outer_radius+30*mm"/>
<constant name="Lcal_offset_phi" value=" 0."/>
<!--preliminary LumiCal shielding-->
<!--back shielding-->
<constant name="LumiCal_Shield_inner_radius" value="LumiCal_inner_radius"/>
<constant name="LumiCal_Shield_outer_radius" value="LumiCal_outer_radius+LumiCal_Instr_thickness+LumiCal_Cool_thickness"/>
<constant name="LumiCal_shield_dz" value="1.75*mm"/>
<!--nose-->
<constant name="LumiCal_NoseShield_inner_radius" value="LumiCal_inner_radius-5*mm"/>
<constant name="LumiCal_NoseShield_outer_radius" value="LumiCal_inner_radius+10*mm"/>
<constant name="LumiCal_nose_shield_dz" value="12*mm"/>

<constant name="BeamCal_inner_radius" value="32*mm"/>
<constant name="BeamCal_outer_radius" value="150*mm"/>
<constant name="BeamCal_min_z" value="3181*mm"/>
<constant name="BeamCal_max_z" value="3441*mm"/>
<constant name="BeamCal_dz" value="(BeamCal_max_z-BeamCal_min_z)/2.0"/>

<constant name="Kicker_inner_radius" value="4*mm"/>
<constant name="Kicker_outer_radius" value="25*mm"/>
<constant name="Kicker_min_z" value="3480*mm"/>
<constant name="Kicker_max_z" value="3780*mm"/>

<constant name="BPM_inner_radius" value="36*mm"/>
<constant name="BPM_outer_radius" value="55*mm"/>
<constant name="BPM_min_z" value="3790*mm"/>
<constant name="BPM_max_z" value="3880*mm"/>

<constant name="QD0_min_z" value="2000*mm"/>
<constant name="QD0_max_z" value="5200*mm"/>
<constant name="QD0Coil_outer_radius" value="30*mm"/>
<constant name="CollimatorInFrontOfQD0_dz" value="20*cm"/>
<constant name="CollimatorInFrontOfQD0_radius" value="10*mm"/>
<constant name="CollimatorInFrontOfQD0_dr" value="16*mm"/>

<constant name="tracker_region_zmax" value="DCH_half_length_total"/>
<constant name="tracker_region_rmax" value="DCH_outer_cyl_R_total"/>

Expand Down
34 changes: 15 additions & 19 deletions FCCee/IDEA/compact/IDEA_o1_v03/IDEA_o1_v03.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,13 @@
<constant name="world_x" value="world_size"/>
<constant name="world_y" value="world_size"/>
<constant name="world_z" value="world_size"/>
<constant name="FFQ_ON" value="1"/>
</define>

<!-- Import dimensions -->
<include ref="DectDimensions_IDEA_o1_v03.xml"/>

<include ref="../../../MDI/compact/MDI_o1_v00/MDI_Dimensions_Materials_o1_v00.xml" />

<!-- Import accelerator components -->
<!-- shape based model of the beam pipe -->
<include ref="../../../MDI/compact/MDI_o1_v00/Beampipe_o4_v05.xml" />
Expand All @@ -43,7 +45,17 @@
cmake -D INSTALL_BEAMPIPE_STL_FILES=ON which will download the files needed -->
<!-- <include ref="../../../MDI/compact/MDI_o1_v01/Beampipe_CADimport_o1_v02.xml" /> -->
<!-- <include ref="../../../MDI/compact/MDI_o1_v01/BeamInstrumentation_o1_v01.xml"/> -->
<include ref="LumiCal_o1_v01.xml"/>

<include ref="../../../MDI/compact/MDI_o1_v00/LumiCal_o3_v02_05.xml"/>
<include ref="../../../MDI/compact/MDI_o1_v00/HOMAbsorber.xml"/>
<!-- must use one FFQuads_params_xxx.xml BEFORE FFQuads_v01.xml -->
<!--<include ref="../../../MDI/compact/MDI_o1_v00/FFQuads_params_v530_Z.xml"/>-->
<include ref="../../../MDI/compact/MDI_o1_v00/FFQuads_params_v572_Z.xml"/>
<!-- <include ref="../../../MDI/compact/MDI_o1_v00/FFQuads_params_v572_T.xml"/>-->
<include ref="../../../MDI/compact/MDI_o1_v00/FFQuads_v01.xml"/>
<include ref="../../../MDI/compact/MDI_o1_v00/fields_antisol_map.xml"/>
<!--<include ref="../../../MDI/compact/MDI_o1_v00/fields_antisol_ideal.xml"/>-->


<!-- Import vertex -->
<include ref="Vertex_IDEA_o1_v01.xml"/>
Expand Down Expand Up @@ -73,30 +85,14 @@
</plugins>

<fields>
<!-- FIXME The magnetic field should be a map derived from FEM tools including all field sources, the return yoke geometry, etc -->
<!-- Only the Detector 2T solenoid field. The fields from antisolenoids and quadrupoles are located in the MDI folder -->
<!-- Currently the outer field value is kind of arbitrary and it will also impregnate the calorimeter volume while the field there is very small -->
<field name="GlobalSolenoid" type="solenoid"
inner_field="SolenoidField"
outer_field="-1.7*tesla"
zmax="Solenoid_Coil_half_length"
outer_radius="Solenoid_Coil_radius">
</field>

<field name="CompensatingSolenoidZplus" type="solenoid"
inner_field="-SolenoidField -SolenoidField * QD0_min_z / ( QD0_min_z - CompSol_min_z)"
outer_field="0*tesla"
zmax="QD0_min_z"
zmin="CompSol_min_z"
outer_radius="20*cm">
</field>

<field name="CompensatingSolenoidZminus" type="solenoid"
inner_field="-SolenoidField -SolenoidField * QD0_min_z / ( QD0_min_z - CompSol_min_z)"
outer_field="0*tesla"
zmin="-QD0_min_z"
zmax="-CompSol_min_z"
outer_radius="20*cm">
</field>
</fields>

</lccdd>
192 changes: 0 additions & 192 deletions FCCee/IDEA/compact/IDEA_o1_v03/LumiCal_o1_v01.xml
View file

This file was deleted.

8 changes: 4 additions & 4 deletions FCCee/MDI/compact/MDI_o1_v00/MDI_standalone_o1_v00.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,13 +52,13 @@
<include ref="HOMAbsorber.xml"/>

<!-- must use one FFQuads_params_xxx.xml BEFORE FFQuads_v01.xml -->
<include ref="FFQuads_params_v530_Z.xml"/>
<!-- <include ref="FFQuads_params_v572_Z.xml"/>-->
<!-- <include ref="FFQuads_params_v530_Z.xml"/>-->
<include ref="FFQuads_params_v572_Z.xml"/>
<!-- <include ref="FFQuads_params_v572_T.xml"/>-->
<include ref="FFQuads_v01.xml"/>

<include ref="fields_solenoid.xml"/>
<!--<include ref="fields_antisol_map.xml"/>-->
<include ref="fields_antisol_ideal.xml"/>
<include ref="fields_antisol_map.xml"/>
<!--<include ref="fields_antisol_ideal.xml"/>-->

</lccdd>
8 changes: 4 additions & 4 deletions FCCee/MDI/compact/MDI_o1_v01/MDI_standalone_o1_v01.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,13 +51,13 @@
<include ref="LumiCal_o3_v02_05.xml"/>

<!-- must use one FFQuads_params_xxx.xml BEFORE FFQuads_v01.xml -->
<include ref="FFQuads_params_v530_Z.xml"/>
<!-- <include ref="FFQuads_params_v572_Z.xml"/>-->
<!--<include ref="FFQuads_params_v530_Z.xml"/>-->
<include ref="FFQuads_params_v572_Z.xml"/>
<!-- <include ref="FFQuads_params_v572_T.xml"/>-->
<include ref="FFQuads_v01.xml"/>

<include ref="fields_solenoid.xml"/>
<!--<include ref="fields_antisol_map.xml"/>-->
<include ref="fields_antisol_ideal.xml"/>
<include ref="fields_antisol_map.xml"/>
<!--<include ref="fields_antisol_ideal.xml"/>-->

</lccdd>

0 comments on commit 9f7db07

Please sign in to comment.