added materials for CAD beampipe, added CAD beampipe to main xml, add…

…ed solenoids + FFQs fields
aciarma · May 30, 2024 · c9eed51 · c9eed51
1 parent 5f51f0e
commit c9eed51
Show file tree

Hide file tree

Showing 2 changed files with 94 additions and 1 deletion.
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,7 +30,8 @@
 
   <include ref="./DectDimensions.xml" />
 
-  <include ref="Beampipe.xml"/>
+  <!--<include ref="Beampipe.xml"/>-->
+  <include ref="../../../CAD_beampipe/compact/Beampipe_CADimport_o1_v02.xml" />
   <include ref="BeamInstrumentation.xml"/>
   <include ref="LumiCal.xml"/>
   <include ref="HOMAbsorber.xml"/> 
@@ -43,4 +44,65 @@
   <include ref="HCalEndcaps_ThreeParts_TileCal.xml"/>
   <include ref="MuonTagger.xml"/>
 
+
+  <fields>
+    <field name="GlobalSolenoid" type="solenoid"
+           inner_field="SolenoidField"
+           outer_field="-1.0*tesla"
+           zmax="Solenoid_Coil_half_length"
+           outer_radius="Solenoid_Coil_radius">
+    </field>
+
+
+    <!-- FIXME cross-check this with MDI crew -->
+
+    <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>
+
+    <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"/>
+      <coefficient coefficient="0*tesla"/>
+      <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>
+    <field name="QC1L1_field_EU" 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"/>
+      <coefficient coefficient="0*tesla"/>
+      <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>
+
+      <field name="QC1L1_field_PD" 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"/>
+      <coefficient coefficient="0*tesla"/>
+      <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>
+  <field name="QC1L1_field_PU" 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.+pi" z="0.0"/>
+      <coefficient coefficient="0*tesla"/>
+      <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>
+
+
+  </fields>
+
+
 </lccdd>
diff --git a/FCCee/ALLEGRO/compact/ALLEGRO_o1_v03/materials.xml b/FCCee/ALLEGRO/compact/ALLEGRO_o1_v03/materials.xml
@@ -362,4 +362,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="Material01">
+    <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>