merge dev to master for 0.9.7#410

Merged

ldeniau merged 1177 commits intomasterfrom

Oct 20, 2023

This pull request is big! We're only showing the most recent 250 commits

Commits on Jul 31, 2023

Update yrotation of bend_wedge

jgray-19
authored and
jgray-19
committed
Add mang to mflow

jgray-19
authored and
jgray-19
committed
Follow cpp and remove _pc from bx, by multiplication

jgray-19
authored and
jgray-19
committed
Fix teapot 2 number for D

jgray-19
authored and
jgray-19
committed
Make fringe explicitly fnil in multipole (so nil value is not called)

jgray-19
authored and
jgray-19
committed
Rename elm.the to elm.theta

jgray-19
authored and
jgray-19
committed
Merge pull request #366 from jgray-19/fix_bend_wedge
ldeniau
authored
Merge pull request #368 from jgray-19/mflw_fix
ldeniau
authored
Merge pull request #369 from jgray-19/rfmult_fix
ldeniau
authored
Merge pull request #370 from jgray-19/teapot_fix
ldeniau
authored
Merge pull request #371 from jgray-19/mult_fixes
ldeniau
authored
Merge pull request #372 from jgray-19/changeref_fix
ldeniau
authored

Commits on Aug 1, 2023

Fix edir for quad_thicks

jgray-19
authored and
jgray-19
committed
Fix translate

jgray-19
authored and
jgray-19
committed
Fix quadrupole PTC model

jgray-19
authored and
jgray-19
committed
Fix KMK for strexgen

jgray-19
authored and
jgray-19
committed
Fix mult fringe

jgray-19
authored and
jgray-19
committed
Fix charge dependancy of qsad_fringe

jgray-19
authored and
jgray-19
committed
Merge pull request #373 from jgray-19/quad_fixes
ldeniau
authored
Merge pull request #374 from jgray-19/translate_fix
ldeniau
authored
Merge pull request #375 from jgray-19/ptcmodel_fixes
ldeniau
authored
Merge pull request #376 from jgray-19/mult_fringe
ldeniau
authored
Merge pull request #377 from jgray-19/fix_qsad
ldeniau
authored

Commits on Aug 2, 2023

Add third argument to patches to match trkfun typedef

jgray-19
authored and
jgray-19
committed
Fix tilt

jgray-19
authored and
jgray-19
committed
Fix tilt for cpp

jgray-19
authored and
jgray-19
committed
Fix patches not receiving data and changeref multiplying by edir not sdir

jgray-19
authored and
jgray-19
committed
Fix tdir of the tilt

jgray-19
authored and
jgray-19
committed
Simplify rbend fringe to solve backtracking for rbend true parallel

jgray-19
authored and
jgray-19
committed
Fix solenoid component in multipole

jgray-19
authored and
jgray-19
committed
Fix backtracking for solenoid (lrad is weighted by sdir so can be negative)

jgray-19
authored and
jgray-19
committed
Add comments on maps that are not fully reversible!

jgray-19
authored and
jgray-19
committed
Add more ng vs ng tests, allow multiple particles, 0 order tpsa (particle) tracking, improve plotting to not ignore points, improve cmap, add chg, edir and sdir to cmap tests

jgray-19
authored and
jgray-19
committed
Simplify npar, fix quad and test types in ngvsng

jgray-19
authored and
jgray-19
committed
Improve sbend ng_vs_ng, fix comparison of cmap to be with itself not lua

jgray-19
authored and
jgray-19
committed
Convergence toolbox fixes

jgray-19
authored and
jgray-19
committed
Improve the plotted elemets, and the plots, fix ng_conv seq

jgray-19
authored and
jgray-19
committed
Fix bf(x/y) copy to c. Fix the loop of bxbyh in C++. Reduce Lua vs Cpp numerical discrepancy in bxbyh

jgray-19
authored and
jgray-19
committed
Merge pull request #379 from jgray-19/rbend_fixes
ldeniau
authored
Merge pull request #380 from jgray-19/sol_fixes
ldeniau
authored
Merge pull request #382 from jgray-19/dkd_convergence
ldeniau
authored
Merge pull request #383 from jgray-19/plot_magnets
ldeniau
authored
Update mad_dynmap.cpp
ldeniau
authored
Merge pull request #384 from jgray-19/sbend_fix
ldeniau
authored
Merge pull request #378 from jgray-19/patch_fix_v2
ldeniau
authored

Commits on Aug 3, 2023

Fix bxbyh for loop to match lua
jgray-19
committed
Enfore associativity in Lua to improve discrepancy with C++

jgray-19
authored and
jgray-19
committed

Commits on Aug 8, 2023

Commits on Aug 11, 2023

Allow nf to become float, rather than just do integer division

jgray-19
authored and
jgray-19
committed
Change when mad8_wedge is activated.

jgray-19
authored and
jgray-19
committed
Merge remote-tracking branch 'upstream/dev' into ng_vs_ng
jgray-19
committed
Remove pnl and psl, set the rfcav_fringe number to the flag

jgray-19
authored and
jgray-19
committed
Simplofy and improve fringe tests

jgray-19
authored and
jgray-19
committed
Massive overhaul of entire testing library, making test-ng-maps work the same as test-ptc-maps

jgray-19
authored and
jgray-19
committed
Add misalignment tests

jgray-19
authored and
jgray-19
committed
Add misalignment debug (coming with new MADX)

jgray-19
authored and
jgray-19
committed
dosave changes for trackvsptc and trackvsng

jgray-19
authored and
jgray-19
committed
Separate out tool files into plotting, tracking and testing

jgray-19
authored and
jgray-19
committed
Add fix for 'read' to work

jgray-19
authored and
jgray-19
committed

Commits on Aug 14, 2023

Create custom testing libraries for ng and ptc tests

jgray-19
authored and
jgray-19
committed
Improve PTC test config

jgray-19
authored and
jgray-19
committed
Improve convergence toolbox based on new philosophy

jgray-19
authored and
jgray-19
committed
Improve the plotting test suite under the new philosophy

jgray-19
authored and
jgray-19
committed
Make sure plot_info is a copy + cleanup

jgray-19
authored and
jgray-19
committed
Improve test selection

jgray-19
authored and
jgray-19
committed
Ensure novector on all mtables

jgray-19
authored and
jgray-19
committed
Stop attempt to call nil value

jgray-19
authored and
jgray-19
committed

Commits on Aug 22, 2023

Commits on Aug 23, 2023

Misalignment debugmap adjustment
jgray-19
committed
Misalignment debugmap adjustment

jgray-19
authored and
jgray-19
committed
Merge pull request #392 from jgray-19/dbg_additions
ldeniau
authored
Sync philosophy of patches
jgray-19
committed
Remove (s/e/t)dir from etrck
jgray-19
committed
Fix subelements based on el no longer weighted
jgray-19
committed
Add sdir to inter
jgray-19
committed
finalize setup for parametric map in C++ before testing
ldeniau
committed
Merge branch 'dev' of github.com:MethodicalAcceleratorDesign/MAD into dev
ldeniau
committed

Commits on Aug 24, 2023

Improve Ng vs ng testing
jgray-19
committed
Fix solenoid and tilt backtracking and fix misalignment ng vs ng
jgray-19
committed
Add TODO
jgray-19
committed
Merge branch 'dev' of https://github.com/MethodicalAcceleratorDesign/MAD into josh_fixes
jgray-19
committed
pre-set for ctpsa.hpp
ldeniau
committed
fix typo about cflw to tflw renaming
ldeniau
committed
Merge branch 'dev' of https://github.com/MethodicalAcceleratorDesign/MAD into josh_fixes
jgray-19
committed
fix xcpy
ldeniau
committed
Merge branch 'dev' of https://github.com/MethodicalAcceleratorDesign/MAD into josh_fixes
jgray-19
committed
Remove tdir from nllens kick, bbeam_kick
jgray-19
committed
Change the scope of c and eld
jgray-19
committed
Improve Ng vs ng testing

jgray-19
authored and
jgray-19
committed
Add TODO

jgray-19
authored and
jgray-19
committed
Merge remote-tracking branch 'upstream/dev' into ng_vs_ng
jgray-19
committed
Merge branch 'ng_vs_ng' of https://github.com/jgray-19/MAD into ng_vs_ng
jgray-19
committed
add C++ version for complex tpsa, aka ctpsa_t
ldeniau
committed
Make misalignment agree with ptc + improve (e/s)dir

jgray-19
authored and
jgray-19
committed
Merge remote-tracking branch 'upstream/dev' into misalign_ptc
jgray-19
committed
Make MAD-NG and PTC agree for misalignement

jgray-19
authored and
jgray-19
committed

Commits on Aug 25, 2023

Commits on Aug 29, 2023

Tilt fix to sync with dynmap change
jgray-19
committed
Fix not implicit drift el issue
jgray-19
committed

Commits on Aug 30, 2023

Commits on Aug 31, 2023

Commits on Sep 1, 2023

esurv with etrck, fix misalign (1st step)
ldeniau
committed
Merge branch 'dev' of https://github.com/MethodicalAcceleratorDesign/MAD into misalign_ptc
jgray-19
committed
Move srotation
jgray-19
committed
Remove legacy calculations
jgray-19
committed
Remove mang additions (done upstream)
jgray-19
committed
Remove tdir from geomap and esurv, ready for it to be removed from survey
jgray-19
committed
Add two features - selection of configurations to run, add autorun ptc
jgray-19
committed
Improve verbosity argument
jgray-19
committed
Improve misalignment tests
jgray-19
committed
Update madl_dynmap.mad
ldeniau
authored
Merge pull request #386 from jgray-19/misalign_ptc
ldeniau
authored
Update test-misalign-maps.mad
jgray-19
authored
Merge pull request #402 from jgray-19/ng_vs_ng
ldeniau
authored
Merge branch 'dev' of https://github.com/MethodicalAcceleratorDesign/MAD into survey_fixes
jgray-19
committed
Fix edir for angle (sdir NOT WORKING)
jgray-19
committed
make chk_cfgfile recursive, add eps number check
jgray-19
committed
add missing import
jgray-19
committed

Commits on Sep 5, 2023

Fix output of s in the track and survey mtables
jgray-19
committed
Force patches to work same as track, fix misalignment sdir, remove mang
jgray-19
committed
Ref.mad sync with trackvsptc
jgray-19
committed
Add first misalignement plot test -- more to come.
jgray-19
committed
Add missing ptcmodel
jgray-19
committed
Remove incorrect inversion of sdir (do it in the command)
jgray-19
committed
Add ptc_align to madx
jgray-19
committed
fix slice number in user action for backtracking
ldeniau
committed
add more misalignment tests
jgray-19
committed
Add curved and true parallel rbend tests
jgray-19
committed
Merge branch 'dev' of https://github.com/MethodicalAcceleratorDesign/MAD into survey_fixes
jgray-19
committed
Change which error for backtracking is chosen
jgray-19
committed
remove integration step id for single thin or thick
ldeniau
committed
Move weighting of sdir to the correct place
jgray-19
committed
Merge pull request #401 from jgray-19/survey_fixes
ldeniau
authored

Commits on Sep 6, 2023

add nocavity to track to enforce 5D, e.g. as if volt=0 which doesn't disable crab cavities
ldeniau
committed
Merge branch 'dev' of github.com:MethodicalAcceleratorDesign/MAD into dev
ldeniau
committed
Improve backtracking for sbend_face
jgray-19
committed
Improve backtracking for bend_fringe
jgray-19
committed
Separate bend_face test
jgray-19
committed
remove bad note
jgray-19
committed
Ng vs ng improvements
jgray-19
committed
Change cmap default to true
jgray-19
committed
Merge branch 'dev' of https://github.com/MethodicalAcceleratorDesign/MAD into ng_vs_ng
jgray-19
committed
Merge pull request #405 from jgray-19/ng_vs_ng
ldeniau
authored
enable cmap by default
ldeniau
committed

Commits on Sep 8, 2023

Commits on Sep 12, 2023

Merge branch 'dev' of https://github.com/MethodicalAcceleratorDesign/MAD into ng_vs_ng
jgray-19
committed
Separate out the fringe tests
jgray-19
committed

Commits on Sep 13, 2023

Commits on Sep 18, 2023

Rename ng vs ng tests
jgray-19
committed
Add cleanup for ngvsng and ngvsptc
jgray-19
committed
Improve check for cid, remove setup for every test in ng tests
jgray-19
committed
In ptc tests move config out of each file, correct command to run, config output
jgray-19
committed
Improve cid speed
jgray-19
committed

Commits on Sep 20, 2023

run 4th order map 1st then 5th order
ldeniau
committed

Commits on Oct 9, 2023

relax convergence constraint, add warning for exppb and logpb
ldeniau
committed

Commits on Oct 12, 2023

lower threshold for low convergence warning
ldeniau
committed

Commits on Oct 16, 2023

Commits on Oct 17, 2023

Commits on Oct 20, 2023