Skip to content

merge dev to master for 0.9.7 #410

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.

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
merged 1,177 commits into from
Oct 20, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1177 commits
Select commit Hold shift + click to select a range
d95ba0a
add further versions, no yet working
ldeniau Jul 29, 2023
dae783b
update for cmap, pb with lhcb2 aka edir=-1
ldeniau Jul 29, 2023
9298a40
updated version of the script
ldeniau Jul 29, 2023
c821741
fix typo
ldeniau Jul 29, 2023
2ea08d6
cleanup, fix adj_mult
ldeniau Jul 29, 2023
0db4932
fix cflow_sync, disable pflw for now (stay in Lua for pmap)
ldeniau Jul 29, 2023
7ce95c9
sync with track
ldeniau Jul 29, 2023
34d2334
Update yrotation of bend_wedge
Jul 31, 2023
9fca44d
Add mang to mflow
Jul 31, 2023
71ed085
Follow cpp and remove _pc from bx, by multiplication
Jul 31, 2023
b9c42e3
Fix teapot 2 number for D
Jul 31, 2023
70237e2
Make fringe explicitly fnil in multipole (so nil value is not called)
Jul 31, 2023
ce57350
Rename elm.the to elm.theta
Jul 31, 2023
a59d85c
Merge pull request #366 from jgray-19/fix_bend_wedge
ldeniau Jul 31, 2023
2d7d878
Merge pull request #368 from jgray-19/mflw_fix
ldeniau Jul 31, 2023
769bc12
Merge pull request #369 from jgray-19/rfmult_fix
ldeniau Jul 31, 2023
30716e1
Merge pull request #370 from jgray-19/teapot_fix
ldeniau Jul 31, 2023
45bf86a
Merge pull request #371 from jgray-19/mult_fixes
ldeniau Jul 31, 2023
7cdf09f
Merge pull request #372 from jgray-19/changeref_fix
ldeniau Jul 31, 2023
3ced01a
Fix edir for quad_thicks
Jul 31, 2023
9b7f935
Fix translate
Aug 1, 2023
fdcdda1
Fix quadrupole PTC model
Aug 1, 2023
0bd661e
Fix KMK for strexgen
Aug 1, 2023
f1b5a24
Fix mult fringe
Aug 1, 2023
e684637
Fix charge dependancy of qsad_fringe
Aug 1, 2023
a52b2f4
Merge pull request #373 from jgray-19/quad_fixes
ldeniau Aug 1, 2023
2b1332f
Merge pull request #374 from jgray-19/translate_fix
ldeniau Aug 1, 2023
f0f3181
Merge pull request #375 from jgray-19/ptcmodel_fixes
ldeniau Aug 1, 2023
0bfb7f3
Merge pull request #376 from jgray-19/mult_fringe
ldeniau Aug 1, 2023
902b16a
Merge pull request #377 from jgray-19/fix_qsad
ldeniau Aug 1, 2023
b923e91
Add third argument to patches to match trkfun typedef
Jul 31, 2023
c347292
Fix tilt
Jul 31, 2023
ef26112
Fix tilt for cpp
Jul 31, 2023
7d76fe0
Fix patches not receiving data and changeref multiplying by edir not …
Aug 2, 2023
c10bc60
Fix tdir of the tilt
Aug 2, 2023
7b4c73c
Simplify rbend fringe to solve backtracking for rbend true parallel
Aug 2, 2023
294e136
Fix solenoid component in multipole
Jul 31, 2023
137c156
Fix backtracking for solenoid (lrad is weighted by sdir so can be neg…
Aug 2, 2023
447e725
Add comments on maps that are not fully reversible!
Aug 2, 2023
0fd6422
Add more ng vs ng tests, allow multiple particles, 0 order tpsa (part…
Aug 2, 2023
874ce2e
Simplify npar, fix quad and test types in ngvsng
Aug 2, 2023
4fbf0c1
Improve sbend ng_vs_ng, fix comparison of cmap to be with itself not lua
Aug 2, 2023
705b189
Convergence toolbox fixes
Aug 2, 2023
6d489b9
Improve the plotted elemets, and the plots, fix ng_conv seq
Aug 2, 2023
2a7e785
Fix bf(x/y) copy to c. Fix the loop of bxbyh in C++. Reduce Lua vs Cp…
Aug 2, 2023
7df2f73
Merge pull request #379 from jgray-19/rbend_fixes
ldeniau Aug 2, 2023
204932f
Merge pull request #380 from jgray-19/sol_fixes
ldeniau Aug 2, 2023
9f128d1
Merge pull request #382 from jgray-19/dkd_convergence
ldeniau Aug 2, 2023
e474256
Merge pull request #383 from jgray-19/plot_magnets
ldeniau Aug 2, 2023
8ed2936
Update mad_dynmap.cpp
ldeniau Aug 2, 2023
07b8ea1
Merge pull request #384 from jgray-19/sbend_fix
ldeniau Aug 2, 2023
6201f6d
Merge pull request #378 from jgray-19/patch_fix_v2
ldeniau Aug 2, 2023
67a818d
Fix bxbyh for loop to match lua
Aug 3, 2023
cb1d1fa
Enfore associativity in Lua to improve discrepancy with C++
Aug 3, 2023
27ea3e0
improve and simplify the parametric map version
ldeniau Aug 8, 2023
5fc5a66
sync with C++
ldeniau Aug 8, 2023
adae4ea
some cleanup before sync with C++, algn should be removed from mflw, …
ldeniau Aug 8, 2023
55fb238
Allow nf to become float, rather than just do integer division
Aug 7, 2023
9eb0bf4
Change when mad8_wedge is activated.
Aug 4, 2023
58b78cc
Merge remote-tracking branch 'upstream/dev' into ng_vs_ng
jgray-19 Aug 11, 2023
91a6787
Remove pnl and psl, set the rfcav_fringe number to the flag
Aug 2, 2023
d6bf5c0
Simplofy and improve fringe tests
Aug 2, 2023
0876f14
Massive overhaul of entire testing library, making test-ng-maps work …
Aug 10, 2023
ed7990b
Add misalignment tests
Aug 10, 2023
1ff48d3
Add misalignment debug (coming with new MADX)
Aug 11, 2023
da972ef
dosave changes for trackvsptc and trackvsng
Aug 11, 2023
134a915
Separate out tool files into plotting, tracking and testing
Aug 11, 2023
f1f2425
Add fix for 'read' to work
Aug 11, 2023
d1831ca
Create custom testing libraries for ng and ptc tests
Aug 14, 2023
108935f
Improve PTC test config
Aug 14, 2023
fbe90ef
Improve convergence toolbox based on new philosophy
Aug 14, 2023
c7b6ea7
Improve the plotting test suite under the new philosophy
Aug 14, 2023
de24f2d
Make sure plot_info is a copy + cleanup
Aug 14, 2023
849630a
Improve test selection
Aug 14, 2023
4570bc3
Ensure novector on all mtables
Aug 14, 2023
f960d4d
Stop attempt to call nil value
Aug 14, 2023
e1079a2
Improve default series and legend in plotting and add plot and tool r…
Aug 22, 2023
b142d4a
Update and add test readme
Aug 22, 2023
6920276
fix patches vs trackone and their C signature
ldeniau Aug 22, 2023
17dd894
remove algn, tdir from tlt
ldeniau Aug 22, 2023
fed485c
Merge pull request #381 from jgray-19/comments
ldeniau Aug 22, 2023
621120a
Merge pull request #385 from jgray-19/sbend_fix
ldeniau Aug 22, 2023
f72e9b2
fix right loop in bxbyh
ldeniau Aug 22, 2023
ca99d5d
Merge pull request #387 from jgray-19/mult_fringe
ldeniau Aug 22, 2023
27802fe
Merge pull request #388 from jgray-19/mad8_wedge
ldeniau Aug 22, 2023
f06bcf2
Merge pull request #389 from jgray-19/ng_vs_ng
ldeniau Aug 22, 2023
c999043
Merge pull request #390 from jgray-19/mtable_additions
ldeniau Aug 22, 2023
6c29d5b
Update madl_esurv.mad
ldeniau Aug 22, 2023
88decec
Merge pull request #391 from jgray-19/survey_fixes
ldeniau Aug 22, 2023
bb59b96
Misalignment debugmap adjustment
Aug 23, 2023
210bda0
Misalignment debugmap adjustment
Aug 23, 2023
412e7e4
Merge pull request #392 from jgray-19/dbg_additions
ldeniau Aug 23, 2023
fedab10
Sync philosophy of patches
Aug 23, 2023
920c850
Remove (s/e/t)dir from etrck
Aug 23, 2023
70101fa
Fix subelements based on el no longer weighted
Aug 23, 2023
6a70855
Add sdir to inter
Aug 23, 2023
8a0a009
finalize setup for parametric map in C++ before testing
ldeniau Aug 23, 2023
e45ac48
Merge branch 'dev' of github.com:MethodicalAcceleratorDesign/MAD into…
ldeniau Aug 23, 2023
fd98dcb
Improve Ng vs ng testing
Aug 24, 2023
94e1ec8
Fix solenoid and tilt backtracking and fix misalignment ng vs ng
Aug 24, 2023
d529ac7
Add TODO
Aug 24, 2023
cd58eb8
Merge branch 'dev' of https://github.com/MethodicalAcceleratorDesign/…
Aug 24, 2023
12319a0
pre-set for ctpsa.hpp
ldeniau Aug 24, 2023
53a913a
fix typo about cflw to tflw renaming
ldeniau Aug 24, 2023
496213e
Merge branch 'dev' of https://github.com/MethodicalAcceleratorDesign/…
Aug 24, 2023
2018871
fix xcpy
ldeniau Aug 24, 2023
7539c1d
Merge branch 'dev' of https://github.com/MethodicalAcceleratorDesign/…
Aug 24, 2023
bd34eef
Remove tdir from nllens kick, bbeam_kick
Aug 24, 2023
c263055
Change the scope of c and eld
Aug 24, 2023
9119927
Improve Ng vs ng testing
Aug 24, 2023
d931230
Add TODO
Aug 24, 2023
5937eae
Merge remote-tracking branch 'upstream/dev' into ng_vs_ng
jgray-19 Aug 24, 2023
2f627ab
Merge branch 'ng_vs_ng' of https://github.com/jgray-19/MAD into ng_vs_ng
Aug 24, 2023
31746ad
add C++ version for complex tpsa, aka ctpsa_t
ldeniau Aug 24, 2023
b7dd89c
Make misalignment agree with ptc + improve (e/s)dir
Aug 11, 2023
d07ea24
Merge remote-tracking branch 'upstream/dev' into misalign_ptc
jgray-19 Aug 24, 2023
cb6325f
Make MAD-NG and PTC agree for misalignement
Aug 24, 2023
58eb4f5
add comment
ldeniau Aug 25, 2023
bcf7a39
Merge pull request #393 from jgray-19/ng_vs_ng
ldeniau Aug 25, 2023
93705f9
fix chckflw
ldeniau Aug 25, 2023
82d051b
Merge branch 'dev' of github.com:MethodicalAcceleratorDesign/MAD into…
ldeniau Aug 25, 2023
38c0a15
Improve tests for h1, h2 -> Fix some bugs
Aug 25, 2023
61790de
Merge branch 'dev' of https://github.com/MethodicalAcceleratorDesign/…
Aug 25, 2023
dbdaa1d
Fix sdir tilt usage
Aug 25, 2023
daf0559
Merge pull request #395 from jgray-19/remove_tdir
ldeniau Aug 25, 2023
53902c8
Merge branch 'dev' of https://github.com/MethodicalAcceleratorDesign/…
Aug 25, 2023
92c9f62
final cleanup of 'dirs'
ldeniau Aug 25, 2023
296b67e
move code after shortcut
ldeniau Aug 25, 2023
8d0c96c
Fix unsuccesful merge
Aug 25, 2023
0acf5a9
conversion methods
ldeniau Aug 25, 2023
8f008be
cleanup, add tmp default ctor and isvalid
ldeniau Aug 25, 2023
f4bf920
cleanup, fix real and imag, add tmp default ctor and isvalid
ldeniau Aug 25, 2023
c25feea
add some tests for tpsa <-> ctpsa conversion
ldeniau Aug 25, 2023
20bd75e
Change boolean doprnt to integer
Aug 25, 2023
84f37e7
Merge branch 'dev' of https://github.com/MethodicalAcceleratorDesign/…
Aug 25, 2023
2868a13
add flag for remove mdump code
ldeniau Aug 25, 2023
6948a1f
Merge branch 'dev' of https://github.com/MethodicalAcceleratorDesign/…
Aug 25, 2023
7890d8a
Merge pull request #396 from jgray-19/ng_vs_ng
ldeniau Aug 25, 2023
1b69ecb
Merge pull request #397 from jgray-19/pole_face
ldeniau Aug 25, 2023
e025ca9
Tilt fix to sync with dynmap change
Aug 29, 2023
1b357d8
Fix not implicit drift el issue
Aug 29, 2023
0fcb420
Merge pull request #399 from jgray-19/fix_drift
ldeniau Aug 30, 2023
c15604b
Merge pull request #398 from jgray-19/eseptum_fix
ldeniau Aug 30, 2023
ae265b2
cleanup
ldeniau Aug 31, 2023
efa49ea
fix pc in rfcav_kickn for correct compatibility with PTC (checked vs …
ldeniau Aug 31, 2023
891331b
Merge branch 'dev' of github.com:MethodicalAcceleratorDesign/MAD into…
ldeniau Aug 31, 2023
cf26e1e
renamed modules for consistency
ldeniau Aug 31, 2023
6cec98e
Continue restoration of _pc
Aug 31, 2023
8c56084
Merge pull request #400 from jgray-19/rfmult_fix
ldeniau Aug 31, 2023
4350a31
remove ang from bends, use mang instead, ang is for patches as elements
ldeniau Aug 31, 2023
7fb80ce
remove ang from bends, use mang instead, ang is for patches as elements
ldeniau Aug 31, 2023
1ba3281
esurv with etrck, fix misalign (1st step)
ldeniau Sep 1, 2023
9c70036
Merge branch 'dev' of https://github.com/MethodicalAcceleratorDesign/…
Sep 1, 2023
72f42c9
Move srotation
Sep 1, 2023
067be27
Remove legacy calculations
Sep 1, 2023
d32ee8d
Remove mang additions (done upstream)
Sep 1, 2023
c0327e2
Remove tdir from geomap and esurv, ready for it to be removed from su…
Sep 1, 2023
d94b763
Add two features - selection of configurations to run, add autorun ptc
Sep 1, 2023
c8703fc
Improve verbosity argument
Sep 1, 2023
d77be36
Improve misalignment tests
Sep 1, 2023
1dd17b2
Update madl_dynmap.mad
ldeniau Sep 1, 2023
3c6ac5c
Merge pull request #386 from jgray-19/misalign_ptc
ldeniau Sep 1, 2023
7dc364b
Update test-misalign-maps.mad
jgray-19 Sep 1, 2023
2f0e818
Merge pull request #402 from jgray-19/ng_vs_ng
ldeniau Sep 1, 2023
2234ccb
Merge branch 'dev' of https://github.com/MethodicalAcceleratorDesign/…
Sep 1, 2023
3192480
Fix edir for angle (sdir NOT WORKING)
Sep 1, 2023
8adeba8
make chk_cfgfile recursive, add eps number check
Sep 1, 2023
582cf64
add missing import
Sep 1, 2023
8466abc
Merge pull request #403 from jgray-19/ng_vs_ng
ldeniau Sep 4, 2023
9dfa4d8
known missing fixes from utest of Joshua
ldeniau Sep 4, 2023
00a80e5
minor fix of edir
ldeniau Sep 4, 2023
8cc3952
comment
ldeniau Sep 4, 2023
0e5d5ec
updated on NG vs PTC tests
ldeniau Sep 4, 2023
f9602f3
Merge branch 'dev' of https://github.com/MethodicalAcceleratorDesign/…
Sep 4, 2023
3c713b5
Fix output of s in the track and survey mtables
Sep 5, 2023
060e65f
Force patches to work same as track, fix misalignment sdir, remove mang
Sep 5, 2023
781852d
Ref.mad sync with trackvsptc
Sep 5, 2023
974be84
Add first misalignement plot test -- more to come.
Sep 5, 2023
28acbe5
Add missing ptcmodel
Sep 5, 2023
8852937
Remove incorrect inversion of sdir (do it in the command)
Sep 5, 2023
aa4ada0
Add ptc_align to madx
Sep 5, 2023
c36d89f
fix slice number in user action for backtracking
ldeniau Sep 5, 2023
c2d7638
add more misalignment tests
Sep 5, 2023
81e192d
Add curved and true parallel rbend tests
Sep 5, 2023
2f6affb
Merge branch 'dev' of https://github.com/MethodicalAcceleratorDesign/…
Sep 5, 2023
ee269b1
Change which error for backtracking is chosen
Sep 5, 2023
cd8b0df
remove integration step id for single thin or thick
ldeniau Sep 5, 2023
3304b16
Move weighting of sdir to the correct place
Sep 5, 2023
9179ad9
Merge pull request #401 from jgray-19/survey_fixes
ldeniau Sep 5, 2023
4593031
add nocavity to track to enforce 5D, e.g. as if volt=0 which doesn't …
ldeniau Sep 6, 2023
f0a2e48
Merge branch 'dev' of github.com:MethodicalAcceleratorDesign/MAD into…
ldeniau Sep 6, 2023
04dbe10
Improve backtracking for sbend_face
Sep 6, 2023
b6fee26
Improve backtracking for bend_fringe
Sep 6, 2023
d6117fe
Separate bend_face test
Sep 6, 2023
951cfa9
remove bad note
Sep 6, 2023
ec9b32f
Ng vs ng improvements
Sep 6, 2023
0958a80
Change cmap default to true
Sep 6, 2023
350aa19
Merge branch 'dev' of https://github.com/MethodicalAcceleratorDesign/…
Sep 6, 2023
c726ae2
Merge pull request #405 from jgray-19/ng_vs_ng
ldeniau Sep 6, 2023
41c30f4
enable cmap by default
ldeniau Sep 6, 2023
e0c94fb
Merge branch 'dev' of https://github.com/MethodicalAcceleratorDesign/…
Sep 8, 2023
1a53f1f
Improve fringe testing
Sep 8, 2023
25204fa
improve c++ bend fringe
Sep 8, 2023
0e8d838
Improve bend_face map and test
Sep 8, 2023
2fb320a
Simplify bend_fringe
Sep 8, 2023
dd5bdda
Merge branch 'dev' of https://github.com/MethodicalAcceleratorDesign/…
Sep 8, 2023
de639e2
Improve tolerance for straight fringes
Sep 8, 2023
80beba6
Merge pull request #404 from jgray-19/fix_sbend_face
ldeniau Sep 11, 2023
062fb1b
minor cleanup
ldeniau Sep 11, 2023
30c693a
minor cleanup and simplification
ldeniau Sep 11, 2023
856b6f8
small simplification
ldeniau Sep 11, 2023
72fc3c4
Merge branch 'dev' of https://github.com/MethodicalAcceleratorDesign/…
Sep 12, 2023
b22a8db
Separate out the fringe tests
Sep 12, 2023
f987cde
Merge pull request #406 from jgray-19/ng_vs_ng
ldeniau Sep 13, 2023
a67b8af
add gnfu and haml to simplify access to analyse results
ldeniau Sep 13, 2023
006f83c
Rename ng vs ng tests
Sep 18, 2023
2de52ab
Add cleanup for ngvsng and ngvsptc
Sep 18, 2023
5b6ac63
Improve check for cid, remove setup for every test in ng tests
Sep 18, 2023
bbffe8e
In ptc tests move config out of each file, correct command to run, co…
Sep 18, 2023
c425665
Improve cid speed
Sep 18, 2023
189b260
cosmetic changes
ldeniau Sep 19, 2023
f355881
fix capture of temporary as argument
ldeniau Sep 19, 2023
d911b7d
simplify chckflw
ldeniau Sep 19, 2023
847dd33
fix nmul in parametric map in case of shortcut (not really needed)
ldeniau Sep 19, 2023
27addf7
fix parameter list for parametric C++ maps
ldeniau Sep 19, 2023
6f30b43
Merge pull request #407 from jgray-19/ng_vs_ng
ldeniau Sep 19, 2023
31c034b
scripts following the HB2023 paper
ldeniau Sep 19, 2023
a904790
Merge branch 'dev' of github.com:MethodicalAcceleratorDesign/MAD into…
ldeniau Sep 19, 2023
ac8ec66
run 4th order map 1st then 5th order
ldeniau Sep 20, 2023
7d04282
fix sequence points in mad_alloc_tmp macro
ldeniau Oct 6, 2023
aecad22
fix undetected overflow in case of huge size
ldeniau Oct 6, 2023
b759be9
enforce checks for allocations
ldeniau Oct 6, 2023
8e9bb7b
add equal, add vo and pn in damap
ldeniau Oct 6, 2023
f74bb7c
add vo
ldeniau Oct 6, 2023
c5f3f8a
relax convergence constraint, add warning for exppb and logpb
ldeniau Oct 9, 2023
81f3887
lower threshold for low convergence warning
ldeniau Oct 12, 2023
4494613
add isnul and isval
ldeniau Oct 16, 2023
f19224d
add isnul and isval
ldeniau Oct 16, 2023
cd741c5
propagate also O0=false
ldeniau Oct 16, 2023
b12a979
avoid zero div
ldeniau Oct 16, 2023
7c8cece
implement rotations of nf for trkrdt
ldeniau Oct 17, 2023
8e003e4
add trkrdt to twiss
ldeniau Oct 17, 2023
5670cb1
redorder few attributes for consistency
ldeniau Oct 19, 2023
67a8e0b
remove useless variable
ldeniau Oct 19, 2023
0dc6f80
add saverdt in case user want to compute more RDTs in post processing…
ldeniau Oct 19, 2023
e708578
allow to save rdts in twiss mtbl for futher post processing using trk…
ldeniau Oct 19, 2023
c77340b
switch to DKD when angle are very small <1e-6
ldeniau Oct 19, 2023
17f4af3
add scripts
ldeniau Oct 20, 2023
ff9cf46
add scripts
ldeniau Oct 20, 2023
e58dcec
add info=2 message
ldeniau Oct 20, 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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ lib/nlopt2
lib/lfs1
lib/lpeg
src/build
tests
tests/utests/*_gen.mad
tests/utests/*.tfs

Expand Down
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
[submodule "MADdocs"]
path = doc
url = https://github.com/MethodicalAcceleratorDesign/MADdocs
update = merge
[submodule "MADLibs"]
path = bin
url = https://github.com/MethodicalAcceleratorDesign/MADLibs
update = merge
[submodule "MADpy"]
path = pymad
url = https://github.com/MethodicalAcceleratorDesign/MADpy
update = merge
2 changes: 1 addition & 1 deletion doc
Submodule doc updated from 031769 to 05f842
20 changes: 0 additions & 20 deletions docs/Makefile

This file was deleted.

35 changes: 0 additions & 35 deletions docs/make.bat

This file was deleted.

35 changes: 0 additions & 35 deletions docs/source/_ext/customRoles.py

This file was deleted.

30 changes: 0 additions & 30 deletions docs/source/_ext/pygments_mad_lexer.py

This file was deleted.

Loading