esbo_ds/ESBO-ETC
esbo_ds/ESBO-ETC
11
0
Fork 1
Code Issues 1 Pull Requests Releases 1 Wiki Activity

Sum spectral quantity and lambda

Browse Source
This commit is contained in:
Lukas Klass 2020-04-14 19:54:50 +02:00
parent 998ae066af
commit f477c86c74
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
esbo_etc/classes/SpectralQty.py
View File

@ -1,8 +1,8 @@
from esbo_etc.lib.helpers import error from esbo_etc.lib.helpers import error, isLambda
from scipy.interpolate import interp1d from scipy.interpolate import interp1d
import astropy.units as u import astropy.units as u
import math import math
from typing import Union from typing import Union, Callable
import logging import logging
from astropy.io import ascii from astropy.io import ascii
import re import re
@ -108,13 +108,13 @@ class SpectralQty:
all([math.isclose(x, y, rel_tol=1e-5) for x, y in zip(self.wl.value, other.wl.value)]) and \ all([math.isclose(x, y, rel_tol=1e-5) for x, y in zip(self.wl.value, other.wl.value)]) and \
all([math.isclose(x, y, rel_tol=1e-5) for x, y in zip(self.qty.value, other.qty.value)]) all([math.isclose(x, y, rel_tol=1e-5) for x, y in zip(self.qty.value, other.qty.value)])
def __add__(self, other: Union[int, float, u.Quantity, "SpectralQty"]) -> "SpectralQty": def __add__(self, other: Union[int, float, u.Quantity, "SpectralQty", Callable]) -> "SpectralQty":
""" """
Calculate the sum with another object Calculate the sum with another object
Parameters Parameters
---------- ----------
other : Union[int, float, u.Quantity, "SpectralQty"] other : Union[int, float, u.Quantity, "SpectralQty", Callable]
Addend to be added to this object. If the binning of the object on the right hand side differs Addend to be added to this object. If the binning of the object on the right hand side differs
from the binning of the left object, the object on the right hand side will be rebinned. from the binning of the left object, the object on the right hand side will be rebinned.
@ -132,6 +132,9 @@ class SpectralQty:
return SpectralQty(self.wl, self.qty + other) return SpectralQty(self.wl, self.qty + other)
else: else:
raise TypeError("Units are not matching for addition.") raise TypeError("Units are not matching for addition.")
# Summand is of type lambda
elif isLambda(other):
return SpectralQty(self.wl, self.qty + [other(wl).value for wl in self.wl] * other(self.wl[0]).unit)
# Summand is of type SpectralQty # Summand is of type SpectralQty
else: else:
if other.wl.unit.is_equivalent(self.wl.unit) and other.qty.unit.is_equivalent(self.qty.unit): if other.wl.unit.is_equivalent(self.wl.unit) and other.qty.unit.is_equivalent(self.qty.unit):

4
tests/test_SpectralQty.py
View File

@ -75,6 +75,10 @@ class TestSpectralQty(TestCase):
self.assertEqual( self.assertEqual(
self.sqty + SpectralQty(np.arange(200.5, 204.5, 1) << u.nm, np.arange(1, 5, 1) << u.W / (u.m ** 2 * u.nm)), self.sqty + SpectralQty(np.arange(200.5, 204.5, 1) << u.nm, np.arange(1, 5, 1) << u.W / (u.m ** 2 * u.nm)),
SpectralQty(range(201, 204) << u.nm, [2.7, 3.8, 4.9] << u.W / (u.m ** 2 * u.nm))) SpectralQty(range(201, 204) << u.nm, [2.7, 3.8, 4.9] << u.W / (u.m ** 2 * u.nm)))
# lambda
sqty_2 = lambda wl: 1 * u.W / (u.m ** 2 * u.nm ** 2) * wl
self.assertEqual(self.sqty + sqty_2,
SpectralQty(self.wl, [201.1, 202.2, 203.3, 204.4] << u.W / (u.m**2 * u.nm)))
def test_rebinning(self): def test_rebinning(self):
# Test interpolation # Test interpolation