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

Jump to bottom

Add new flux point class #810

Merged
merged 10 commits into from Dec 8, 2016
Merged

Add new flux point class #810

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
3a57146
Add FluxPoints class prototype
adonath Dec 6, 2016
0a3c729
Implement prototype for FluxPoints class
adonath Dec 6, 2016
31319f7
Improve FluxPoints class dosctrings
adonath Dec 7, 2016
1739023
Minor improvements to FluxPoints.write
adonath Dec 7, 2016
f803dcf
Add FluxPoints class tests
adonath Dec 7, 2016
d70eb35
Improve FluxPoints class tests
adonath Dec 7, 2016
5cb6cdc
Minor improvements to FluxPoints docstrings
adonath Dec 7, 2016
399f64c
Remove default ul conf, because its not needed.
adonath Dec 7, 2016
638c43a
Minor improvements to FluxPoints class
adonath Dec 7, 2016
57c043e
Fix handling of HGPS flux points
adonath Dec 8, 2016
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
35 changes: 18 additions & 17 deletions gammapy/catalog/hess.py
View file
Open in desktop
Expand Up @@ -18,7 +18,7 @@
from astropy.table import Table
from astropy.coordinates import Angle
from ..extern.pathlib import Path
from ..spectrum import DifferentialFluxPoints, SpectrumFitResult
from ..spectrum import FluxPoints, SpectrumFitResult
from ..spectrum.models import PowerLaw, ExponentialCutoffPowerLaw
from .core import SourceCatalog, SourceCatalogObject
from .gammacat import SourceCatalogGammaCat, GammaCatNotFoundError
Expand Down Expand Up @@ -314,13 +314,13 @@ def _info_flux_points(self):
ss += 'Number of flux points: {}\n'.format(d['N_Flux_Points'])
ss += 'Flux points table: \n\n\t'

flux_points = self.flux_points['ENERGY', 'DIFF_FLUX', 'DIFF_FLUX_ERR_HI',
'DIFF_FLUX_ERR_LO'][:int(d['N_Flux_Points'])]
flux_points = self.flux_points.table.copy()
flux_points = flux_points[['e_ref', 'dnde', 'dnde_errn', 'dnde_errp']]
flux_points['e_ref'].format = '.3f'

flux_points['ENERGY'].format = '.3f'

flux_unit = Unit('1E-12 cm^-2 s^-1 TeV^-1')
for _ in ['DIFF_FLUX', 'DIFF_FLUX_ERR_HI', 'DIFF_FLUX_ERR_LO']:
flux_unit = Unit('1E-12 ph cm-2 s-1 TeV-1')
for _ in ['dnde', 'dnde_errp', 'dnde_errn']:
flux_points[_] = flux_points[_].to(flux_unit)
flux_points[_].format = '.3f'
flux_points[_].unit = flux_unit
Expand Down Expand Up @@ -411,18 +411,19 @@ def spectrum(self):

@property
def flux_points(self):
"""Flux points (`~gammapy.spectrum.DifferentialFluxPoints`)
"""Flux points (`~gammapy.spectrum.FluxPoints`)
"""
energy = Quantity(self.data['Flux_Points_Energy'], 'TeV')
diff_flux = Quantity(self.data['Flux_Points_Flux'], 's^-1 cm^-2 TeV^-1')
energy_err_hi = Quantity(self.data['Flux_Points_Energy_Err_Hi'], 'TeV')
energy_err_lo = Quantity(self.data['Flux_Points_Energy_Err_Lo'], 'TeV')
diff_flux_err_hi = Quantity(self.data['Flux_Points_Flux_Err_Hi'], 's^-1 cm^-2 TeV^-1')
diff_flux_err_lo = Quantity(self.data['Flux_Points_Flux_Err_Lo'], 's^-1 cm^-2 TeV^-1')
return DifferentialFluxPoints.from_arrays(
energy, diff_flux, energy_err_hi,
energy_err_lo, diff_flux_err_hi, diff_flux_err_lo,
)
table = Table()
table.meta['SED_TYPE'] = 'dnde'
mask = ~np.isnan(self.data['Flux_Points_Energy'])
e_ref = Quantity(self.data['Flux_Points_Energy'][mask], 'TeV')
table['e_ref'] = e_ref
table['e_min'] = e_ref - Quantity(self.data['Flux_Points_Energy_Err_Lo'][mask], 'TeV')
table['e_max'] = e_ref + Quantity(self.data['Flux_Points_Energy_Err_Hi'][mask], 'TeV')
table['dnde'] = Quantity(self.data['Flux_Points_Flux'][mask], 'ph s-1 cm-2 TeV-1')
table['dnde_errp'] = Quantity(self.data['Flux_Points_Flux_Err_Hi'][mask], 'ph s-1 cm-2 TeV-1')
table['dnde_errn'] = Quantity(self.data['Flux_Points_Flux_Err_Lo'][mask], 'ph s-1 cm-2 TeV-1')
return FluxPoints(table)


class SourceCatalogHGPS(SourceCatalog):
Expand Down