Skip to content

Commit

Permalink
Merge branch 'main' into meshes-services
Browse files Browse the repository at this point in the history
  • Loading branch information
Chao1009 authored May 18, 2023
2 parents bf60bc1 + b9c7055 commit cc527f0
Show file tree
Hide file tree
Showing 20 changed files with 555 additions and 242 deletions.
3 changes: 2 additions & 1 deletion compact/central_beampipe.xml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,8 @@
<zplane z="BeampipeDownstreamStraightLength + 0.5 * BeampipeOD * tan(abs(CrossingAngle))" OD="BeampipeOD"/>
<zplane z="1750.00 * mm" OD=" 92.06 * mm"/>
<zplane z="4455.80 * mm" OD="257.92 * mm"/>
<zplane z="5000.00 * mm" OD="340.60 * mm"/>
<!-- removed due to vacuum overlap with far forward electron beampipe -->
<!--zplane z="5000.00 * mm" OD="340.60 * mm"/-->
</outgoing_hadron>
<additional_subtraction thickness="4.0*mm"
crossing_angle="CrossingAngle">
Expand Down
2 changes: 1 addition & 1 deletion compact/definitions.xml
Original file line number Diff line number Diff line change
Expand Up @@ -513,7 +513,7 @@ Service gaps in FW direction (before endcapP ECAL) and BW direction (before endc
<documentation level="3">
## Calorimeter Parameters
</documentation>
<constant name="EcalBarrelStavesN" value="24"/>
<constant name="EcalBarrelStavesN" value="48"/>
<constant name="EcalEndcapP_zmin" value="ForwardServiceGap_zmax" />
<constant name="EcalEndcapP_length" value="30*cm" />
<constant name="EcalEndcapP_zmax" value="EcalEndcapP_zmin + EcalEndcapP_length"/>
Expand Down
2 changes: 1 addition & 1 deletion compact/display.xml
Original file line number Diff line number Diff line change
Expand Up @@ -66,10 +66,10 @@
<vis name="EcalBarrelVis" ref="AnlGold" showDaughters="false" visible="true"/>
<vis name="EcalBarrelStaveVis" ref="AnlOrange" showDaughters="false" visible="true" />
<vis name="EcalBarrelEnvelopeVis" ref="AnlGold" showDaughters="false" visible="true" />
<vis name="EcalBarrelSupportVis" ref="AnlOrange" showDaughters="false" visible="true"/>
<vis name="EcalBarrelLayerVis" ref="AnlGold" showDaughters="true" visible="true"/>
<vis name="EcalBarrelSliceVis" ref="AnlGray" showDaughters="false" visible="true"/>
<vis name="EcalBarrelFiberLayerVis" ref="AnlGold" showDaughters="false" visible="true" />
<vis name="EcalBarrelSupportVis" ref="AnlLightGray" showDaughters="false" visible="true"/>

<vis name="EcalEndcapVis" ref="AnlGold" showDaughters="true" visible="false"/>
<vis name="EcalEndcapLayerVis" ref="AnlGold" showDaughters="false" visible="true"/>
Expand Down
2 changes: 1 addition & 1 deletion compact/display_detailed.xml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
<vis name="EcalBarrelStaveVis" ref="AnlGold" showDaughters="true" visible="true" />
<vis name="EcalBarrelFiberLayerVis" ref="AnlGold" showDaughters="false" visible="true" />
<vis name="EcalBarrelSliceVis" ref="AnlGray"/>
<vis name="EcalBarrelSupportVis" ref="AnlOrange"/>
<vis name="EcalBarrelSupportVis" ref="AnlLightGray"/>

<vis name="EcalVis" ref="AnlGold" showDaughters="true" visible="false"/>
<vis name="EcalEndcapVis" ref="AnlGold" showDaughters="false" visible="true"/>
Expand Down
2 changes: 1 addition & 1 deletion compact/display_geoviewer.xml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
<vis name="EcalBarrelStaveVis" ref="AnlGold" showDaughters="true" visible="true" />
<vis name="EcalBarrelFiberLayerVis" ref="AnlGold" showDaughters="false" visible="true" />
<vis name="EcalBarrelSliceVis" ref="AnlGray"/>
<vis name="EcalBarrelSupportVis" ref="AnlOrange"/>
<vis name="EcalBarrelSupportVis" ref="AnlLightGray"/>

<vis name="EcalVis" ref="AnlGold" showDaughters="true" visible="false"/>
<vis name="EcalEndcapVis" ref="AnlGold" showDaughters="false" visible="true"/>
Expand Down
9 changes: 7 additions & 2 deletions compact/ecal/barrel_interlayers.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<constant name="EcalBarrel_Calorimeter_offset"
value="(EcalBarrel_Calorimeter_zmax - EcalBarrel_Calorimeter_zmin)/2.0"/>

<constant name="EcalBarrel_Support_thickness" value="0*cm"/>
<constant name="EcalBarrel_Support_thickness" value="3*cm"/>
<constant name="EcalBarrel_SiliconThickness" value="500*um"/>
<constant name="EcalBarrel_ElectronicsThickness" value="150*um"/>
<constant name="EcalBarrel_CopperThickness" value="100*um"/>
Expand Down Expand Up @@ -149,7 +149,9 @@
space_before="EcalBarrel_ImagingLayerThickness + EcalBarrel_SpaceBetween/2.">
<slice material="SciFiPb_PbGlue" thickness="EcalBarrel_RadiatorThickness" vis="EcalBarrelFiberLayerVis">
<fiber material="SciFiPb_Scintillator"
sensitive="yes"
sensitive="yes"
grid_n_phi="5"
grid_dr="2*cm"
radius="EcalBarrel_FiberRadius"
cladding_thickness="EcalBarrel_CladdingThickness"
spacing_x="EcalBarrel_FiberXSpacing"
Expand All @@ -167,6 +169,8 @@
vis="EcalBarrelFiberLayerVis">
<fiber material="SciFiPb_Scintillator"
sensitive="yes"
grid_n_phi="5"
grid_dr="2*cm"
radius="EcalBarrel_FiberRadius"
cladding_thickness="EcalBarrel_CladdingThickness"
spacing_x="EcalBarrel_FiberXSpacing"
Expand All @@ -175,6 +179,7 @@
</fiber>
</slice>
</layer>
<support thickness="EcalBarrel_Support_thickness" material="Aluminum" vis="EcalBarrelSupportVis"/>
</detector>
</detectors>

Expand Down
7 changes: 3 additions & 4 deletions compact/far_backward/definitions.xml
Original file line number Diff line number Diff line change
Expand Up @@ -256,8 +256,8 @@
<!-- Lumi converter -->
<constant name="LumiConverter_X" value="0*m"/>
<constant name="LumiConverter_Y" value="0*m"/>
<constant name="LumiConverter_Z" value="LumiSpecMag_Z + LumiSpecMag_DZ/2."/>
<constant name="LumiConverter_DZ" value="1*mm"/>
<constant name="LumiConverter_Z" value="LumiSpecMag_Z + LumiSpecMag_DZ/2. + LumiConverter_DZ"/>
<constant name="LumiConverter_DXY" value="12*cm"/>

<!-- Lumi spectrometer CAL -->
Expand All @@ -269,10 +269,9 @@
<constant name="LumiSpecCAL_Z" value="-65*m"/>

<!-- Lumi spectrometer trackers -->
<constant name="SpecMag_to_SpecCAL_DZ" value="(LumiSpecMag_Z - LumiSpecMag_DZ/2.0) - (LumiSpecCAL_Z + LumiSpecCALTower_DZ/2.0)"/>
<constant name="LumiSpecTracker_DXY" value="0.2*m"/>
<constant name="LumiSpecTracker_Z1" value="LumiSpecMag_Z - LumiSpecMag_DZ/2.0 - 5/6.*SpecMag_to_SpecCAL_DZ"/>
<constant name="LumiSpecTracker_Z2" value="LumiSpecMag_Z - LumiSpecMag_DZ/2.0 - 11/12.*SpecMag_to_SpecCAL_DZ"/>
<constant name="LumiSpecTracker_Z1" value="LumiSpecCAL_Z + LumiSpecCALTower_DZ/2. + 21*cm "/>
<constant name="LumiSpecTracker_Z2" value="LumiSpecCAL_Z + LumiSpecCALTower_DZ/2. + 11*cm"/>
<constant name="LumiSpecTracker_Z3" value="LumiSpecCAL_Z + LumiSpecCALTower_DZ/2. + 1*cm"/>
<constant name="LumiSpecTracker_Y1" value="LumiSpecCAL_FiveSigma + LumiSpecTracker_DXY/2."/>
<constant name="LumiSpecTracker_Y2" value="LumiSpecTracker_Y1"/>
Expand Down
2 changes: 1 addition & 1 deletion compact/far_backward/lumi/spec_homo_cal.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

<detectors>
<detector id="LumiSpecCAL_ID" name="LumiSpecCAL" type="LumiSpecHomoCAL" vis="FFPreVis" readout="LumiSpecCALHits" sizeXY="LumiSpecCAL_DXY">
<module sizex="LumiSpecCALTower_DXY" sizey="LumiSpecCALTower_DXY" sizez="LumiSpecCALTower_DZ" frameSize="0.05*mm" material="PbWO4" vis="FFPreModuleVis"/>
<module sizex="LumiSpecCALTower_DXY" sizey="LumiSpecCALTower_DXY" sizez="LumiSpecCALTower_DZ" frameSize="0.0*mm" material="PbWO4" vis="FFPreModuleVis"/>
<sector id="0">
<position x="0.0*cm" y="LumiSpecCAL_Y" z="LumiSpecCAL_Z"/>
<rotation x="0.0*rad" y="0.0*rad" z="0.0*rad"/>
Expand Down
2 changes: 1 addition & 1 deletion compact/far_backward/lumi/spec_tracker.xml
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@

<readouts>
<readout name="LumiSpecTrackerHits">
<segmentation type="CartesianGridXY" grid_size_x="0.5*mm" grid_size_y="0.5*mm"/>
<segmentation type="CartesianGridXY" grid_size_x="0.05*mm" grid_size_y="0.05*mm"/>
<id>system:8,sector:8,module:8,x:32:-16,y:-16</id>
</readout>
</readouts>
Expand Down
1 change: 1 addition & 0 deletions compact/far_forward.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

<include ref="far_forward/ion_beamline.xml" />
<include ref="far_forward/beampipe_hadron_B0.xml" />
<include ref="far_forward/electron_beamline.xml" />
<include ref="far_forward/B0_tracker.xml"/>
<include ref="far_forward/B0_ECal.xml"/>
<include ref="far_forward/offM_tracker.xml"/>
Expand Down
4 changes: 2 additions & 2 deletions compact/far_forward/definitions.xml
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,8 @@
</comment>
<!--<constant name="Q0EF_InnerRadius" value="0.02*cm"/>-->
<!--<constant name="Q1EF_InnerRadius" value="0.485*cm"/>-->
<constant name="Q0EF_InnerRadius" value="2*cm"/>
<constant name="Q1EF_InnerRadius" value="2*cm"/>
<constant name="Q0EF_InnerRadius" value="2.5*cm"/>
<constant name="Q1EF_InnerRadius" value="2.5*cm"/>

<constant name="B0PF_RotationAngle" value="-0.0*0.001*rad"/>
<constant name="B0APF_RotationAngle" value="-25.0*0.001*rad"/>
Expand Down
112 changes: 112 additions & 0 deletions compact/far_forward/electron_beamline.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,112 @@
<!-- SPDX-License-Identifier: LGPL-3.0-or-later -->
<!-- Copyright (C) 2022 Jaroslav Adam, Jakub Ceska -->

<lccdd>

<define>

<!-- electron beam pipe wall thickness at positive z -->
<constant name="Beampipe_cen_pos_Thickness" value="1.0*mm"/>

<!-- end of central section -->
<constant name="Beampipe_cen_pos_EndZ" value="4484.25*mm"/>
<constant name="Beampipe_cen_pos_r1" value="BeampipeOD/2."/>

<!-- Q0eF quadrupole magnet -->
<constant name="Q0EF_StartZ" value="7000.*mm"/>
<constant name="Q0EF_EndZ" value="5800.*mm"/>
<!--<constant name="Q0EF_InnerRadius" value="25.*mm"/>-->

<!-- Q1eF quadrupole magnet -->
<constant name="Q1EF_StartZ" value="12370.*mm"/>
<constant name="Q1EF_EndZ" value="10760.*mm"/>
<!--<constant name="Q1EF_InnerRadius" value="63*mm"/>-->

<!-- beam section at forward region to +15 meters -->
<constant name="Beampipe_fwd_pos_EndZ" value="15000.*mm"/>

</define>

<detectors>

<!-- Beam Pipe from central section at positive z to +15 meters -->
<detector
name="Pipe_cen_to_pos"
type="BeamPipeChain"
wall_thickness="Beampipe_cen_pos_Thickness">

<pipe id="0" name="Pipe_to_Q0EF"
xcenter="0" zcenter="(Q0EF_EndZ+Beampipe_cen_pos_EndZ)/2."
length="Q0EF_EndZ-Beampipe_cen_pos_EndZ" theta="0"
rout1="Q0EF_InnerRadius" rout2="Beampipe_cen_pos_r1">
</pipe>

<pipe id="1" name="Pipe_Q0EF_to_Q1EF"
xcenter="0" zcenter="(Q1EF_EndZ+Q0EF_StartZ)/2."
length="Q1EF_EndZ-Q0EF_StartZ" theta="0"
rout1="Q1EF_InnerRadius" rout2="Q0EF_InnerRadius">
</pipe>

<pipe id="2" name="Pipe_Q1EF_to_pos"
xcenter="0" zcenter="(Beampipe_fwd_pos_EndZ+Q1EF_StartZ)/2."
length="Beampipe_fwd_pos_EndZ-Q1EF_StartZ" theta="0"
rout1="Q1EF_InnerRadius" rout2="Q1EF_InnerRadius">
</pipe>

</detector>

<!-- Q0eF magnet -->
<detector name="Q0EF" type="ip6_CylindricalDipoleMagnet" vis="RedVis">
<placement x="0" y="0" z="(Q0EF_StartZ+Q0EF_EndZ)/2." theta="0"/>
<dimensions x="Q0EF_InnerRadius*4" y="Q0EF_InnerRadius*4" z="Q0EF_StartZ-Q0EF_EndZ" r="1.9*Q0EF_InnerRadius" />
<apperture x="Q0EF_InnerRadius*2" y="Q0EF_InnerRadius*2" r="Q0EF_InnerRadius" />
<coil dx="2*cm" dy="1.5*cm" />!--unchecked--
</detector>

<!-- inner vacuum for Q0eF -->
<detector name="Q0EF_vac" type="DD4hep_TubeSegment" vis="VisFwElInvisible">
<material name="Vacuum"/>
<tubs rmin="0" rmax="Q0EF_InnerRadius" zhalf="(Q0EF_StartZ-Q0EF_EndZ)/2."/>
<position x="0" y="0" z="(Q0EF_StartZ+Q0EF_EndZ)/2."/>
<rotation x="0" y="0" z="0"/>
</detector>

<!-- Q1eF magnet -->
<detector name="Q1EF" type="ip6_CylindricalDipoleMagnet" vis="RedVis">
<placement x="0" y="0" z="(Q1EF_StartZ+Q1EF_EndZ)/2." theta="0"/>
<dimensions x="Q1EF_InnerRadius*4" y="Q1EF_InnerRadius*4" z="Q1EF_StartZ-Q1EF_EndZ" r="1.9*Q1EF_InnerRadius" />
<apperture x="Q1EF_InnerRadius*2" y="Q1EF_InnerRadius*2" r="Q1EF_InnerRadius" />
<coil dx="2*cm" dy="1.5*cm" />!--unchecked--
</detector>

<!-- inner vacuum for Q1eF -->
<detector name="Q1EF_vac" type="DD4hep_TubeSegment" vis="VisFwElInvisible">
<material name="Vacuum"/>
<tubs rmin="0" rmax="Q1EF_InnerRadius" zhalf="(Q1EF_StartZ-Q1EF_EndZ)/2."/>
<position x="0" y="0" z="(Q1EF_StartZ+Q1EF_EndZ)/2."/>
<rotation x="0" y="0" z="0"/>
</detector>

</detectors>

<fields>

<!-- Q0eF quadrupole field -->
<field name="Q0EF_field" type="MultipoleMagnet">
<shape type="Tube" rmax="Q0EF_InnerRadius" dz="(Q0EF_StartZ-Q0EF_EndZ)/2."/>
<position x="0" y="0" z="(Q0EF_StartZ+Q0EF_EndZ)/2."/>
<coefficient/>
<coefficient coefficient="-13.0961*tesla/meter"/>
</field>

<!-- Q1eF quadrupole field -->
<field name="Q1EF_field" type="MultipoleMagnet">
<shape type="Tube" rmax="Q1EF_InnerRadius" dz="(Q1EF_StartZ-Q1EF_EndZ)/2."/>
<position x="0" y="0" z="(Q1EF_StartZ+Q1EF_EndZ)/2."/>
<coefficient/>
<coefficient coefficient="6.0639*tesla/meter"/>
</field>

</fields>

</lccdd>
13 changes: 0 additions & 13 deletions compact/far_forward/ion_beamline.xml
Original file line number Diff line number Diff line change
Expand Up @@ -69,19 +69,6 @@
<apperture x="B2PF_InnerRadius*2" y="B2PF_InnerRadius*2" r="B2PF_InnerRadius"/>
<coil vis="FFMagnetCoilVis" dx="1*cm" dy="0.5*cm" />
</detector>
<detector id="Q0EF_ID" name="Q0EF_BeamlineMagnet" vis="FFMagnetVis" type="ip6_CylindricalDipoleMagnet">
<placement x="Q0EF_XPosition" y="0*m" z="Q0EF_CenterPosition" theta="Q0EF_RotationAngle" />
<dimensions x="5.0*cm" y="5.0*cm" z="Q0EF_Length" r="2.5*cm" />
<apperture x="Q0EF_InnerRadius*2" y="Q0EF_InnerRadius*2" r="Q0EF_InnerRadius"/>
<coil vis="FFMagnetCoilVis" dx="0.4*cm" dy="0.2*cm" />
</detector>
<detector id="Q1EF_ID" name="Q1EF_BeamlineMagnet" vis="FFMagnetVis" type="ip6_CylindricalDipoleMagnet">
<placement x="Q1EF_XPosition" y="0*m" z="Q1EF_CenterPosition" theta="Q1EF_RotationAngle" />
<dimensions x="6.0*cm" y="6.0*cm" z="Q1EF_Length" r="3.0*cm" />
<apperture x="Q1EF_InnerRadius*2" y="Q1EF_InnerRadius*2" r="Q1EF_InnerRadius"/>
<coil vis="FFMagnetCoilVis" dx="0.4*cm" dy="0.2*cm" />
</detector>

</detectors>

</lccdd>
Loading

0 comments on commit cc527f0

Please sign in to comment.