Skip to content

Commit

Permalink
Convert unneeded properties to attributes
Browse files Browse the repository at this point in the history
  • Loading branch information
yeganer committed Jun 6, 2017
1 parent 5e04ec3 commit c3b1a69
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 18 deletions.
26 changes: 8 additions & 18 deletions tardis/montecarlo/spectrum.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ class TARDISSpectrum(object):
"""

def __init__(self, _frequency, luminosity):

# Check for correct inputs
if not _frequency.shape[0] == luminosity.shape[0] + 1:
raise ValueError(
"shape of '_frequency' and 'luminosity' are not compatible"
Expand All @@ -47,25 +49,13 @@ def __init__(self, _frequency, luminosity):
self._frequency = _frequency.to('Hz', u.spectral())
self.luminosity = luminosity.to('erg / s')

@property
def frequency(self):
return self._frequency[:-1]
self.frequency = self._frequency[:-1]
self.delta_frequency = self._frequency[1] - self._frequency[0]
self.wavelength = self.frequency.to('angstrom', u.spectral())

@property
def delta_frequency(self):
return self.frequency[1] - self.frequency[0]

@property
def wavelength(self):
return self.frequency.to('angstrom', u.spectral())

@property
def luminosity_density_nu(self):
return (self.luminosity / self.delta_frequency).to('erg / (s Hz)')

@property
def luminosity_density_lambda(self):
return self.f_nu_to_f_lambda(
self.luminosity_density_nu = (
self.luminosity / self.delta_frequency).to('erg / (s Hz)')
self.luminosity_density_lambda = self.f_nu_to_f_lambda(
self.luminosity_density_nu,
)

Expand Down
9 changes: 9 additions & 0 deletions tardis/montecarlo/tests/test_spectrum.py
Original file line number Diff line number Diff line change
Expand Up @@ -196,3 +196,12 @@ def test_creat_from_wl(spectrum):
)

compare_spectra(actual, spectrum)


def test_creat_from_J(spectrum):
actual = TARDISSpectrum(
spectrum._frequency,
spectrum.luminosity.to('J / s')
)

compare_spectra(actual, spectrum)

0 comments on commit c3b1a69

Please sign in to comment.