Skip to content
Snippets Groups Projects
Commit 7d8d142c authored by Wouter Deconinck's avatar Wouter Deconinck
Browse files

fix: prefix CylindricalDipoleMagnet with ip6

parent d5c9c26d
No related branches found
No related tags found
1 merge request!118fix: prefix CylindricalDipoleMagnet with ip6
Pipeline #34134 failed
Stage: config
Stage: initialize
Stage: test
Stage: docs
Stage: collect
Stage: deploy
Pipeline: athena

#34136

    Hide whitespace changes
    Inline Side-by-side
    ip6/far_backward/lumi.xml
    + 3
    − 4
    View file @ 7d8d142c
    <?xml version="1.0" encoding="UTF-8"?>
    <lccdd>
    <define>
    <comment>
    ......@@ -23,7 +23,7 @@
    <comment>
    <detector name="LumiMag_shape" type="CylindricalDipoleMagnet">
    <detector name="LumiMag_shape" type="ip6_CylindricalDipoleMagnet">
    <placement x="0" y="0" z="LumiMag_cen_Z" theta="0"/>
    <dimensions x="LumiMag_R*4" y="LumiMag_R*4" z="LumiMag_DZ" r="2*LumiMag_R"/>
    <apperture x="LumiMag_R*2" y="LumiMag_R*2" r="LumiMag_R"/>
    ......@@ -56,6 +56,5 @@
    </field>
    </fields>
    </comment>
    </lccdd>
    </lccdd>
    ip6/far_backward/magnets.xml
    + 5
    − 5
    View file @ 7d8d142c
    ......@@ -5,35 +5,35 @@
    <!-- Magnet volumes -->
    <detector id="Magnet_Q1eR_ID" name="Magnet_Q1eR" type="CylindricalDipoleMagnet" vis="RedVis">
    <detector id="Magnet_Q1eR_ID" name="Magnet_Q1eR" type="ip6_CylindricalDipoleMagnet" vis="RedVis">
    <placement x="0" y="0" z="Q1eR_CenterPosition" theta="0*rad"/>
    <dimensions x="Q1eR_InnerRadius*4" y="Q1eR_InnerRadius*4" z="Q1eR_Length" r="2.0*Q1eR_InnerRadius" />
    <apperture x="Q1eR_InnerRadius*2" y="Q1eR_InnerRadius*2" r="Q1eR_InnerRadius" />
    <coil dx="2*cm" dy="1.5*cm" /><!--unchecked-->
    </detector>
    <detector id="Magnet_Q2eR_ID" name="Magnet_Q2eR" type="CylindricalDipoleMagnet" vis="RedVis">
    <detector id="Magnet_Q2eR_ID" name="Magnet_Q2eR" type="ip6_CylindricalDipoleMagnet" vis="RedVis">
    <placement x="0" y="0" z="Q2eR_CenterPosition" theta="0*rad"/>
    <dimensions x="Q2eR_InnerRadius*4" y="Q2eR_InnerRadius*4" z="Q2eR_Length" r="2.0*Q2eR_InnerRadius"/>
    <apperture x="Q2eR_InnerRadius*2" y="Q2eR_InnerRadius*2" r="Q2eR_InnerRadius"/>
    <coil dx="2*cm" dy="1.5*cm" /><!--unchecked-->
    </detector>
    <detector id="Magnet_B2AeR_ID" name="Magnet_B2AeR" type="CylindricalDipoleMagnet" vis="RedVis">
    <detector id="Magnet_B2AeR_ID" name="Magnet_B2AeR" type="ip6_CylindricalDipoleMagnet" vis="RedVis">
    <placement x="0" y="0" z="B2AeR_CenterPosition" theta="0*rad"/>
    <dimensions x="B2AeR_InnerRadius*4" y="B2AeR_InnerRadius*4" z="B2AeR_Length" r="2.0*B2AeR_InnerRadius"/>
    <apperture x="B2AeR_InnerRadius*2" y="B2AeR_InnerRadius*2" r="B2AeR_InnerRadius"/>
    <coil dx="2*cm" dy="1.5*cm" /><!--unchecked-->
    </detector>
    <detector id="Magnet_B2BeR_ID" name="Magnet_B2BeR" type="CylindricalDipoleMagnet" vis="RedVis">
    <detector id="Magnet_B2BeR_ID" name="Magnet_B2BeR" type="ip6_CylindricalDipoleMagnet" vis="RedVis">
    <placement x="0" y="0" z="B2BeR_CenterPosition" theta="0*rad"/>
    <dimensions x="B2BeR_InnerRadius*4" y="B2BeR_InnerRadius*4" z="B2BeR_Length" r="2.0*B2BeR_InnerRadius"/>
    <apperture x="B2BeR_InnerRadius*2" y="B2BeR_InnerRadius*2" r="B2BeR_InnerRadius"/>
    <coil dx="2*cm" dy="1.5*cm" /><!--unchecked-->
    </detector>
    <detector id="Magnet_Q3eR_ID" name="Magnet_Q3eR" type="CylindricalDipoleMagnet" vis="RedVis">
    <detector id="Magnet_Q3eR_ID" name="Magnet_Q3eR" type="ip6_CylindricalDipoleMagnet" vis="RedVis">
    <placement x="(Q3eR_StartX+Q3eR_EndX)/2" y="0" z="(Q3eR_StartZ+Q3eR_EndZ)/2" theta="Q3eR_Theta"/>
    <dimensions x="Q3eR_InnerRadius*4" y="Q3eR_InnerRadius*4" z="Q3eR_Length" r="2.0*Q3eR_InnerRadius"/>
    <apperture x="Q3eR_InnerRadius*2" y="Q3eR_InnerRadius*2" r="Q3eR_InnerRadius"/>
    ......
    0% or .
    You are about to add 0 people to the discussion. Proceed with caution.
    Please register or to comment