Skip to content

Commit 737f84f

Browse files
dhevangpre-commit-ci[bot]veprbl
authored
Implement lumi dipole B mapping (#527)
### Briefly, what does this PR introduce? Implement lumi dipole B mapping and modify source code to treat R-Z and X-Y-Z coordinate systems. ### What kind of change does this PR introduce? - [ ] Bug fix (issue #__) - [x ] New feature (issue #__) - [ ] Documentation update - [ ] Other: __ ### Please check if this PR fulfills the following: - [ ] Tests for the changes have been added - [ ] Documentation has been added / updated - [ ] Changes have been communicated to collaborators ### Does this PR introduce breaking changes? What changes might users need to make to their code? ### Does this PR change default behavior? --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: Dmitry Kalinkin <[email protected]>
1 parent a1e66cc commit 737f84f

File tree

4 files changed

+429
-254
lines changed

4 files changed

+429
-254
lines changed

compact/far_backward/lumi/lumi_magnets.xml

Lines changed: 38 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,20 +77,55 @@ Construct the sweeper and analyzer dipole magnets for the luminosity subsystem.
7777
Detailed field map to be inserted later.
7878
</comment>
7979

80+
8081
<fields>
82+
83+
<comment> Ideal fields </comment>
84+
<comment>
8185
<field name="LumiSweeperField" type="MultipoleMagnet">
8286
<position x="LumiSweepMag_X" y="LumiSweepMag_Y" z="LumiSweepMag_Z"/>
8387
<rotation x="0" y="0" z="0"/>
8488
<shape type="Box" dx="LumiMag_DX_InnerBox/2.0" dy="LumiMag_DY_InnerBox/2.0" dz="LumiMag_DZ/2.0"/>
85-
<coefficient coefficient="0" skew="LumiSweepMag_B"/>
89+
<coefficient coefficient="0" skew="LumiSweepIdealMag_B"/>
8690
</field>
8791

88-
<field name="LumiSpectrometerField" type="MultipoleMagnet">
92+
<field name="LumiAnalyzerField" type="MultipoleMagnet">
8993
<position x="LumiAnalyzerMag_X" y="LumiAnalyzerMag_Y" z="LumiAnalyzerMag_Z"/>
9094
<rotation x="0" y="0" z="0"/>
9195
<shape type="Box" dx="LumiMag_DX_InnerBox/2.0" dy="LumiMag_DY_InnerBox/2.0" dz="LumiMag_DZ/2.0"/>
92-
<coefficient coefficient="0" skew="LumiAnalyzerMag_B"/>
96+
<coefficient coefficient="0" skew="LumiAnalyzerIdealMag_B"/>
97+
</field>
98+
</comment>
99+
100+
<comment> Calculated fields </comment>
101+
<field type="epic_FieldMapB" name="LumiSweeperField" field_type="magnetic" coord_type="BxByBz"
102+
field_map="fieldmaps/LumiDipoleMapping_2023_09_15_XYZ_coords_cm_T.txt"
103+
url="https://github.com/eic/epic-data/raw/5a6bc4cd583fb3330bce475cf25b599661b902ee/LumiDipoleMapping_2023_09_15_XYZ_coords_cm_T.txt"
104+
cache="$DETECTOR_PATH:/opt/detector"
105+
scale="1.0">
106+
<dimensions>
107+
<X step="0.5*cm" min="-7.5*cm" max="7.5*cm" />
108+
<Y step="2.0*cm" min="-34*cm" max="34*cm" />
109+
<Z step="2.0*cm" min="-80*cm" max="80*cm" />
110+
<translationCoord x="LumiSweepMag_X" y="LumiSweepMag_Y" z="LumiSweepMag_Z" />
111+
<rotationField x="0" y="0" z="0" />
112+
</dimensions>
93113
</field>
114+
115+
<field type="epic_FieldMapB" name="LumiAnalyzerField" field_type="magnetic" coord_type="BxByBz"
116+
field_map="fieldmaps/LumiDipoleMapping_2023_09_15_XYZ_coords_cm_T.txt"
117+
url="https://github.com/eic/epic-data/raw/5a6bc4cd583fb3330bce475cf25b599661b902ee/LumiDipoleMapping_2023_09_15_XYZ_coords_cm_T.txt"
118+
cache="$DETECTOR_PATH:/opt/detector"
119+
scale="1.0">
120+
<dimensions>
121+
<X step="0.5*cm" min="-7.5*cm" max="7.5*cm" />
122+
<Y step="2.0*cm" min="-34*cm" max="34*cm" />
123+
<Z step="2.0*cm" min="-80*cm" max="80*cm" />
124+
<translationCoord x="LumiAnalyzerMag_X" y="LumiAnalyzerMag_Y" z="LumiAnalyzerMag_Z" />
125+
<rotationField x="0" y="0" z="0" />
126+
</dimensions>
127+
</field>
128+
94129
</fields>
95130

96131
</lccdd>

compact/fields/marco.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,16 @@
33

44
<lccdd>
55
<fields>
6-
<field type="epic_FieldMapBrBz" name="GlobalSolenoid" field_type="magnetic"
6+
<field type="epic_FieldMapB" name="GlobalSolenoid" field_type="magnetic" coord_type="BrBz"
77
field_map="fieldmaps/MARCO_v.6.4.1.1.3_1.7T_Magnetic_Field_Map_2022_11_14_rad_coords_cm_T.txt"
88
url="https://github.com/eic/epic-data/raw/64b7ca6306b138b7f000e696c82bd8f72db1da56/MARCO_v.6.4.1.1.3_1.7T_Magnetic_Field_Map_2022_11_14_rad_coords_cm_T.txt"
99
cache="$DETECTOR_PATH:/opt/detector"
1010
scale="1.0">
1111
<dimensions>
12-
<transverse step="2.0*cm" rmin="0*cm" rmax="998*cm" />
13-
<longitudinal step="2.0*cm" zmin="-800*cm" zmax="798*cm" />
14-
<translation x="0.0*cm" y="0.0*cm" z="0.0*cm" />
15-
<rotation x="0" y="0" z="0" />
12+
<R step="2.0*cm" min="0*cm" max="998*cm" />
13+
<Z step="2.0*cm" min="-800*cm" max="798*cm" />
14+
<translationCoord x="0.0*cm" y="0.0*cm" z="0.0*cm" />
15+
<rotationField x="0" y="0" z="0" />
1616
</dimensions>
1717
</field>
1818
</fields>

0 commit comments

Comments
 (0)