Skip to content

Commit

Permalink
Update the tests to pass
Browse files Browse the repository at this point in the history
  • Loading branch information
@jgray-19
jgray-19 committed Dec 6, 2024
1 parent f9c256f commit daa3146
Show file tree
Hide file tree
Showing 15 changed files with 9,160 additions and 9,160 deletions.
2 changes: 1 addition & 1 deletion tests/inputs/lhc_rdts/MAD_helpers.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ def add_magnet_strengths(mad: MAD, beam: int, order: int, is_skew: bool) -> None
assert order in [2, 3], "Order must be 2 or 3"
if order == 2:
s_or_o = "s"
strength = 1e-3
strength = 1e-4
else:
s_or_o = "o"
strength = 1e-2
Expand Down
3,954 changes: 1,977 additions & 1,977 deletions tests/inputs/lhc_rdts/analysis/lin_files/tbt_data_b1_oct.sdds.ampsx
View file

Large diffs are not rendered by default.

3,954 changes: 1,977 additions & 1,977 deletions tests/inputs/lhc_rdts/analysis/lin_files/tbt_data_b1_oct.sdds.ampsy
View file

Large diffs are not rendered by default.

2,900 changes: 1,450 additions & 1,450 deletions tests/inputs/lhc_rdts/analysis/lin_files/tbt_data_b1_oct.sdds.freqsx
View file

Large diffs are not rendered by default.

2,852 changes: 1,426 additions & 1,426 deletions tests/inputs/lhc_rdts/analysis/lin_files/tbt_data_b1_oct.sdds.freqsy
View file

Large diffs are not rendered by default.

1,128 changes: 564 additions & 564 deletions tests/inputs/lhc_rdts/analysis/lin_files/tbt_data_b1_oct.sdds.linx
View file

Large diffs are not rendered by default.

1,128 changes: 564 additions & 564 deletions tests/inputs/lhc_rdts/analysis/lin_files/tbt_data_b1_oct.sdds.liny
View file

Large diffs are not rendered by default.

790 changes: 395 additions & 395 deletions tests/inputs/lhc_rdts/data/model_ng_b1_oct.tfs
View file

Large diffs are not rendered by default.

794 changes: 397 additions & 397 deletions tests/inputs/lhc_rdts/data/model_ng_b1_sext.tfs
View file

Large diffs are not rendered by default.

790 changes: 395 additions & 395 deletions tests/inputs/lhc_rdts/data/model_ng_b2_sext.tfs
View file

Large diffs are not rendered by default.

Binary file modified tests/inputs/lhc_rdts/data/tbt_data_b1_sext.sdds
View file
Binary file not shown.
6 changes: 3 additions & 3 deletions tests/inputs/lhc_rdts/model_b1_sext/twiss.dat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
@ TITLE %s "LHCB1"
@ ORIGIN %s "MAD 1.0.0 Linux 64"
@ DATE %s "05/12/24"
@ TIME %s "13:55:31"
@ TIME %s "21:33:15"
@ REFCOL %s "name"
@ DIRECTION %le 1.0
@ OBSERVE %le 1.0
Expand All @@ -13,8 +13,8 @@
@ Q1 %le 62.28
@ Q2 %le 60.31
@ Q3 %le 0.0
@ DQ1 %le -192.5839202
@ DQ2 %le -190.3892348
@ DQ1 %le -192.5784017
@ DQ2 %le -190.4013431
@ DQ3 %le 0.0
@ ALFAP %le 0.0003484306389
@ ETAP %le 0.0003440832092
Expand Down
6 changes: 3 additions & 3 deletions tests/inputs/lhc_rdts/model_b1_sext/twiss_ac.dat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
@ TITLE %s "LHCB1"
@ ORIGIN %s "MAD 1.0.0 Linux 64"
@ DATE %s "05/12/24"
@ TIME %s "13:55:30"
@ TIME %s "21:33:14"
@ REFCOL %s "name"
@ DIRECTION %le 1.0
@ OBSERVE %le 1.0
Expand All @@ -13,8 +13,8 @@
@ Q1 %le 62.28
@ Q2 %le 60.31
@ Q3 %le 0.0
@ DQ1 %le -192.5839202
@ DQ2 %le -190.3892348
@ DQ1 %le -192.5784017
@ DQ2 %le -190.4013431
@ DQ3 %le 0.0
@ ALFAP %le 0.0003484306389
@ ETAP %le 0.0003440832092
Expand Down
14 changes: 7 additions & 7 deletions tests/inputs/lhc_rdts/model_b1_sext/twiss_elements.dat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
@ TITLE %s "LHCB1"
@ ORIGIN %s "MAD 1.0.0 Linux 64"
@ DATE %s "05/12/24"
@ TIME %s "13:55:29"
@ TIME %s "21:33:13"
@ REFCOL %s "name"
@ DIRECTION %le 1.0
@ OBSERVE %le 0.0
Expand All @@ -13,8 +13,8 @@
@ Q1 %le 62.28
@ Q2 %le 60.31
@ Q3 %le 0.0
@ DQ1 %le -192.5839202
@ DQ2 %le -190.3892348
@ DQ1 %le -192.5784017
@ DQ2 %le -190.4013431
@ DQ3 %le 0.0
@ ALFAP %le 0.0003484306389
@ ETAP %le 0.0003440832092
Expand Down Expand Up @@ -2359,8 +2359,8 @@ $ %s %s %le
"DFBXE.3L5" "placeholder" 10134.89365 3490.31581 -5.633091563 7045.552063 -46.88247581 22.85992943 22.13949024 0 0 0 0 0 0 0.01976268338 3.309726808e-05 0 0 0 0 0 0 0 0 0 0
"MCOSX.3L5" "multipole" 10135.47865 3496.909737 -5.638577615 7100.51137 -47.06505844 22.85995608 22.1395034 0 0 0 0 0 0 0.01978204528 3.309726808e-05 0 0 0 0 0 0 0 0 0 0
"MCOX.3L5" "multipole" 10135.47865 3496.909737 -5.638577615 7100.51137 -47.06505844 22.85995608 22.1395034 0 0 0 0 0 0 0.01978204528 3.309726808e-05 0 0 0 0 0 0 0 0 0 0
"MCSSX.3L5" "multipole" 10135.47865 3496.909737 -5.638577615 7100.51137 -47.06505844 22.85995608 22.1395034 0 0 0 0 0 0 0.01978204528 3.309726808e-05 0 0 0 0 0 0 0 -0.000132 0 0
"MCSX.3L5" "multipole" 10135.96165 3502.35879 -5.643107126 7146.049028 -47.21580615 22.85997805 22.13951419 0 0 0 0 0 0 0.01979803126 3.309726808e-05 0 0 0 -0.000576 0 0 0 0 0 0
"MCSSX.3L5" "multipole" 10135.47865 3496.909737 -5.638577615 7100.51137 -47.06505844 22.85995608 22.1395034 0 0 0 0 0 0 0.01978204528 3.309726808e-05 0 0 0 0 0 0 0 -1.32e-05 0 0
"MCSX.3L5" "multipole" 10135.96165 3502.35879 -5.643107126 7146.049028 -47.21580615 22.85997805 22.13951419 0 0 0 0 0 0 0.01979803126 3.309726808e-05 0 0 0 -5.76e-05 0 0 0 0 0 0
"MCTX.3L5" "multipole" 10135.96165 3502.35879 -5.643107126 7146.049028 -47.21580615 22.85997805 22.13951419 0 0 0 0 0 0 0.01979803126 3.309726808e-05 0 0 0 0 0 0 0 0 0 0
"MQXA.3L5" "quadrupole" 10142.81065 5003.437246 -256.3879397 5401.2256 294.2050707 22.86025642 22.13967801 0 0 0 0 0 0 0.02367206898 0.001214006817 0 0 -0.05591480544 0 0 0 0 0 0 0
"MQSX.3L5" "quadrupole" 10143.27915 5246.556461 -262.5431505 5129.072933 286.6970995 22.86027097 22.13969218 0 0 0 0 0 0 0.02424083117 0.001214006817 0 0 0 0 0 0 0 0 0 0
Expand Down Expand Up @@ -5466,11 +5466,11 @@ $ %s %s %le
"TASB.3R1" "collimator" 23565.31162 5355.703836 269.6673877 5045.37961 -295.1661842 54.70978474 53.34980391 0 0 0 0 0 0 -0.0257121581 0.001297431237 0 0 0 0 0 0 0 0 0 0
"MQSX.3R1" "quadrupole" 23566.08912 4944.579232 259.1102381 5514.801696 -308.5921253 54.70980879 53.34982737 0 0 0 0 0 0 -0.02470340531 0.001297431237 0 0 0 0 0 0 0 0 0 0
"MQXA.3R1" "quadrupole" 23572.70462 3248.249661 18.64012541 7658.494241 37.40050794 54.71008819 53.34997946 0 0 0 0 0 0 -0.02000198906 0.0001183722415 0 0 -0.05465905513 0 0 0 0 0 0 0
"MCSX.3R1" "multipole" 23573.18362 3230.417034 18.58874093 7622.706491 37.31295767 54.71011173 53.34998944 0 0 0 0 0 0 -0.01994528876 0.0001183722415 0 0 0 0.000576 0 0 0 0 0 0
"MCSX.3R1" "multipole" 23573.18362 3230.417034 18.58874093 7622.706491 37.31295767 54.71011173 53.34998944 0 0 0 0 0 0 -0.01994528876 0.0001183722415 0 0 0 5.76e-05 0 0 0 0 0 0
"MCTX.3R1" "multipole" 23573.18362 3230.417034 18.58874093 7622.706491 37.31295767 54.71011173 53.34998944 0 0 0 0 0 0 -0.01994528876 0.0001183722415 0 0 0 0 0 0 0 0 0 0
"MCOSX.3R1" "multipole" 23573.66662 3212.485336 18.53692736 7586.704813 37.22467629 54.71013559 53.34999955 0 0 0 0 0 0 -0.01988811497 0.0001183722415 0 0 0 0 0 0 0 0 0 0
"MCOX.3R1" "multipole" 23573.66662 3212.485336 18.53692736 7586.704813 37.22467629 54.71013559 53.34999955 0 0 0 0 0 0 -0.01988811497 0.0001183722415 0 0 0 0 0 0 0 0 0 0
"MCSSX.3R1" "multipole" 23573.66662 3212.485336 18.53692736 7586.704813 37.22467629 54.71013559 53.34999955 0 0 0 0 0 0 -0.01988811497 0.0001183722415 0 0 0 0 0 0 0 0.000132 0 0
"MCSSX.3R1" "multipole" 23573.66662 3212.485336 18.53692736 7586.704813 37.22467629 54.71013559 53.34999955 0 0 0 0 0 0 -0.01988811497 0.0001183722415 0 0 0 0 0 0 0 1.32e-05 0 0
"DFBXB.3R1" "placeholder" 23577.34162 3077.687729 18.14269367 7315.571963 36.55297015 54.7103216 53.35007806 0 0 0 0 0 0 -0.01945309698 0.0001183722415 0 0 0 0 0 0 0 0 0 0
"BPMSY.4R1.B1" "monitor" 23577.62412 3067.445668 18.11238863 7294.934121 36.5013356 54.71033624 53.35008421 0 0 0 0 0 0 -0.01941965682 0.0001183722415 0 0 0 0 0 0 0 0 0 0
"MBXW.A4R1" "rbend" 23582.39162 2897.182291 17.60095758 6951.047989 35.63001776 54.71059076 53.35019077 0 0 0 0 0 0 -0.01917521498 -6.980294718e-05 0 0 0 0 0 0 0 0 0 0
Expand Down
2 changes: 1 addition & 1 deletion tests/inputs/lhc_rdts/rdt_constants.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
"f3010_y",
]

NTURNS = 1250
NTURNS = 1000

MODEL_NG_PREFIX = "model_ng"
MODEL_X_PREFIX = "model_x"
Expand Down

0 comments on commit daa3146

Please sign in to comment.