Skip to content
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

Easier Output Saving for Proton Radiography #1134

Merged
merged 78 commits into from Oct 4, 2021
Merged
Show file tree
Hide file tree
Changes from 51 commits
Commits
Show all changes
78 commits
Select commit Hold shift + click to select a range
aa2134d
Restructured to allow saving. Synthetic_radiograph is now a separate …
pheuer May 8, 2021
b9ba245
pre-commit
pheuer May 8, 2021
cf2e714
Updated notebooks
pheuer May 8, 2021
a22756a
Create 1134.breaking.rst
pheuer May 8, 2021
6d629b1
__all__ update
pheuer May 8, 2021
fb3a574
Update 1134.breaking.rst
pheuer May 8, 2021
bfd17fd
Added file saving test
pheuer May 8, 2021
8bd1feb
Notebook bug and pre-commit
pheuer May 8, 2021
ce38210
Made file saving test actually work
pheuer May 8, 2021
2b4ea52
grid_scale_length minor refactor
pheuer May 10, 2021
335305c
Started adding HDF5 save option
pheuer May 11, 2021
c9dc580
Revert "Started adding HDF5 save option"
pheuer May 12, 2021
9f0f676
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] May 13, 2021
02f3161
Merge branch 'master' into easier_saving_prad
StanczakDominik May 13, 2021
451d12e
Cleanup dictionary creation a little
StanczakDominik May 13, 2021
33fda67
Renamed module and function
pheuer Jul 13, 2021
4aee3b6
pre-commit
pheuer Jul 13, 2021
91096d3
Trying to fix the docs after module name change
pheuer Jul 13, 2021
1a92cb4
Merge branch 'main' into easier_saving_prad
pheuer Jul 13, 2021
26193f9
Update charged_particle_radiography.rst
pheuer Jul 13, 2021
7528fd3
Update charged_particle_radiography.rst
pheuer Jul 13, 2021
d34f4b5
Save kinetic energy of all particles in addition to locations
pheuer Jul 17, 2021
aa7680c
Merge branch 'main_from_pp' into 1134--easier_saving_prad
rocco8773 Aug 17, 2021
5bdb4e7
Merge branch 'main' into easier_saving_prad
pheuer Aug 26, 2021
a138fa0
Apply suggestions from code review
pheuer Aug 26, 2021
faf3b56
Changed results dictionary in response to feedback
pheuer Aug 26, 2021
48ea519
Updated doc/index.rst
pheuer Aug 26, 2021
326e009
Update charged_particle_radiography_particle_tracing_custom_source.ipynb
pheuer Aug 26, 2021
22640ab
Bugfix
pheuer Aug 26, 2021
8e50bec
Update charged_particle_radiography_particle_tracing_wire_mesh.ipynb
pheuer Aug 26, 2021
e055960
Fix docstring error
pheuer Aug 26, 2021
959133e
Pre-run notebooks
pheuer Aug 26, 2021
60c16b5
Enforced not changing particles or meshes after simulation has run
pheuer Aug 30, 2021
ce33204
run() now does not return the results_dict (or anything else)
pheuer Aug 30, 2021
32bc104
Update plasmapy/diagnostics/charged_particle_radiography.py
pheuer Aug 30, 2021
bf7e8aa
Update plasmapy/diagnostics/charged_particle_radiography.py
pheuer Aug 30, 2021
4a6ff71
Added Parameters header to create and load particle methods
pheuer Aug 30, 2021
996acc9
Merge branch 'easier_saving_prad' of https://github.com/pheuer/Plasma…
pheuer Aug 30, 2021
c51a628
result -> results
pheuer Aug 30, 2021
436f9d5
Apply suggestions from code review
pheuer Aug 30, 2021
485ad94
Update plasmapy/diagnostics/charged_particle_radiography.py
pheuer Aug 30, 2021
0ba226e
Update charged_particle_radiography.py
pheuer Aug 30, 2021
ba5be56
Re-ran notebooks
pheuer Aug 30, 2021
8833e28
Apply suggestions from code review
pheuer Aug 30, 2021
905e552
Apply suggestions from code review
pheuer Aug 30, 2021
a2a6bef
Apply suggestions from code review
pheuer Aug 31, 2021
433445d
Changed docstring and scale factor on default size
pheuer Aug 31, 2021
889ea51
Added input validation for `size` keyword in `synthetic_radiograph`
pheuer Aug 31, 2021
08a01d6
Removed artificial zeros in OD intensity calculation.
pheuer Aug 31, 2021
2d7c2ff
Updated changelog entries
pheuer Sep 15, 2021
0b1b7c5
pre-commit
pheuer Sep 15, 2021
a47eb77
Update changelog/1134.breaking.3.rst
pheuer Sep 15, 2021
526c45f
Hopefully fixed links in changelog
pheuer Sep 15, 2021
5fbb300
Update setup.cfg
pheuer Sep 29, 2021
a49e44d
Merge branch 'main' into easier_saving_prad
StanczakDominik Sep 30, 2021
48f51f7
Apply suggestions from code review
pheuer Oct 4, 2021
5cef6b3
Apply suggestions from code review
pheuer Oct 4, 2021
c3423be
Applied change from code review
pheuer Oct 4, 2021
9a06bdd
Merge branch 'easier_saving_prad' of https://github.com/pheuer/Plasma…
pheuer Oct 4, 2021
88a3e96
Drop units on max_deflection in saved results
pheuer Oct 4, 2021
4794336
Implemented suggested tests
pheuer Oct 4, 2021
e4a704c
pre-commit and formatting
pheuer Oct 4, 2021
8f48305
keep docstring under line length of 80
rocco8773 Oct 4, 2021
7e71ed7
updated docstring for max_deflection property in save_results
pheuer Oct 4, 2021
d453c79
Apply suggestions from code review
pheuer Oct 4, 2021
8418d77
Update plasmapy/diagnostics/tests/test_charged_particle_radiography.py
pheuer Oct 4, 2021
b91b0d7
Code review minutia
pheuer Oct 4, 2021
23b7fb8
Update plasmapy/diagnostics/tests/test_charged_particle_radiography.py
pheuer Oct 4, 2021
7baee34
renamed 1134.breaking.rst to 1134.breaking.1.rst; fixed cross-ref links
rocco8773 Oct 4, 2021
e3a9077
Merge remote-tracking branch 'pheuer/easier_saving_prad' into 1134--e…
rocco8773 Oct 4, 2021
2bea520
cleanup breaking changelog entries
rocco8773 Oct 4, 2021
7abd1b1
cleanup bug changelog entry
rocco8773 Oct 4, 2021
af40c27
changelog type is bugfix, not bug
rocco8773 Oct 4, 2021
0684e67
cleanup trivial change log entry
rocco8773 Oct 4, 2021
b57632a
renamed braking to feature changelog entry
rocco8773 Oct 4, 2021
5372b0a
repaired cross-ref linkgs
rocco8773 Oct 4, 2021
b1a86b0
repaired cross-ref links
rocco8773 Oct 4, 2021
c548e55
make inline code block instead of cross-ref
rocco8773 Oct 4, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions changelog/1134.breaking.2.rst
@@ -0,0 +1,2 @@
Added the `save_results()` function to `Tracker` to save results to a `numpy.npz` file.
`synthetic_radiograph` is now a separate function in the `charged_particle_radiograph` module that takes either a `Tracker` object or a result dictionary as an argument.
2 changes: 2 additions & 0 deletions changelog/1134.breaking.3.rst
@@ -0,0 +1,2 @@
`~plasmapy.diagnostics.charged_particle_radiograph.Tracker()` no longer supports making changes to a `Tracker` object and re-running.
pheuer marked this conversation as resolved.
Show resolved Hide resolved
Subsequent simulations should be performed by instantiating a new `Tracker` object.
2 changes: 2 additions & 0 deletions changelog/1134.breaking.rst
@@ -0,0 +1,2 @@
Renamed `~plasmapy.diagnostics.proton_radiography` to `~plasmapy.diagnostics.charged_particle_radiography`,
and renamed the `SyntheticProtonRadiograph` class within that module to `Tracker`.
2 changes: 2 additions & 0 deletions changelog/1134.bug.rst
@@ -0,0 +1,2 @@
`~plasmapy.diagnostics.charged_particle_radiograph.synthetic_radiograph` run with the `optical_density` keyword will now return `np.nan` where the
source profile `I0` is zero. Previously, an incorrect value was returned.
2 changes: 2 additions & 0 deletions changelog/1134.trivial.rst
@@ -0,0 +1,2 @@
`~plasmapy.diagnostics.charged_particle_radiograph.synthetic_radiograph` now determines the default detector size to be the smallest
detector plane centered on the origin that includes all particles.
16 changes: 16 additions & 0 deletions docs/ad/diagnostics/charged_particle_radiography.rst
@@ -0,0 +1,16 @@
.. _charged_particle_radiography:

*************************************
Charged particle radiography analysis
*************************************

.. currentmodule:: plasmapy.diagnostics.charged_particle_radiography

.. automodapi:: plasmapy.diagnostics.charged_particle_radiography

.. nbgallery::
:caption: Examples

/notebooks/diagnostics/charged_particle_radiography_particle_tracing
/notebooks/diagnostics/charged_particle_radiography_particle_tracing_custom_source
/notebooks/diagnostics/charged_particle_radiography_particle_tracing_wire_mesh
2 changes: 1 addition & 1 deletion docs/ad/diagnostics/index.rst
Expand Up @@ -10,7 +10,7 @@
:maxdepth: 1
:caption: Sub-Packages & Modules

proton_radiography
charged_particle_radiography
Swept Langmuir (will be deprecated) <langmuir>
thomson

Expand Down
16 changes: 0 additions & 16 deletions docs/ad/diagnostics/proton_radiography.rst

This file was deleted.

2 changes: 1 addition & 1 deletion docs/index.rst
Expand Up @@ -9,7 +9,7 @@ PlasmaPy Documentation
.. nbgallery::
:hidden:

notebooks/diagnostics/proton_radiography_particle_tracing
notebooks/diagnostics/charged_particle_radiography_particle_tracing
notebooks/dispersion/two_fluid_dispersion
notebooks/diagnostics/thomson

Expand Down

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.