[FCCee] Centralize beampipe geometries in an MDI folder (#344)

* CAD files for beampipe added * added materials for CAD beampipe, added CAD beampipe to main xml, added solenoids + FFQs fields * forgot dimensions for FFQs and solenoid * move /CADbeampipe to /MDI * changed path of CAD pipe in ALLEGRO_o1_v03.xml * add CAD pipe to IDEA * fixed duplicate variables and commented out FFQ fields in ALLEGRO_o1_v01.xml * fixed tests * Update FCCee/ALLEGRO/compact/ALLEGRO_o1_v03/ALLEGRO_o1_v03.xml Co-authored-by: Andre Sailer <[email protected]> * Update FCCee/IDEA/compact/IDEA_o1_v03/IDEA_o1_v03.xml Co-authored-by: Andre Sailer <[email protected]> * Update FCCee/IDEA/compact/IDEA_o1_v03/IDEA_o1_v03.xml Co-authored-by: Andre Sailer <[email protected]> * Update FCCee/ALLEGRO/compact/ALLEGRO_o1_v03/ALLEGRO_o1_v03.xml Co-authored-by: Andre Sailer <[email protected]> * remove old beam pipe compacts, remove duplicate HCAL barrel import in ALLEGRO * remove beampipe.xml from ALLEGRO main * removed ALLEGRO_o1_v01/HOMAbsorber.xml * changed Material01 to IronDens785 * added MDI_o1_v00 and fixed READMEs * add back the shape based beampipe on IDEA and ALLEGRO * removed stl files, README updated * Update FCCee/MDI/compact/README.md Co-authored-by: Brieuc Francois <[email protected]> * Update FCCee/ALLEGRO/compact/README.md Co-authored-by: Brieuc Francois <[email protected]> * fixed pipe dimensions for ALLEGRO --------- Co-authored-by: Andre Sailer <[email protected]> Co-authored-by: Brieuc Francois <[email protected]>
key4hep · Jul 19, 2024 · 245c056 · 245c056
1 parent b425411
commit 245c056
Show file tree

Hide file tree

Showing 15 changed files with 189 additions and 172 deletions.
diff --git a/FCCee/ALLEGRO/compact/ALLEGRO_o1_v03/ALLEGRO_o1_v03.xml b/FCCee/ALLEGRO/compact/ALLEGRO_o1_v03/ALLEGRO_o1_v03.xml
@@ -30,16 +30,21 @@
 
   <include ref="./DectDimensions.xml" />
 
-  <include ref="Beampipe.xml"/>
-  <include ref="BeamInstrumentation.xml"/>
+  <!-- shape based model of the beam pipe -->
+  <include ref="../../../MDI/compact/MDI_o1_v00/Beampipe_o4_v05.xml" />
+  <include ref="../../../MDI/compact/MDI_o1_v00/BeamInstrumentation_o1_v01.xml" />
+
+  <!-- engineered CAD model of the beam pipe -->
+  <!-- <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.xml"/>
-  <include ref="HOMAbsorber.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="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.xml"/>
   <include ref="ECalEndcaps_coneCryo.xml"/>
   <include ref="HCalEndcaps_ThreeParts_TileCal.xml"/>
+  <include ref="HCalBarrel_TileCal.xml"/>
   <include ref="MuonTagger.xml"/>
 
   <fields>
@@ -72,6 +77,8 @@
            outer_radius="20*cm">
     </field>
 
+    <!-- FFQ fields at Z pole, V23) -->
+    <!--
     <field name="QC1L1_field_ED" type="MultipoleMagnet" Z="0.0*tesla">
       <position y="0*cm" x="(QC1L1_len/2. + QC1L1_start)*sin(CrossingAngle/2.)" z="(QC1L1_len/2. + QC1L1_start)*cos(CrossingAngle/2.)"/>
       <rotation x="0" y="CrossingAngle/2." z="0.0"/>
@@ -103,7 +110,8 @@
       <coefficient coefficient="(-1)*(45.6)*(-0.273)/0.3*tesla/m"/>
       <shape type="Tube" rmin="0.*cm" rmax="QC1_rmin" dz="QC1L1_len/2." />
     </field>
-
+    -->
+
     <!--End of MDI magnetic fields  -->
 
   </fields>

diff --git a/FCCee/ALLEGRO/compact/ALLEGRO_o1_v03/Beampipe.xml b/FCCee/ALLEGRO/compact/ALLEGRO_o1_v03/Beampipe.xml
diff --git a/FCCee/ALLEGRO/compact/ALLEGRO_o1_v03/DectDimensions.xml b/FCCee/ALLEGRO/compact/ALLEGRO_o1_v03/DectDimensions.xml
@@ -48,22 +48,30 @@
     <constant name="DetID_HOMAbsorber"          value=" 19"/>
     <constant name="DetID_LumiCalNoseShield"          value=" 22"/>
 
-    <constant name="BeamPipeWidth"   	value="1.2*mm" />
-    <constant name="BeamPipeWidthFirstCone"   	value="1.0*mm" />
-    <constant name="CentralBeamPipe_zmax" value="12.5*cm"/>
-    <constant name="BePartEnd_z" value="90.0*cm"/>
-    <constant name="SeparatedBeamPipe_z" value="1159.97*mm"/>
-    <constant name="CentralBeamPipe_rmax" value="15.0*mm"/>
-    <constant name="BeamPipeGoldWidth" value="0.005*mm" /> 
+    <!-- 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="BigBeamPipe_zmax" value="1120*mm"/>
+    <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="size_x" value="60*mm"/>       
     <constant name="size_y" value="12*mm"/>         

diff --git a/FCCee/ALLEGRO/compact/ALLEGRO_o1_v03/materials.xml b/FCCee/ALLEGRO/compact/ALLEGRO_o1_v03/materials.xml
@@ -475,4 +475,35 @@
     <fraction n="0.084" ref="Nb"/>
   </material>
 
+
+  <material name="Water">
+      <D value="1" unit="g/cm3" />
+      <composite n="2" ref="H" />
+      <composite n="1" ref="O" />
+  </material>
+
+  <material name="DefaultMaterial">
+    <D value="7.85" unit="g/cm3"/>
+    <fraction n="0.998" ref="Fe"/>
+    <fraction n=".002"  ref="C"/>
+  </material>
+
+  <material name="IronDens785">
+    <D value="7.85" unit="g/cm3"/>
+    <fraction n="1.0" ref="Fe"/>
+  </material>
+
+  <material name="AlBeMet162">
+    <D value="2.1" unit="g/cm3"/>
+    <fraction n="0.38" ref="Al"/>
+    <fraction n="0.62" ref="Be"/>
+  </material>
+
+  <material name="LiquidNDecane">
+    <D value="0.73" unit="g/cm3"/>
+    <composite n="10" ref="C" />
+    <composite n="22" ref="H" />
+  </material>
+
+
 </materials>
diff --git a/FCCee/ALLEGRO/compact/README.md b/FCCee/ALLEGRO/compact/README.md
@@ -8,4 +8,4 @@ Known caveat: the drift chamber has a larger z extent than in the IDEA detector
 
 ALLEGRO_o1_v03: with respect to v02 it features an ECal barrel with 11 layers and cell corners projective along phi.
 The vertex detector and drift chamber are now taken directly from IDEA_o1_v03, this effectively updates both the vertex detector (which was taken from an old CLD version) and the drift chamber (which was corresponding to IDEA_o1_v02/DriftChamber_o1_v01.xml). The z-extent of the drift chamber is now unchanged w.r.t. the IDEA detector (2 m) since it requires optimization anyway.
-Magnetic fields (solenoid + MDI) have been added.
+Magnetic fields (solenoid + MDI) have been added.
diff --git a/FCCee/IDEA/compact/IDEA_o1_v03/IDEA_o1_v03.xml b/FCCee/IDEA/compact/IDEA_o1_v03/IDEA_o1_v03.xml
@@ -34,8 +34,12 @@
   <include ref="DectDimensions_IDEA_o1_v03.xml"/>
 
   <!-- Import accelerator components -->
-  <include ref="Beampipe_o4_v05.xml"/>
-  <include ref="BeamInstrumentation_o1_v01.xml"/>
+  <!-- shape based model of the beam pipe -->
+  <include ref="../../../MDI/compact/MDI_o1_v00/Beampipe_o4_v05.xml" />
+  <include ref="../../../MDI/compact/MDI_o1_v00/BeamInstrumentation_o1_v01.xml" />
+  <!-- engineered CAD model of the beam pipe -->
+  <!-- <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"/>
 
   <!-- Import vertex -->

diff --git a/FCCee/IDEA/compact/IDEA_o1_v03/materials_o1_v02.xml b/FCCee/IDEA/compact/IDEA_o1_v03/materials_o1_v02.xml
@@ -330,7 +330,7 @@
     <fraction n="0.998" ref="Fe"/>
     <fraction n=".002"  ref="C"/>
   </material>
-  <material name="Material01">
+  <material name="IronDens785">
     <D value="7.85" unit="g/cm3"/>
     <fraction n="1.0" ref="Fe"/>
   </material>  

diff --git a/FCCee/IDEA/compact/README.md b/FCCee/IDEA/compact/README.md
@@ -15,4 +15,3 @@ IDEA_o1_v03
 ------------
 
 Based on o1_v02 but replacing the drift chamber (o1, v01) for the lightweight implementation based on twisted tubes (o1, v02). NB: production threshold and step limit physics have to be tuned for the drift chamber. July 2024: Added a detailed version of the muon system. 
-
diff --git a/...DEA_o1_v03/BeamInstrumentation_o1_v01.xml → ...MDI_o1_v00/BeamInstrumentation_o1_v01.xml b/...DEA_o1_v03/BeamInstrumentation_o1_v01.xml → ...MDI_o1_v00/BeamInstrumentation_o1_v01.xml
diff --git a/...A/compact/IDEA_o1_v03/Beampipe_o4_v05.xml → ...DI/compact/MDI_o1_v00/Beampipe_o4_v05.xml b/...A/compact/IDEA_o1_v03/Beampipe_o4_v05.xml → ...DI/compact/MDI_o1_v00/Beampipe_o4_v05.xml
diff --git a/...RO/compact/ALLEGRO_o1_v03/HOMAbsorber.xml → FCCee/MDI/compact/MDI_o1_v00/HOMAbsorber.xml b/...RO/compact/ALLEGRO_o1_v03/HOMAbsorber.xml → FCCee/MDI/compact/MDI_o1_v00/HOMAbsorber.xml
diff --git a/...ct/ALLEGRO_o1_v03/BeamInstrumentation.xml → ...MDI_o1_v01/BeamInstrumentation_o1_v01.xml b/...ct/ALLEGRO_o1_v03/BeamInstrumentation.xml → ...MDI_o1_v01/BeamInstrumentation_o1_v01.xml