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

Add simulation handling to ASTERIA #52

Merged
merged 34 commits into from
Jul 1, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
b984093
Added protections/error checking for time array causing error condition
sgriswol Jun 26, 2020
7aa8d01
Added string parsing to Flavor request method
sgriswol Jun 26, 2020
e42f3e5
Cleanup and formatting
sgriswol Jun 26, 2020
20943c3
Added string parsing to Interaction request method
sgriswol Jun 26, 2020
6b22783
Formatting and clean-up
sgriswol Jun 26, 2020
f45adb5
Added config sequences
sgriswol Jun 26, 2020
89ab356
Added simulation handler
sgriswol Jun 26, 2020
5405aa2
Update IO module to use asteria.config.Configuration object to genera…
sgriswol Jun 26, 2020
7abfa44
Updated default config file with new default model and new simulation…
sgriswol Jun 26, 2020
fd897be
Rollback accidental changes on luminosity notebook
sgriswol Jun 26, 2020
4053d98
Changed default model
sgriswol Jun 26, 2020
72d8179
Added DOM data members to detector class
sgriswol Jun 26, 2020
294af96
Added guard against negative alpha values
sgriswol Jun 26, 2020
8c980f3
Added simulation fields to test.yaml for use in docs/nb/luminosity.ipynb
sgriswol Jun 26, 2020
3b02a2b
Updated notebooks
sgriswol Jun 26, 2020
af61f5b
Update PyTables dependency to avoid compatibility issues with numpy
sgriswol Jul 1, 2020
533bc04
Changed legend location to improve render time
sgriswol Jul 1, 2020
515dae0
Merge remote-tracking branch 'origin/master' into sim-handling
sgriswol Jul 1, 2020
772e42f
Changed default.yaml for example purposes.
sgriswol Jul 1, 2020
d5d8bda
Overwrite flavor __eq__, __ne__, and __hash__ to ensure proper dict i…
sgriswol Jul 1, 2020
c461890
Formatting
sgriswol Jul 1, 2020
0d058d1
Changed default.yaml field values for use in example notebooks.
sgriswol Jul 1, 2020
99dd9b0
Changed order of error checking on hierarchy and mixing scheme
sgriswol Jul 1, 2020
4d7ec80
Added data members for time and energy array definition
sgriswol Jul 1, 2020
9fcddc9
Refactored energy data member name, added units to E_per_V data member
sgriswol Jul 1, 2020
bf9a8b9
Refactored save() kwarg, added run method()
sgriswol Jul 1, 2020
7928b76
Added units to load() method
sgriswol Jul 1, 2020
d97458a
Added methods for quick access and printing configuration info
sgriswol Jul 1, 2020
bad777b
Added Docstrings
sgriswol Jul 1, 2020
1672f0b
Added more docstrings
sgriswol Jul 1, 2020
59d0c31
Added Notebook on using simulation handler
sgriswol Jul 1, 2020
9efc342
Removed unnecessary imports
sgriswol Jul 1, 2020
159ea3d
Added 'default' and 'none' to IO Module hierarchy parsing
sgriswol Jul 1, 2020
4cdb378
Fixed mishandling of neutrino mass ordering
sgriswol Jul 1, 2020
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
35 changes: 25 additions & 10 deletions data/config/default.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,26 +28,41 @@ detector:

# The source configuration is loaded by the asteria.source module.
source:
name: Sukh_SFHo_z9.6
model: Sukhbold 9.6Msun progenitor with SFHo equation of state
name: Nakazato-Shen-z0.02-t_rev300ms-s13.0
model: Nakazato 13.0Msun progenitor with Shen equation of state, metallicity z=0.02 and shock revival time t_rev=300ms
progenitor:
mass: 9.6 M_sun
mass: 13.0 M_sun
# Distance model: can be FixedDistance or StellarDensity
distance:
model: FixedDistance
distance: 10 kpc
uncertainty: 0 kpc
# distance
# model: StellarDensity
# path: stellar/sn_radial_distrib_adams.fits
# add_LMC: False
# add_SMC: False
table:
format: fits
path: snfluxes/Sukhbold_2015/sukhbold-SFHo-z9.6.fits
path: spectra/nakazato-shen-z0.02-t_rev300ms-s13.0.fits

# The IO configuration is loaded by the asteria.IO module.
IO:
table:
format: h5
path: sukhbold-SFHo-z9.6.h5
path: processed/nakazato-shen-z0.02-t_rev300ms-s13.0.h5

# The simulation configurable is loaded by the asteria.simualtionHandler module
simulation:
interactions: default
flavors: nu_e, nu_e_bar, nu_x, nu_x_bar
hierarchy: default
mixing:
scheme: adiabatic-msw
angle: 33.2 deg
energy:
min: 0 MeV
max: 100 MeV
step: 0.1 MeV
size: 10001
time:
min: -1 s
max: 1 s
step: 1 ms
size: 2001

21 changes: 20 additions & 1 deletion data/config/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,29 @@ source:
# add_SMC: False
table:
format: fits
path: spectra/sukhbold-SFHo-z9.6.fits
path: snfluxes/Sukhbold_2015/sukhbold-SFHo-z9.6.fits

# The IO configuration is loaded by the asteria.IO module.
IO:
table:
format: h5
path: processed/sukhbold-SFHo-z9.6.h5

# The simulation configurable is loaded by the asteria.simulationHandler module
simulation:
interactions: default
flavors: default
hierarchy: none
mixing:
scheme:
angle:
energy:
min: 0 MeV
max: 100 MeV
step: 0.1 MeV
size:
time:
min: -1 s
max: 3 s
step: 1 ms
size:
219 changes: 140 additions & 79 deletions docs/nb/cross_sections.ipynb

Large diffs are not rendered by default.

58 changes: 30 additions & 28 deletions docs/nb/detector.ipynb

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion docs/nb/detector_hits.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -353,7 +353,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.7.1"
"version": "3.7.3"
}
},
"nbformat": 4,
Expand Down
Loading