Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Implement lumi dipole B mapping #527

Merged
merged 34 commits into from
Oct 17, 2023
Merged

Implement lumi dipole B mapping #527

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
0e0872d
Shift lumi system closer to IP due to proximity with electron CRAB ma…
dhevang Sep 18, 2023
31e1e3d
new B mapping code, which can handle R-Z and X-Y-Z coordinate systems.
dhevang Sep 18, 2023
ca0b7a0
Change name of ideal lumi B field values.
dhevang Sep 18, 2023
dc3a893
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Sep 18, 2023
b691ccc
Merge branch 'main' into Insert_LumiPS_B_FieldMap
dhevang Sep 18, 2023
bb516a3
Postpone minor changes to another future PR.
dhevang Sep 18, 2023
1be7ce2
Merge branch 'main' into Insert_LumiPS_B_FieldMap
dhevang Sep 20, 2023
14a2ef4
Change comment syntax in xml file.
dhevang Sep 22, 2023
c161030
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Sep 22, 2023
b785e19
Changes as requested in the PR.
dhevang Sep 25, 2023
184a16b
Merge branch 'Insert_LumiPS_B_FieldMap' of github.com:eic/epic into I…
dhevang Sep 25, 2023
227eb2d
Merge branch 'main' into Insert_LumiPS_B_FieldMap
dhevang Sep 27, 2023
9f53900
Remove transformation of the B field for the BrBz case.
dhevang Sep 29, 2023
4fbbb8f
WIP. Add field vector rotation separate from field coord translation…
dhevang Oct 6, 2023
346d405
Merge branch 'main' into Insert_LumiPS_B_FieldMap
dhevang Oct 6, 2023
c0cafbb
Bug fix: wrong usage of std::remquof.
dhevang Oct 6, 2023
dba9621
Swap Bx and By components in new file as per the recent bug fix.
dhevang Oct 9, 2023
835566e
Shift lumi system closer to IP due to proximity with electron CRAB ma…
dhevang Sep 18, 2023
739f103
new B mapping code, which can handle R-Z and X-Y-Z coordinate systems.
dhevang Sep 18, 2023
297827a
Change name of ideal lumi B field values.
dhevang Sep 18, 2023
46360c7
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Sep 18, 2023
c8ec64b
Postpone minor changes to another future PR.
dhevang Sep 18, 2023
019992c
Change comment syntax in xml file.
dhevang Sep 22, 2023
ae0783f
Changes as requested in the PR.
dhevang Sep 25, 2023
5171008
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Sep 22, 2023
069a65c
Remove transformation of the B field for the BrBz case.
dhevang Sep 29, 2023
bb53bbb
WIP. Add field vector rotation separate from field coord translation…
dhevang Oct 6, 2023
eebc4a6
Bug fix: wrong usage of std::remquof.
dhevang Oct 6, 2023
6903dfd
Swap Bx and By components in new file as per the recent bug fix.
dhevang Oct 9, 2023
7991c23
Merge branch 'Insert_LumiPS_B_FieldMap' of github.com:eic/epic into I…
dhevang Oct 9, 2023
81fffa0
Merge branch 'main' into Insert_LumiPS_B_FieldMap
dhevang Oct 10, 2023
6a2e18c
Increase grid sizes by 1 in order to prevent seg faults for cases at …
dhevang Oct 11, 2023
7a2d306
Merge branch 'main' into Insert_LumiPS_B_FieldMap
dhevang Oct 12, 2023
a412033
Merge branch 'main' into Insert_LumiPS_B_FieldMap
veprbl Oct 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 38 additions & 4 deletions compact/far_backward/lumi/lumi_magnets.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,20 +77,54 @@ Construct the sweeper and analyzer dipole magnets for the luminosity subsystem.
Detailed field map to be inserted later.
</comment>


<fields>
<field name="LumiSweeperField" type="MultipoleMagnet">

<comment> Ideal fields </comment>
<!--<field name="LumiSweeperField" type="MultipoleMagnet">
dhevang marked this conversation as resolved.
Show resolved Hide resolved
<position x="LumiSweepMag_X" y="LumiSweepMag_Y" z="LumiSweepMag_Z"/>
<rotation x="0" y="0" z="0"/>
<shape type="Box" dx="LumiMag_DX_InnerBox/2.0" dy="LumiMag_DY_InnerBox/2.0" dz="LumiMag_DZ/2.0"/>
<coefficient coefficient="0" skew="LumiSweepMag_B"/>
<coefficient coefficient="0" skew="LumiSweepIdealMag_B"/>
</field>

<field name="LumiSpectrometerField" type="MultipoleMagnet">
<field name="LumiAnalyzerField" type="MultipoleMagnet">
<position x="LumiAnalyzerMag_X" y="LumiAnalyzerMag_Y" z="LumiAnalyzerMag_Z"/>
<rotation x="0" y="0" z="0"/>
<shape type="Box" dx="LumiMag_DX_InnerBox/2.0" dy="LumiMag_DY_InnerBox/2.0" dz="LumiMag_DZ/2.0"/>
<coefficient coefficient="0" skew="LumiAnalyzerMag_B"/>
<coefficient coefficient="0" skew="LumiAnalyzerIdealMag_B"/>
</field>
-->

<comment> Calculated fields </comment>
<field type="epic_FieldMapB" name="LumiSweeperField" field_type="magnetic" coord_type="BxByBz"
field_map="fieldmaps/LumiDipoleMapping_2023_09_15_XYZ_coords_cm_T.txt"
url="https://github.com/eic/epic-data/raw/5a6bc4cd583fb3330bce475cf25b599661b902ee/LumiDipoleMapping_2023_09_15_XYZ_coords_cm_T.txt"
cache="$DETECTOR_PATH:/opt/detector"
scale="1.0">
<dimensions>
<X step="0.5*cm" min="-7.5*cm" max="7.5*cm" />
<Y step="2.0*cm" min="-34*cm" max="34*cm" />
<Z step="2.0*cm" min="-80*cm" max="80*cm" />
<translation x="LumiSweepMag_X" y="LumiSweepMag_Y" z="LumiSweepMag_Z" />
<rotation x="0" y="0" z="0" />
</dimensions>
</field>

<field type="epic_FieldMapB" name="LumiAnalyzerField" field_type="magnetic" coord_type="BxByBz"
field_map="fieldmaps/LumiDipoleMapping_2023_09_15_XYZ_coords_cm_T.txt"
url="https://github.com/eic/epic-data/raw/5a6bc4cd583fb3330bce475cf25b599661b902ee/LumiDipoleMapping_2023_09_15_XYZ_coords_cm_T.txt"
cache="$DETECTOR_PATH:/opt/detector"
scale="1.0">
<dimensions>
<X step="0.5*cm" min="-7.5*cm" max="7.5*cm" />
<Y step="2.0*cm" min="-34*cm" max="34*cm" />
<Z step="2.0*cm" min="-80*cm" max="80*cm" />
<translation x="LumiAnalyzerMag_X" y="LumiAnalyzerMag_Y" z="LumiAnalyzerMag_Z" />
<rotation x="0" y="0" z="0" />
</dimensions>
</field>

</fields>

</lccdd>
6 changes: 3 additions & 3 deletions compact/fields/marco.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@

<lccdd>
<fields>
<field type="epic_FieldMapBrBz" name="GlobalSolenoid" field_type="magnetic"
<field type="epic_FieldMapB" name="GlobalSolenoid" field_type="magnetic" coord_type="BrBz"
field_map="fieldmaps/MARCO_v.6.4.1.1.3_1.7T_Magnetic_Field_Map_2022_11_14_rad_coords_cm_T.txt"
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"
cache="$DETECTOR_PATH:/opt/detector"
scale="1.0">
<dimensions>
<transverse step="2.0*cm" rmin="0*cm" rmax="998*cm" />
<longitudinal step="2.0*cm" zmin="-800*cm" zmax="798*cm" />
<R step="2.0*cm" min="0*cm" max="998*cm" />
<Z step="2.0*cm" min="-800*cm" max="798*cm" />
<translation x="0.0*cm" y="0.0*cm" z="0.0*cm" />
<rotation x="0" y="0" z="0" />
</dimensions>
Expand Down
Loading