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 proton Synchrotron #150

Closed
wants to merge 9 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ env:
- PYTHON_VERSION=3.6
- NUMPY_VERSION=1.13
- ASTROPY_VERSION=stable
- CONDA_DEPENDENCIES='pytest pip Cython jinja2 pyyaml scipy matplotlib h5py mock sphinx_rtd_theme'
- PIP_DEPENDENCIES='emcee corner'
- CONDA_DEPENDENCIES='pytest pip Cython jinja2 pyyaml scipy matplotlib h5py mock sphinx_rtd_theme traitlets'
- PIP_DEPENDENCIES='emcee corner numtraits'

matrix:
- PYTHON_VERSION=2.7 SETUP_CMD='egg_info'
Expand Down
3 changes: 3 additions & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
0.9 (unreleased)
----------------

- Added the `ProtonSynchrotron` class to compute synchrotron radiation from
proton populations.

0.8.3 (2018-11-27)
------------------

Expand Down
4 changes: 2 additions & 2 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ environment:
PYTHON_ARCH: "64" # needs to be set for CMD_IN_ENV to succeed. If a mix
# of 32 bit and 64 bit builds are needed, move this
# to the matrix section.
CONDA_DEPENDENCIES: "pytest pip Cython jinja2 pyyaml scipy matplotlib h5py mock sphinx_rtd_theme"
PIP_DEPENDENCIES: "emcee"
CONDA_DEPENDENCIES: "pytest pip Cython jinja2 pyyaml scipy matplotlib h5py mock sphinx_rtd_theme traitlets"
PIP_DEPENDENCIES: "emcee numtraits"
ASTROPY_VERSION: "stable"

matrix:
Expand Down
11 changes: 10 additions & 1 deletion naima/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,20 @@
validate_array,
validate_physical_type,
)
from .radiative import Synchrotron, InverseCompton, PionDecay, Bremsstrahlung
from .radiative import (
Synchrotron,
ElectronSynchrotron,
ProtonSynchrotron,
InverseCompton,
PionDecay,
Bremsstrahlung,
)
from .model_utils import memoize

__all__ = [
"Synchrotron",
"ElectronSynchrotron",
"ProtonSynchrotron",
"InverseCompton",
"PionDecay",
"Bremsstrahlung",
Expand Down
Loading