[FCCee] Centralize beampipe geometries in an MDI folder

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>

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>

FCCee/ALLEGRO/compact/README.md

@@ -9,3 +9,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.
+CAD beam pipe elements have been added.

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 -->

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>  

FCCee/IDEA/compact/README.md

@@ -15,4 +15,4 @@ IDEA_o1_v03
 ------------
 
 Based on o1_v02 but replacing the drift chamber (o1, v01) for the lightweight implementation based on twisted tubes (o1, v02). Production threshold and step limit physics have to be tuned
-
+CAD beam pipe elements have been added.

FCCee/MDI/compact/MDI_o1_v01/Beampipe_CADimport_o1_v02.xml

@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<lccdd xmlns:compact="http://www.lcsim.org/schemas/compact/1.0"
+  xmlns:xs="http://www.w3.org/2001/XMLSchema"
+  xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/compact/1.0/compact.xsd">
+
+
+  <info name="FCCee"
+        title="FCCee Beam pipe from CAD drawings"
+        author="aciarma"
+        url="no"
+        status="development"
+        version="1.0">
+    <comment>A beampipe for FCCee coming from F. Fransesini CAD drawings. </comment>
+  </info>
+
+
+
+  <detectors>
+
+    <detector name="Beampipe_STL" type="DD4hep_TestShape_Creator">
+      <check>
+        <shape type="CAD_MultiVolume" ref="./stl_files/Pipe_240430/AlBeMet162_30042024.stl"
+	       unit="mm" material="AlBeMet162">
+	  <volume id="0" name="s1" vis="AlBeMet_vis" material="AlBeMet162"> 
+	    <position x="0*cm"  y="0*cm"  z="0*cm"/>
+            <rotation x="0*rad" y="0*rad" z="0*rad"/>
+	  </volume> 
+        </shape>
+      </check>
+    </detector>
+
+    <detector name="Beampipe_crotch_STL" type="DD4hep_TestShape_Creator">
+      <check>
+        <shape type="CAD_MultiVolume" ref="./stl_files/Pipe_240430/Copper_pipe_28092023.stl"
+               unit="mm" material="Copper">
+          <volume id="0" name="s1" vis="CopperCooling_vis" material="Cu">
+            <position x="0*cm"  y="0*cm"  z="0*cm"/>
+            <rotation x="0*rad" y="pi/2.*rad" z="0*rad"/>
+          </volume>
+        </shape>
+      </check>
+    </detector>
+
+
+    <detector name="Gold_STL" type="DD4hep_TestShape_Creator">
+      <check>
+	<shape type="CAD_MultiVolume" ref="./stl_files/Pipe_240430/Gold_19042024.stl"
+	       unit="mm" material="Gold">
+          <volume id="0" name="s1" vis="Gold_vis" material="Au">
+            <position x="0*cm"  y="0*cm"  z="0*cm"/>
+            <rotation x="0*rad" y="0*rad" z="0*rad"/>
+          </volume>
+	</shape>
+      </check>
+    </detector>
+
+
+    <detector name="Paraffin_STL" type="DD4hep_TestShape_Creator">
+      <check>
+        <shape type="CAD_MultiVolume" ref="./stl_files/Pipe_240430/Paraffine_19042024.stl"
+	       unit="mm" material="LiquidNDecane">
+          <volume id="0" name="s1" vis="Paraffin_vis" material="LiquidNDecane">
+            <position x="0*cm"  y="0*cm"  z="0*cm"/>
+            <rotation x="0*rad" y="0*rad" z="0*rad"/>
+          </volume>
+        </shape>
+      </check>
+    </detector>
+
+    <detector name="Water_STL" type="DD4hep_TestShape_Creator">
+      <check>
+        <shape type="CAD_MultiVolume" ref="./stl_files/Pipe_240430/Water_30042024.stl"
+               unit="mm" material="Water">
+          <volume id="0" name="s1" vis="Water_vis" material="Water">
+            <position x="0*cm"  y="0*cm"  z="0*cm"/>
+            <rotation x="0*rad" y="0*rad" z="0*rad"/>
+          </volume>
+        </shape>
+      </check>
+    </detector>
+
+    <detector name="Tungsten_STL" type="DD4hep_TestShape_Creator">
+      <check>
+        <shape type="CAD_MultiVolume" ref="./stl_files/Pipe_240430/Tungsten_mask_02102023.stl"
+               unit="mm" material="Tungsten">
+          <volume id="0" name="s1" vis="Tungsten_vis" material="W">
+            <position x="0*cm"  y="0*cm"  z="0*cm"/>
+            <rotation x="0*rad" y="-pi/2.*rad" z="0*rad"/>
+          </volume>
+        </shape>
+      </check>
+    </detector>
+
+
+  </detectors>
+
+
+
+</lccdd>