-
Notifications
You must be signed in to change notification settings - Fork 30
Polygon aperture #1199
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
Open
egstern
wants to merge
42
commits into
BLAST-ImpactX:development
Choose a base branch
from
egstern:egstern-polygon-aperture
base: development
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+1,380
−1
Open
Polygon aperture #1199
Changes from 11 commits
Commits
Show all changes
42 commits
Select commit
Hold shift + click to select a range
03dc3c3
start of PolygonAperture implementation
egstern 229ab2a
PolygonAperture logic added and builds now.
egstern 680b89c
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] a86705d
Update src/elements/PolygonAperture.H
egstern 26da419
Added input file parsing logic.
egstern 42120dc
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] f65dd08
Update src/elements/PolygonAperture.H
cemitch99 23e0f40
sense of test was incorrect
egstern 55e8bdf
input file example
egstern 6b9a5b8
some problem merging upstream? I don't know what happened
egstern 8461e9d
examples of aperture with offsets and rotations
egstern e93a870
Rearrange storage of vertices data and min_radius2 so that
egstern d07b51a
script to plot the action of the aperture
egstern 7aa179b
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] af944bb
tweaks to plot layout
egstern 3d414ef
tweaks to plot layout
egstern bac3829
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] ef0c3ce
New analysis script that checks tests the results of the aperture, small
egstern 95fe1ee
I don't know why this changed upstream
egstern b3df98f
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] d91ed97
python bindings for polygon aperture
egstern 7fde375
python example file for the polygon aperture
egstern 9cd397a
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] 6a45a42
additional scripts demonstrating absorb, rotate, offset options
egstern 49a3306
add new polygon aperture tests to test suite
egstern f0b9e18
changed upstream
egstern c9994d5
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] b84682e
fix python stanza
egstern 800f382
another fix python stanza
egstern 357d067
changed upstream
egstern 2362d07
cleanup comments
egstern 0210e94
Fix type for binding of PolygonAperture class data member definitions.
egstern dbff31c
Added the element to the examples documentation.
egstern d83b435
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] d0a11fb
Added Python and Input-file documentation
egstern 8a430aa
upstream changes
egstern f40e6c0
spelling correction
egstern b39109d
Update examples/polygon_aperture/README.rst
egstern 7462522
Update src/elements/PolygonAperture.H
egstern 725d351
Update examples/polygon_aperture/README.rst
egstern 926e684
Update docs/source/usage/parameters.rst
egstern 5f6ad3c
add comments describing the particle-in-polygon algorithm
egstern File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| ############################################################################### | ||
| # Particle Beam(s) | ||
| ############################################################################### | ||
| beam.npart = 10000 | ||
| beam.units = static | ||
| beam.kin_energy = 800.0 | ||
| beam.charge = 1.0e-9 | ||
| beam.particle = proton | ||
| beam.distribution = waterbag | ||
| beam.lambdaX = 2.0e-3 | ||
| beam.lambdaY = beam.lambdaX | ||
| beam.lambdaT = 0.4 | ||
| beam.lambdaPx = 4.0e-4 | ||
| beam.lambdaPy = beam.lambdaPx | ||
| beam.lambdaPt = 2.0e-3 | ||
| beam.muxpx = 0.0 | ||
| beam.muypy = 0.0 | ||
| beam.mutpt = 0.0 | ||
|
|
||
|
|
||
| ############################################################################### | ||
| # Beamline: lattice elements and segments | ||
| ############################################################################### | ||
| lattice.elements = monitor pa monitor | ||
| lattice.nslice = 1 | ||
|
|
||
| monitor.type = beam_monitor | ||
| monitor.backend = h5 | ||
|
|
||
| pa.type = polygon_aperture | ||
| pa.vertices_x = 0.5e-3 0.5e-3 -0.5e-3 -0.5e-3 -1.5e-3 -1.5e-3 -0.5e-3 -0.5e-3 0.5e-3 0.5e-3 1.5e-3 1.5e-3 0.5e-3 | ||
| pa.vertices_y = 0.5e-3 1.5e-3 1.5e-3 0.5e-3 0.5e-3 -0.5e-3 -0.5e-3 -1.5e-3 -1.5e-3 -0.5e-3 -0.5e-3 0.5e-3 0.5e-3 | ||
| pa.min_radius2 = 5.0e-7 | ||
| pa.action = "transmit" # this is the default transmit particles within the polygon | ||
| #pa.action = "absorb" # alternatively absorb particles within the polygon | ||
|
|
||
| ############################################################################### | ||
| # Algorithms | ||
| ############################################################################### | ||
| algo.space_charge = false | ||
|
|
||
|
|
||
| ############################################################################### | ||
| # Diagnostics | ||
| ############################################################################### | ||
| diag.slice_step_diagnostics = true | ||
45 changes: 45 additions & 0 deletions
45
examples/polygon_aperture/input_polygon_aperture_absorb.in
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,45 @@ | ||
| ############################################################################### | ||
| # Particle Beam(s) | ||
| ############################################################################### | ||
| beam.npart = 50000 | ||
| beam.units = static | ||
| beam.kin_energy = 800.0 | ||
| beam.charge = 1.0e-9 | ||
| beam.particle = proton | ||
| beam.distribution = waterbag | ||
| beam.lambdaX = 2.0e-3 | ||
| beam.lambdaY = beam.lambdaX | ||
| beam.lambdaT = 0.4 | ||
| beam.lambdaPx = 4.0e-4 | ||
| beam.lambdaPy = beam.lambdaPx | ||
| beam.lambdaPt = 2.0e-3 | ||
| beam.muxpx = 0.0 | ||
| beam.muypy = 0.0 | ||
| beam.mutpt = 0.0 | ||
|
|
||
|
|
||
| ############################################################################### | ||
| # Beamline: lattice elements and segments | ||
| ############################################################################### | ||
| lattice.elements = monitor pa monitor | ||
| lattice.nslice = 1 | ||
|
|
||
| monitor.type = beam_monitor | ||
| monitor.backend = h5 | ||
|
|
||
| pa.type = polygon_aperture | ||
| pa.vertices_x = 0.5e-3 0.5e-3 -0.5e-3 -0.5e-3 -1.5e-3 -1.5e-3 -0.5e-3 -0.5e-3 0.5e-3 0.5e-3 1.5e-3 1.5e-3 0.5e-3 | ||
| pa.vertices_y = 0.5e-3 1.5e-3 1.5e-3 0.5e-3 0.5e-3 -0.5e-3 -0.5e-3 -1.5e-3 -1.5e-3 -0.5e-3 -0.5e-3 0.5e-3 0.5e-3 | ||
| pa.min_radius2 = 5.0e-7 | ||
| pa.action = "absorb" # absorb particles within the polygon | ||
|
|
||
| ############################################################################### | ||
| # Algorithms | ||
| ############################################################################### | ||
| algo.space_charge = false | ||
|
|
||
|
|
||
| ############################################################################### | ||
| # Diagnostics | ||
| ############################################################################### | ||
| diag.slice_step_diagnostics = true |
47 changes: 47 additions & 0 deletions
47
examples/polygon_aperture/input_polygon_aperture_absorb_offset.in
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,47 @@ | ||
| ############################################################################### | ||
| # Particle Beam(s) | ||
| ############################################################################### | ||
| beam.npart = 50000 | ||
| beam.units = static | ||
| beam.kin_energy = 800.0 | ||
| beam.charge = 1.0e-9 | ||
| beam.particle = proton | ||
| beam.distribution = waterbag | ||
| beam.lambdaX = 2.0e-3 | ||
| beam.lambdaY = beam.lambdaX | ||
| beam.lambdaT = 0.4 | ||
| beam.lambdaPx = 4.0e-4 | ||
| beam.lambdaPy = beam.lambdaPx | ||
| beam.lambdaPt = 2.0e-3 | ||
| beam.muxpx = 0.0 | ||
| beam.muypy = 0.0 | ||
| beam.mutpt = 0.0 | ||
|
|
||
|
|
||
| ############################################################################### | ||
| # Beamline: lattice elements and segments | ||
| ############################################################################### | ||
| lattice.elements = monitor pa monitor | ||
| lattice.nslice = 1 | ||
|
|
||
| monitor.type = beam_monitor | ||
| monitor.backend = h5 | ||
|
|
||
| pa.type = polygon_aperture | ||
| pa.vertices_x = 0.5e-3 0.5e-3 -0.5e-3 -0.5e-3 -1.5e-3 -1.5e-3 -0.5e-3 -0.5e-3 0.5e-3 0.5e-3 1.5e-3 1.5e-3 0.5e-3 | ||
| pa.vertices_y = 0.5e-3 1.5e-3 1.5e-3 0.5e-3 0.5e-3 -0.5e-3 -0.5e-3 -1.5e-3 -1.5e-3 -0.5e-3 -0.5e-3 0.5e-3 0.5e-3 | ||
| pa.min_radius2 = 5.0e-7 | ||
| pa.action = "absorb" # absorb particles within the polygon | ||
| pa.dx = 0.0006 | ||
| pa.dy = -0.0012 | ||
|
|
||
| ############################################################################### | ||
| # Algorithms | ||
| ############################################################################### | ||
| algo.space_charge = false | ||
|
|
||
|
|
||
| ############################################################################### | ||
| # Diagnostics | ||
| ############################################################################### | ||
| diag.slice_step_diagnostics = true |
46 changes: 46 additions & 0 deletions
46
examples/polygon_aperture/input_polygon_aperture_absorb_rotate.in
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| ############################################################################### | ||
| # Particle Beam(s) | ||
| ############################################################################### | ||
| beam.npart = 50000 | ||
| beam.units = static | ||
| beam.kin_energy = 800.0 | ||
| beam.charge = 1.0e-9 | ||
| beam.particle = proton | ||
| beam.distribution = waterbag | ||
| beam.lambdaX = 2.0e-3 | ||
| beam.lambdaY = beam.lambdaX | ||
| beam.lambdaT = 0.4 | ||
| beam.lambdaPx = 4.0e-4 | ||
| beam.lambdaPy = beam.lambdaPx | ||
| beam.lambdaPt = 2.0e-3 | ||
| beam.muxpx = 0.0 | ||
| beam.muypy = 0.0 | ||
| beam.mutpt = 0.0 | ||
|
|
||
|
|
||
| ############################################################################### | ||
| # Beamline: lattice elements and segments | ||
| ############################################################################### | ||
| lattice.elements = monitor pa monitor | ||
| lattice.nslice = 1 | ||
|
|
||
| monitor.type = beam_monitor | ||
| monitor.backend = h5 | ||
|
|
||
| pa.type = polygon_aperture | ||
| pa.vertices_x = 0.5e-3 0.5e-3 -0.5e-3 -0.5e-3 -1.5e-3 -1.5e-3 -0.5e-3 -0.5e-3 0.5e-3 0.5e-3 1.5e-3 1.5e-3 0.5e-3 | ||
| pa.vertices_y = 0.5e-3 1.5e-3 1.5e-3 0.5e-3 0.5e-3 -0.5e-3 -0.5e-3 -1.5e-3 -1.5e-3 -0.5e-3 -0.5e-3 0.5e-3 0.5e-3 | ||
| pa.min_radius2 = 5.0e-7 | ||
| pa.action = "absorb" # absorb particles within the polygon | ||
| pa.rotation = 30.0 # degrees? | ||
|
|
||
| ############################################################################### | ||
| # Algorithms | ||
| ############################################################################### | ||
| algo.space_charge = false | ||
|
|
||
|
|
||
| ############################################################################### | ||
| # Diagnostics | ||
| ############################################################################### | ||
| diag.slice_step_diagnostics = true |
47 changes: 47 additions & 0 deletions
47
examples/polygon_aperture/input_polygon_aperture_absorb_rotate_offset.in
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,47 @@ | ||
| ############################################################################### | ||
| # Particle Beam(s) | ||
| ############################################################################### | ||
| beam.npart = 50000 | ||
| beam.units = static | ||
| beam.kin_energy = 800.0 | ||
| beam.charge = 1.0e-9 | ||
| beam.particle = proton | ||
| beam.distribution = waterbag | ||
| beam.lambdaX = 2.0e-3 | ||
| beam.lambdaY = beam.lambdaX | ||
| beam.lambdaT = 0.4 | ||
| beam.lambdaPx = 4.0e-4 | ||
| beam.lambdaPy = beam.lambdaPx | ||
| beam.lambdaPt = 2.0e-3 | ||
| beam.muxpx = 0.0 | ||
| beam.muypy = 0.0 | ||
| beam.mutpt = 0.0 | ||
|
|
||
|
|
||
| ############################################################################### | ||
| # Beamline: lattice elements and segments | ||
| ############################################################################### | ||
| lattice.elements = monitor pa monitor | ||
| lattice.nslice = 1 | ||
|
|
||
| monitor.type = beam_monitor | ||
| monitor.backend = h5 | ||
|
|
||
| pa.type = polygon_aperture | ||
| pa.vertices_x = 0.5e-3 0.5e-3 -0.5e-3 -0.5e-3 -1.5e-3 -1.5e-3 -0.5e-3 -0.5e-3 0.5e-3 0.5e-3 1.5e-3 1.5e-3 0.5e-3 | ||
| pa.vertices_y = 0.5e-3 1.5e-3 1.5e-3 0.5e-3 0.5e-3 -0.5e-3 -0.5e-3 -1.5e-3 -1.5e-3 -0.5e-3 -0.5e-3 0.5e-3 0.5e-3 | ||
| pa.min_radius2 = 5.0e-7 | ||
| pa.action = "absorb" # absorb particles within the polygon | ||
| pa.rotation = 30.0 # degrees? | ||
| pa.dx = 0.0006 | ||
| pa.dy = -0.0012 | ||
| ############################################################################### | ||
| # Algorithms | ||
| ############################################################################### | ||
| algo.space_charge = false | ||
|
|
||
|
|
||
| ############################################################################### | ||
| # Diagnostics | ||
| ############################################################################### | ||
| diag.slice_step_diagnostics = true |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,7 @@ | ||
| target_sources(lib | ||
| PRIVATE | ||
| Aperture.cpp | ||
| PolygonAperture.cpp | ||
| Programmable.cpp | ||
| Source.cpp | ||
| ) | ||
|
|
||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Wonderful!
Please add your tests to
examples/CMakeLists.txt