PTC Improvements and BugFixes#1200

Merged

rdemaria merged 118 commits into

MethodicalAcceleratorDesign:masterfrom

jgray-19:testing_ptc

Oct 19, 2023

Commits on Apr 13, 2023

Change to use old_thick_bend, stop n_wedge rotations and add comment on extraneous fringe call
jgray-19
committed
Add flush to daprint, for debug output cleanliness
jgray-19
committed
Change the output of the damap so that monomials are clearer when dealing with orders with two digits
jgray-19
committed
Change the output of the damap so that monomials are clearer when dealing with orders with two digits
jgray-19
committed
Add f1 (va), f2(vs), to allow use of FRINGE2QUAD. Allow the ability to use fint and fintx (fint2) separately. Comment out return so that rbend can have the rest of the attributes set
jgray-19
committed
Add attributes to the sbend, rbend, quadrupole, sextupole and octupole to be able to use more fringes in PTC
jgray-19
committed
Add method 8, add highest_fringe (fringe_max). Add fringe communication to rbend, sbend, quadrupole, sextupole and octupole. Stop solenoid being set to a marker in case of knl and ksl
jgray-19
committed

Commits on Apr 18, 2023

Improve knl and ksl for sextupole and quadrupole#
jgray-19
committed

Commits on Apr 19, 2023

Add fix to rbend so that a tilt is actually performed
jgray-19
committed
Added and tested solenoid in a multipole
jgray-19
committed
Added no_cavity_totalpath for rfmultipole and crabcavity
jgray-19
committed
Added fix for multipole component in the rf multipole
jgray-19
committed
Add a tilt to the drift
jgray-19
committed
Allow tilt in elseparator to be communicate to ptc
jgray-19
committed

Commits on Apr 20, 2023

Add e1, e2 to sextupole and quadrupole and ksi to the multipole
jgray-19
committed
Add e1, e2 to the quadrupole and sextupole
jgray-19
committed

Commits on Apr 21, 2023

Add e1, e2 to octupole, allow k(n/s)l[3] in multipole part of octupole, add k0 and k0s to octupole. Improve solenoid to act like multipole when l=0 and thick with l~=0
jgray-19
committed

Commits on May 4, 2023

restore edge_true_parallel, improve debugging of ADJUST_TIME_CAV4P
jgray-19
committed
restore edge_true_parallel
jgray-19
committed
Restore use of likemad for edge_true_parallel
jgray-19
committed
restore edge_true_parallel
jgray-19
committed
Merge branch 'MethodicalAcceleratorDesign:master' into testing_ptc
jgray-19
authored

Commits on May 23, 2023

Add e1, e2 to octupole and fringe_max to solenoid
jgray-19
committed

Commits on Jun 2, 2023

Change fringe_max to frngmax, as this has also been changed in MAD-NG
jgray-19
committed

Commits on Jun 6, 2023

Allow charge from beam to be correctly passed to PTC
jgray-19
committed
Add local undefined model check to quadrupole
jgray-19
committed
Add missing bv flag for quadrupole, sextupole, octupole
jgray-19
committed

Commits on Jun 7, 2023

Commits on Jun 20, 2023

Merge branch 'MethodicalAcceleratorDesign:master' into testing_ptc
jgray-19
authored

Commits on Jun 22, 2023

Fix inconsistency in sector nmul max
jgray-19
committed

Commits on Jun 23, 2023

Merge branch 'testing_ptc' of https://github.com/jgray-19/MAD-X into testing_ptc
jgray-19
committed

Commits on Jun 27, 2023

Fix changeref
jgray-19
committed
Added normal_0123(0) and skew_0123(0) to the quadrupole strength
jgray-19
committed
Add forgotten sk0s in madx_ptc_module
jgray-19
committed

Commits on Jun 30, 2023

Commits on Jul 1, 2023

Merge branch 'MethodicalAcceleratorDesign:master' into testing_ptc
jgray-19
authored

Commits on Jul 3, 2023

Move position of addition of k0 and k0s, so that it is immediately after call summ_...
jgray-19
committed

Commits on Jul 5, 2023

Revert "Fix changeref"
jgray-19
committed
Fix changeref in the MADX way
jgray-19
committed

Commits on Jul 7, 2023

Commits on Jul 11, 2023

Add warning to ptc_normal of sector nmul max lower than required
jgray-19
committed
Add warning to ptc_track of sector nmul max lower than required
jgray-19
committed

Commits on Jul 12, 2023

Commits on Jul 20, 2023

Comment out debug print statements
jgray-19
committed

Commits on Jul 21, 2023

Make spacing more consistent
jgray-19
committed
Improve multipole solenoid warning
jgray-19
committed
Remove troublesome nmul that is not required
jgray-19
committed

Commits on Jul 24, 2023

Comment out print
jgray-19
committed
Move nocharge from option to ptc_setswitch
jgray-19
committed
Remove comments
jgray-19
committed

Commits on Jul 25, 2023

Rearrange the added components to the dictionary and remove rf-multipole components (useless)
jgray-19
committed
Fix negated skew component and removed comments
jgray-19
committed
Convert rbend warning to rbend error
jgray-19
committed
Fix thin solenoid in MAD-X
jgray-19
committed

Commits on Aug 4, 2023

Fringe check improvement and remove print
jgray-19
committed

Commits on Aug 8, 2023

Simplify how fringe attributes are retrieved
jgray-19
committed

Commits on Aug 10, 2023

Add debug output to misalignment
jgray-19
committed

Commits on Aug 15, 2023

Set default rbend to be curved
jgray-19
committed
Add documentation on many of the changes PTC being made in the pull request
jgray-19
committed
Revert absolute error so 7 tests are run, instead of failing
jgray-19
committed
Revert update test for old bend
jgray-19
committed
Revert revert of non-ptc test
jgray-19
committed
Merge branch 'fix_ptc_tests' of https://github.com/jgray-19/MAD-X into testing_ptc
jgray-19
committed
Whitespace changes to so numdiff does not get confused
jgray-19
committed
Fix incorrect display of charge being used in PTC
jgray-19
committed

Commits on Aug 16, 2023

Add frngmax to kickers and multipole
jgray-19
committed
Convert solenoid to multipole if `ksi=0 | lrad=0`
jgray-19
committed
Update test ref based on updated behaviour
jgray-19
committed
Update default value for quadrupoles to be -1 not 0
jgray-19
committed
Revert "Revert update test for old bend"
jgray-19
committed
Add whitespace changes to prevent numdiff from getting confused
jgray-19
committed
Correctly Implement nocharge into MADX-PTC
jgray-19
committed
Update ptc-track after implementation of nocharge
jgray-19
committed
Edit the diamond sequence to remove legacy rbend flag
jgray-19
committed
Whitespace changes to fort.18 ref
jgray-19
committed
Fix nocharge default value
jgray-19
committed
Add frng_max to (v|h)acdipole
jgray-19
committed
Update solenoid conversion from marker to multipole
jgray-19
committed
Sector nmul max update, due to fixed inconsistency
jgray-19
committed
Revert "Whitespace changes to fort.18 ref"
jgray-19
committed
Revert "Add whitespace changes to prevent numdiff from getting confused"
jgray-19
committed
Revert "Whitespace changes to so numdiff does not get confused"
jgray-19
committed
Revert non madxprint changes for backward compatibility
jgray-19
committed
Change charge output to be actual charge PTC receives
jgray-19
committed
Update numbers (1e-10 error) due to n_wedge=0 change
jgray-19
committed

Commits on Aug 23, 2023

Make different debug depending on entry and exit of misalignment
jgray-19
committed

Commits on Sep 5, 2023

Add exception to ptc_align for patches (is_permalign thinks translate needs misalignment)
jgray-19
committed

Commits on Sep 28, 2023

Commits on Sep 30, 2023

Merge branch 'master' of https://github.com/jgray-19/MAD-X into testing_ptc
jgray-19
committed

Commits on Oct 15, 2023

Revert 'Fix thin solenoid in MAD-X' as the tests indicate convergence is faster with the old version
jgray-19
committed

Commits on Oct 18, 2023

Make fintx -1 in machine clear in the tfs file
jgray-19
committed
Add more beta min max errors
jgray-19
committed