Skip to content

Fix issue with Dqmin calculation when chrom is used #1133

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

Merged
rdemaria merged 6 commits into from
Aug 23, 2022
Merged

Fix issue with Dqmin calculation when chrom is used #1133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
46e32b8
Fix issue with dqmin changing after several Twiss comands.
tpersson Aug 9, 2022
7c7cdcf
Update of all the tests.
tpersson Aug 10, 2022
a3b0b29
Update plot test.
tpersson Aug 15, 2022
5912d00
Merge branch 'master' of github.com:MethodicalAcceleratorDesign/MAD-X…
tpersson Aug 23, 2022
5bd3409
Just update on changes.md
tpersson Aug 23, 2022
c870ba5
added to the changes.md
tpersson Aug 23, 2022
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
3 changes: 2 additions & 1 deletion Changes.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,13 @@ MAD-X master
* [PR 1095](https://github.com/MethodicalAcceleratorDesign/MAD-X/pull/1095) Implement more robust, optional, PTC DA map output (L. Deniau)
* [PR 1088](https://github.com/MethodicalAcceleratorDesign/MAD-X/pull/1088) Additional explanation bv flag (J. Dilly)
* [PR 1113](https://github.com/MethodicalAcceleratorDesign/MAD-X/pull/1113) Introduce LAST option in INSTALL and MOVE and change default behaviour [Breaking change!] (R. De Maria)
* [PR 1131](https://github.com/MethodicalAcceleratorDesign/MAD-X/pull/1131) Add spin table (P. Skowonronski)
* [PR 1131](https://github.com/MethodicalAcceleratorDesign/MAD-X/pull/1131) Add spin table (T. Persson and P. Skowonronski)
* [PR 1093](https://github.com/MethodicalAcceleratorDesign/MAD-X/pull/1093) Refine aperture refinement(T. Persson)
* [PR 1114](https://github.com/MethodicalAcceleratorDesign/MAD-X/pull/1114) Exact option in translation(J. S. Berg)
* [PR 1111](https://github.com/MethodicalAcceleratorDesign/MAD-X/pull/1111) Ensure that exact_model is set before zero_key is called
* [PR 1125](https://github.com/MethodicalAcceleratorDesign/MAD-X/pull/1125) Make TWISS treat [XY]ROTATION exactly, including the linear and second order map (J. S. Berg)
* [PR 1129](https://github.com/MethodicalAcceleratorDesign/MAD-X/pull/1129) Make track/twiss able to treat a thick solenoid exactly
* [PR 1133](https://github.com/MethodicalAcceleratorDesign/MAD-X/pull/1133) Fix the Dqmin calculation when the CHROM option was used. (T. Persson)

MAD-X release 5.08.01 (2022.02.25)

Expand Down
5 changes: 3 additions & 2 deletions src/twiss.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1250,7 +1250,9 @@ SUBROUTINE twcpin(rt,disp0,r0mat,eflag)
dqmin_rdt_c=0
dqmin_det_c=0
diff_bigger_sum = 0

prev_pos_s = 0
tot_int_length = zero

!--- initialize deltap because twcpin can be called directly from mad_emit
deltap = get_value('probe ','deltap ')

Expand Down Expand Up @@ -3590,7 +3592,6 @@ SUBROUTINE tw_summ(rt,tt)
! call fort_warn('Chromaticity calculation wrong due to coupling, ',&
! 'use chrom option or manual calculation')
! endif

dqmin2 = 4d0*abs(delta_tune_dqmin/twopi)*(abs(dqmin_rdt)/tot_int_length)
dqmin_ph = atan2(aimag(dqmin_rdt), real(dqmin_rdt))
if(diff_bigger_sum/dqmin_rdt_c .gt. 0.1 .and. dqmin2 .ge. 1e-8) then
Expand Down
6 changes: 3 additions & 3 deletions tests/test-c6t-2/test-c6t-2.ref
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@

++++++++++++++++++++++++++++++++++++++++++++
+ MAD-X 5.07.00 (64 bit, Linux) +
+ MAD-X 5.08.01 (64 bit, Linux) +
+ Support: mad@cern.ch, http://cern.ch/mad +
+ Release date: 2021.05.03 +
+ Execution date: 2021.12.10 13:03:53 +
+ Release date: 2022.02.25 +
+ Execution date: 2022.08.10 02:02:16 +
++++++++++++++++++++++++++++++++++++++++++++
TITLE;

Expand Down
10 changes: 5 additions & 5 deletions tests/test-c6t-3/test-c6t-3.ref
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@

++++++++++++++++++++++++++++++++++++++++++++
+ MAD-X 5.08.00 (64 bit, Linux) +
+ MAD-X 5.08.01 (64 bit, Linux) +
+ Support: mad@cern.ch, http://cern.ch/mad +
+ Release date: 2022.01.13 +
+ Execution date: 2022.01.27 20:47:37 +
+ Release date: 2022.02.25 +
+ Execution date: 2022.08.10 02:02:17 +
++++++++++++++++++++++++++++++++++++++++++++
TITLE;

Expand Down Expand Up @@ -68,10 +68,10 @@ orbit: 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0
0 0 0 0

synch_6 synch_8 nflips dqmin
0 0 0 0.0004694091789
0 0 0 0.01110391184

dqmin_phase
3.046048374
-1.665618099
++++++++++++++++++++++++++++
+ c6t version 2.0 +
++++++++++++++++++++++++++++
Expand Down
10 changes: 5 additions & 5 deletions tests/test-c6t-5/afterTrom.twiss.ref
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,12 @@
@ SYNCH_5 %le 0
@ SYNCH_6 %le 0
@ SYNCH_8 %le 0
@ DQMIN %le 4.439824994e-09
@ DQMIN_PHASE %le 3.014430198
@ DQMIN %le 3.082367563e-08
@ DQMIN_PHASE %le 1.495395699
@ TITLE %08s "no-title"
@ ORIGIN %16s "5.08.00 Linux 64"
@ DATE %08s "27/01/22"
@ TIME %08s "20.48.02"
@ ORIGIN %16s "5.08.01 Linux 64"
@ DATE %08s "10/08/22"
@ TIME %08s "05.21.18"
* NAME X Y BETX BETY MUX MUY PT T
$ %s %le %le %le %le %le %le %le %le
"SEQ$START" 0.002907156139 0.0967802983 33.60963339 8.655352869 0 0 0.0001609191543 -0.0007344539478
Expand Down
14 changes: 7 additions & 7 deletions tests/test-c6t-5/test-c6t-5.ref
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@

++++++++++++++++++++++++++++++++++++++++++++
+ MAD-X 5.08.00 (64 bit, Linux) +
+ MAD-X 5.08.01 (64 bit, Linux) +
+ Support: mad@cern.ch, http://cern.ch/mad +
+ Release date: 2022.01.13 +
+ Execution date: 2022.01.27 20:48:02 +
+ Release date: 2022.02.25 +
+ Execution date: 2022.08.10 02:02:39 +
++++++++++++++++++++++++++++++++++++++++++++
circum=120.;

Expand Down Expand Up @@ -200,10 +200,10 @@ orbit: 4.733614E-03 2.906454E-04 1.382562E-01 -7.404873E-03 -9.455828E-04 2
0 0 0 0

synch_6 synch_8 nflips dqmin
0 0 0 4.018958487e-10
0 0 0 3.2621048e-08

dqmin_phase
3.073733918
-1.643084735
betxLOC.BIM=table(twiss,markLOC.BIM,betx);betyLOC.BIM=table(twiss,markLOC.BIM,bety);

alfxLOC.BIM=table(twiss,markLOC.BIM,alfx);alfyLOC.BIM=table(twiss,markLOC.BIM,alfy);
Expand Down Expand Up @@ -301,10 +301,10 @@ orbit: 2.907156E-03 1.362662E-04 9.678030E-02 -8.782200E-03 -7.344539E-04 1
0 0 0 0

synch_6 synch_8 nflips dqmin
0 0 0 4.439824994e-09
0 0 0 3.082367563e-08

dqmin_phase
3.014430198
1.495395699
sixtrack, CAVALL;

++++++++++++++++++++++++++++
Expand Down
10 changes: 5 additions & 5 deletions tests/test-cororbit-2/resultb1.ref
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,12 @@
@ SYNCH_5 %le 0
@ SYNCH_6 %le 0
@ SYNCH_8 %le 0
@ DQMIN %le 5.589320539e-05
@ DQMIN_PHASE %le -0.004795216736
@ DQMIN %le 0.0008807982516
@ DQMIN_PHASE %le 1.330576198
@ TITLE %62s "LHC 6.503 with errors and two beam orbit correction using MADX"
@ ORIGIN %16s "5.08.00 Linux 64"
@ DATE %08s "27/01/22"
@ TIME %08s "20.47.06"
@ ORIGIN %16s "5.08.01 Linux 64"
@ DATE %08s "10/08/22"
@ TIME %08s "02.01.47"
* NAME S X PX Y PY BETX BETY ALFX ALFY
$ %s %le %le %le %le %le %le %le %le %le
"LHCB1$START" 0 -2.742690723e-05 -6.551460929e-07 7.390359315e-05 5.661291191e-06 0.5499365773 0.5500268277 0.0001306539108 -0.0001491748668
Expand Down
10 changes: 5 additions & 5 deletions tests/test-cororbit-2/resultb2.ref
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,12 @@
@ SYNCH_5 %le 0
@ SYNCH_6 %le 0
@ SYNCH_8 %le 0
@ DQMIN %le 3.592259219e-05
@ DQMIN_PHASE %le -2.139583112
@ DQMIN %le 0.00048530873
@ DQMIN_PHASE %le 0.2153112658
@ TITLE %62s "LHC 6.503 with errors and two beam orbit correction using MADX"
@ ORIGIN %16s "5.08.00 Linux 64"
@ DATE %08s "27/01/22"
@ TIME %08s "20.47.07"
@ ORIGIN %16s "5.08.01 Linux 64"
@ DATE %08s "10/08/22"
@ TIME %08s "02.01.48"
* NAME S X PX Y PY BETX BETY ALFX ALFY
$ %s %le %le %le %le %le %le %le %le %le
"LHCB2$START" 0 3.932085492e-05 -8.379744547e-07 -5.420823261e-05 2.537128025e-05 0.5500269101 0.5502488679 0.0001853571231 0.0001739722417
Expand Down
18 changes: 9 additions & 9 deletions tests/test-cororbit-2/test-cororbit-2.ref
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@

++++++++++++++++++++++++++++++++++++++++++++
+ MAD-X 5.08.00 (64 bit, Linux) +
+ MAD-X 5.08.01 (64 bit, Linux) +
+ Support: mad@cern.ch, http://cern.ch/mad +
+ Release date: 2022.01.13 +
+ Execution date: 2022.01.27 20:47:04 +
+ Release date: 2022.02.25 +
+ Execution date: 2022.08.10 02:01:45 +
++++++++++++++++++++++++++++++++++++++++++++
Option, warn,info,echo;

Expand Down Expand Up @@ -315,10 +315,10 @@ orbit: 3.018542E-05 -1.061138E-04 -5.422462E-05 2.539827E-05 0.000000E+00 0
0 0 0 0

synch_6 synch_8 nflips dqmin
0 0 0 3.544246061e-05
0 0 0 0.0005135178106

dqmin_phase
-2.010546174
0.3700923528


Coption,print=1;
Expand Down Expand Up @@ -400,10 +400,10 @@ orbit: -2.742691E-05 -6.551461E-07 7.390359E-05 5.661291E-06 0.000000E+00 0
0 0 0 0

synch_6 synch_8 nflips dqmin
0 0 0 5.589320539e-05
0 0 0 0.0008807982516

dqmin_phase
-0.004795216736
1.330576198
TWISS, file=resultb2, sequence=lhcb2;

enter Twiss module
Expand Down Expand Up @@ -435,10 +435,10 @@ orbit: 3.932085E-05 -8.379745E-07 -5.420823E-05 2.537128E-05 0.000000E+00 0
0 0 0 0

synch_6 synch_8 nflips dqmin
0 0 0 3.592259219e-05
0 0 0 0.00048530873

dqmin_phase
-2.139583112
0.2153112658


removefile, file='fort.61';
Expand Down
10 changes: 5 additions & 5 deletions tests/test-cororbit-4/result1.file.ref
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,12 @@
@ SYNCH_5 %le 0
@ SYNCH_6 %le 0
@ SYNCH_8 %le 0
@ DQMIN %le 7.140634229e-05
@ DQMIN_PHASE %le -0.2927927246
@ DQMIN %le 0.0009816839926
@ DQMIN_PHASE %le 1.158423139
@ TITLE %51s "LHC 6.5 with errors and orbit correction using MADX"
@ ORIGIN %16s "5.08.00 Linux 64"
@ DATE %08s "27/01/22"
@ TIME %08s "20.47.11"
@ ORIGIN %16s "5.08.01 Linux 64"
@ DATE %08s "10/08/22"
@ TIME %08s "02.01.52"
* NAME S X PX Y PY BETX BETY ALFX ALFY
$ %s %le %le %le %le %le %le %le %le %le
"LHCB1$START" 0 -2.464538639e-06 -6.064157593e-06 1.416703348e-06 1.81502452e-06 0.5507483724 0.5494961845 -0.000219161088 0.0008482072954
Expand Down
10 changes: 5 additions & 5 deletions tests/test-cororbit-4/result2.file.ref
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,12 @@
@ SYNCH_5 %le 0
@ SYNCH_6 %le 0
@ SYNCH_8 %le 0
@ DQMIN %le 7.521400665e-05
@ DQMIN_PHASE %le -0.2570398035
@ DQMIN %le 0.00100091521
@ DQMIN_PHASE %le 1.19859319
@ TITLE %51s "LHC 6.5 with errors and orbit correction using MADX"
@ ORIGIN %16s "5.08.00 Linux 64"
@ DATE %08s "27/01/22"
@ TIME %08s "20.47.12"
@ ORIGIN %16s "5.08.01 Linux 64"
@ DATE %08s "10/08/22"
@ TIME %08s "02.01.53"
* NAME S X PX Y PY BETX BETY ALFX ALFY
$ %s %le %le %le %le %le %le %le %le %le
"LHCB1$START" 0 -0.0005000241726 -1.023773324e-05 3.847989232e-06 0.0001383022072 0.5504990997 0.5495413848 -0.0003925343497 0.000930030752
Expand Down
10 changes: 5 additions & 5 deletions tests/test-cororbit-4/result3.file.ref
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,12 @@
@ SYNCH_5 %le 0
@ SYNCH_6 %le 0
@ SYNCH_8 %le 0
@ DQMIN %le 7.5018411e-05
@ DQMIN_PHASE %le -0.2563681292
@ DQMIN %le 0.001001090442
@ DQMIN_PHASE %le 1.199507824
@ TITLE %51s "LHC 6.5 with errors and orbit correction using MADX"
@ ORIGIN %16s "5.08.00 Linux 64"
@ DATE %08s "27/01/22"
@ TIME %08s "20.47.13"
@ ORIGIN %16s "5.08.01 Linux 64"
@ DATE %08s "10/08/22"
@ TIME %08s "02.01.54"
* NAME S X PX Y PY BETX BETY ALFX ALFY
$ %s %le %le %le %le %le %le %le %le %le
"LHCB1$START" 0 -0.0005007148109 -7.334842244e-06 4.787692103e-06 0.0001383022599 0.5506409508 0.5495110803 -0.0003435926903 0.0008276076375
Expand Down
30 changes: 15 additions & 15 deletions tests/test-cororbit-4/test-cororbit-4.ref
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@

++++++++++++++++++++++++++++++++++++++++++++
+ MAD-X 5.08.00 (64 bit, Linux) +
+ MAD-X 5.08.01 (64 bit, Linux) +
+ Support: mad@cern.ch, http://cern.ch/mad +
+ Release date: 2022.01.13 +
+ Execution date: 2022.01.27 20:47:07 +
+ Release date: 2022.02.25 +
+ Execution date: 2022.08.10 02:01:48 +
++++++++++++++++++++++++++++++++++++++++++++
Title, "LHC 6.5 with errors and orbit correction using MADX";

Expand Down Expand Up @@ -123,10 +123,10 @@ orbit: -5.000008E-04 -2.358324E-09 8.002250E-12 1.425000E-04 0.000000E+00 0
0 0 0 0

synch_6 synch_8 nflips dqmin
0 0 0 9.717485254e-10
0 0 0 2.083008962e-08

dqmin_phase
0.3313954679
1.861239221


// Now a machine with the modified bumps as another target orbit
Expand Down Expand Up @@ -175,10 +175,10 @@ orbit: -5.000008E-04 -2.426804E-09 1.748509E-12 1.425000E-04 0.000000E+00 0
0 0 0 0

synch_6 synch_8 nflips dqmin
0 0 0 1.019256948e-09
0 0 0 2.131673334e-08

dqmin_phase
0.2939793082
1.842247831


// Switch off again the bumps and mis-align the machine
Expand Down Expand Up @@ -240,10 +240,10 @@ orbit: -3.439240E-04 -7.343209E-05 2.348868E-04 2.504445E-05 0.000000E+00 0
0 0 0 0

synch_6 synch_8 nflips dqmin
0 0 0 5.765135445e-05
0 0 0 0.001928753113

dqmin_phase
1.939141988
-2.833209211


// Prepare first correction to zero orbit
Expand Down Expand Up @@ -2038,10 +2038,10 @@ orbit: -2.464539E-06 -6.064158E-06 1.416703E-06 1.815025E-06 0.000000E+00 0
0 0 0 0

synch_6 synch_8 nflips dqmin
0 0 0 7.140634229e-05
0 0 0 0.0009816839926

dqmin_phase
-0.2927927246
1.158423139


!******************************************************************
Expand Down Expand Up @@ -3813,10 +3813,10 @@ orbit: -5.000242E-04 -1.023773E-05 3.847989E-06 1.383022E-04 0.000000E+00 0
0 0 0 0

synch_6 synch_8 nflips dqmin
0 0 0 7.521400665e-05
0 0 0 0.00100091521

dqmin_phase
-0.2570398035
1.19859319


!******************************************************************
Expand Down Expand Up @@ -5596,10 +5596,10 @@ orbit: -5.007148E-04 -7.334842E-06 4.787692E-06 1.383023E-04 0.000000E+00 0
0 0 0 0

synch_6 synch_8 nflips dqmin
0 0 0 7.5018411e-05
0 0 0 0.001001090442

dqmin_phase
-0.2563681292
1.199507824


!******************************************************************
Expand Down
10 changes: 5 additions & 5 deletions tests/test-cororbit/result.file.ref
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,12 @@
@ SYNCH_5 %le 0
@ SYNCH_6 %le 0
@ SYNCH_8 %le 0
@ DQMIN %le 7.5018411e-05
@ DQMIN_PHASE %le -0.2563681292
@ DQMIN %le 0.001001090442
@ DQMIN_PHASE %le 1.199507824
@ TITLE %51s "LHC 6.5 with errors and orbit correction using MADX"
@ ORIGIN %16s "5.08.00 Linux 64"
@ DATE %08s "27/01/22"
@ TIME %08s "20.47.03"
@ ORIGIN %16s "5.08.01 Linux 64"
@ DATE %08s "10/08/22"
@ TIME %08s "02.01.45"
* NAME S X PX Y PY BETX BETY ALFX ALFY
$ %s %le %le %le %le %le %le %le %le %le
"LHCB1$START" 0 -0.0005007148109 -7.334842244e-06 4.787692103e-06 0.0001383022599 0.5506409508 0.5495110803 -0.0003435926903 0.0008276076375
Expand Down
Loading