Skip to content

Vectorised beam plotting #584

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

Open
jp-ga wants to merge 74 commits into
base: master
Choose a base branch
from
Open

Vectorised beam plotting #584

Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
74 commits
Select commit Hold shift + click to select a range
9efcb77
correct default shapes of `particle_charges` and `survival_probabilit…
jp-ga Oct 14, 2025
c4ba854
add ensemble plot functionality
jp-ga Oct 17, 2025
48b67e1
update changelog
jp-ga Oct 17, 2025
d8b5f30
revert survival probabilities and charges default shaping
jp-ga Oct 17, 2025
7d57136
move style to plot_2d_kws
jp-ga Oct 17, 2025
1a1bd25
add ensemble plotting test
jp-ga Oct 17, 2025
04f97a8
update changelog
jp-ga Oct 17, 2025
76bf864
update changelog
jp-ga Oct 17, 2025
e6ecefc
fix docstring
jp-ga Oct 17, 2025
718bc21
fix docstring
jp-ga Oct 17, 2025
3ed190b
fix docstring
jp-ga Oct 17, 2025
af21b42
Various cleanups in function signatures and docstrings
jank324 Oct 21, 2025
42df81b
Cleanup test
jank324 Oct 21, 2025
8f62df6
Cleanup test ammend
jank324 Oct 21, 2025
27aac7a
Slightly clearer line in test
jank324 Oct 21, 2025
3cd56e6
Better test name
jank324 Oct 21, 2025
a473af8
Apply suggestions from code review
jank324 Oct 21, 2025
c2fb7fc
Various small cleanups
jank324 Oct 21, 2025
a05a810
Refactor vectorised beam distribution code and make more seaborn-like
jank324 Oct 29, 2025
56bab02
Fix test warnings and failures
jank324 Oct 29, 2025
fb5e0e2
Move vectorised distribution plotting utility functions to more fitti…
jank324 Nov 5, 2025
8342187
Clean up docstrings
jank324 Nov 5, 2025
fa89183
Further docstring fixes and cleanup
jank324 Nov 5, 2025
4d655a7
Clean up docstring of `histograms_mean_and_confidence`
jank324 Nov 5, 2025
4d223b5
Add tests for vectorised beam plotting satistics utility functions
jank324 Nov 5, 2025
b54e336
Add IDs to parametrised test cases
jank324 Nov 5, 2025
8c26333
Fix hacky use of `torch.bucketize` with prober definition of `boundar…
jank324 Nov 6, 2025
c6f6205
Fix some issues with the statistics tests
jank324 Nov 6, 2025
eda2b7e
Minor fixes in 1D phase space plot method
jank324 Nov 6, 2025
dc10549
A first pass of code cleanup of 2D histogram plot method
jank324 Nov 6, 2025
081517e
Remove breaking change
jank324 Nov 6, 2025
6f39bef
Fix wrong type annotations
jank324 Nov 6, 2025
54ae47d
Remove no longer needed special vectorisation case distinction
jank324 Nov 6, 2025
3aa29b2
Further cleanup and fixes for 2D plot
jank324 Nov 6, 2025
51f65c0
Further cleanup and make more similar 1D 2D
jank324 Nov 6, 2025
9ff5226
Cleanup to end of 2D plot function
jank324 Nov 6, 2025
ae9471e
Clean up and fix docstring
jank324 Nov 6, 2025
16eddc8
Index fix for vectorisation
jank324 Nov 6, 2025
1548251
Return to original indexing
jank324 Nov 6, 2025
ffc08bb
Finish return to proper original indexing
jank324 Nov 6, 2025
8e1c3b8
Replace `dict.update`s with `|` operator because the former returns `…
jank324 Nov 6, 2025
85c42a2
Fix bin issue
jank324 Nov 6, 2025
280a313
Fix tests failing on older versions of NumPy
jank324 Nov 11, 2025
61cb370
Test increasing mimum requriement for NumPy to that in #582
jank324 Nov 11, 2025
6f4ab1e
Merge branch 'master' into 583-add-beam-ensemble-plotting
jank324 Dec 2, 2025
aa35395
Minor docstring fix
jank324 Dec 2, 2025
4f832f5
Fix docstring indentation
jank324 Dec 2, 2025
5645966
Another minor docstring fix
jank324 Dec 2, 2025
165e016
Fix 2D plot method signature
jank324 Dec 2, 2025
ea0f613
Clean up docstring
jank324 Dec 2, 2025
cf91b74
Fix argument order
jank324 Dec 2, 2025
e7ece47
Remove no longer avaialble method from docstrings and error messages
jank324 Dec 2, 2025
1e26b67
Fix slightling confusing argument names
jank324 Dec 2, 2025
8c35ef5
Clearer changelog entry
jank324 Dec 2, 2025
f1c39cf
Fix PR ID in changelog entry
jank324 Dec 2, 2025
996df93
Test some things
jank324 Dec 2, 2025
a026443
Minor code cleanup in notebook for testing
jank324 Dec 9, 2025
9580388
Fix smoothing in 1D histogram
jank324 Dec 9, 2025
0d98b8d
Fix squiggly confidence contours
jank324 Dec 9, 2025
75f4604
Make bounds clearer as such
jank324 Dec 9, 2025
3c5fb3c
Remove histogram from contour smoothing to maintain original function…
jank324 Dec 9, 2025
31e6c15
Make colour behaviour more predictable accordig to theme
jank324 Dec 9, 2025
ab0bea1
Improve overall structure of 2D plot function
jank324 Dec 9, 2025
d4190e7
Automatic levels (slightly broken)
jank324 Dec 9, 2025
032fde7
Match new code style on transpose
jank324 Dec 9, 2025
3a89304
Merge branch 'master' into 583-add-beam-ensemble-plotting
jank324 Feb 6, 2026
9312eaf
Change `.mT` for NumPy arrays back to `.T` because the former is only…
jank324 Feb 24, 2026
17e5582
Rerun ensemble plot test notebook with current state
jank324 Feb 24, 2026
c0bcf07
Revert "Change `.mT` for NumPy arrays back to `.T` because the former…
jank324 Feb 24, 2026
f719607
Increase minimum NumPy requirement to 2.0.0
jank324 Feb 24, 2026
04c7eb7
Up minimum scipy version to lowest compatible with NumPy 2
jank324 Feb 24, 2026
849138d
Increase minimum Matplotlib version for NumPy 2 compatibility
jank324 Feb 24, 2026
bedf00a
Apply suggestion from Copilot code review
jank324 Feb 24, 2026
c147f33
Merge branch 'master' into 583-add-beam-ensemble-plotting
cr-xu Mar 18, 2026
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 CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
- Methods for creating `ParticleBeam` instances from distributions via stochastic sampling now make sure that the statistics of the generated particles match the desired distribution (see #546) (@cr-xu)
- `BPM` elements now support misalignments (see #533) (@roussel-ryan, @jank324)
- Speed up tracking by replacing some PyTorch operations with faster alternatives (see #538, #558) (@jank324, @Hespe)
- Add the following plotting functionalities for beams with batch dimensions: plot average 1d projection histogram with lower and upper bounds, plot average 2d projection histogram with lower and upper bounds, triangle plot with the above functionalities. (see #583) (@jp-ga)

### 🐛 Bug fixes

Expand Down
Loading