From 14ec3e2584821f49b151af08cc07a23340711f2e Mon Sep 17 00:00:00 2001 From: LukasK13 Date: Tue, 14 Apr 2020 11:17:21 +0200 Subject: [PATCH] Check for extrapolation --- esbo_etc/classes/SpectralQty.py | 37 ++++++++++++++++++++++++++------ tests/test_SpectralQty.py | 38 +++++++++++++++++++++++++-------- 2 files changed, 60 insertions(+), 15 deletions(-) diff --git a/esbo_etc/classes/SpectralQty.py b/esbo_etc/classes/SpectralQty.py index 6da746c..e2d1bc7 100644 --- a/esbo_etc/classes/SpectralQty.py +++ b/esbo_etc/classes/SpectralQty.py @@ -3,6 +3,7 @@ from scipy.interpolate import interp1d import astropy.units as u import math from typing import Union +import logging class SpectralQty: @@ -10,7 +11,7 @@ class SpectralQty: A class to hold and work with spectral quantities """ - def __init__(self, wl: u.Quantity, qty: u.Quantity): + def __init__(self, wl: u.Quantity, qty: u.Quantity, extrapolate: bool = False): """ Initialize a new spectral quantity @@ -35,6 +36,7 @@ class SpectralQty: self.qty = qty * u.dimensionless_unscaled else: error("Lengths not matching") + self._extrapolate = extrapolate def __eq__(self, other) -> bool: """ @@ -87,7 +89,13 @@ class SpectralQty: return SpectralQty(self.wl, self.qty + other.qty) # Wavelengths are not matching, rebinning needed else: - return SpectralQty(self.wl, self.qty + other.rebin(self.wl).qty) + # Rebin addend + other_rebinned = other.rebin(self.wl) + if len(self.wl) == len(other_rebinned.wl) and all(self.wl == other_rebinned.wl): + return SpectralQty(self.wl, self.qty + other_rebinned.qty) + else: + # Wavelengths are still not matching as extrapolation is disabled, rebin this spectral quantity + return SpectralQty(other_rebinned.wl, self.rebin(other_rebinned.wl).qty + other_rebinned.qty) else: error("Units are not matching for addition.") @@ -125,7 +133,13 @@ class SpectralQty: return SpectralQty(self.wl, self.qty - other.qty) # Wavelengths are not matching, rebinning needed else: - return SpectralQty(self.wl, self.qty - other.rebin(self.wl).qty) + # Rebin subtrahend + other_rebinned = other.rebin(self.wl) + if len(self.wl) == len(other_rebinned.wl) and all(self.wl == other_rebinned.wl): + return SpectralQty(self.wl, self.qty - other_rebinned.qty) + else: + # Wavelengths are still not matching as extrapolation is disabled, rebin this spectral quantity + return SpectralQty(other_rebinned.wl, self.rebin(other_rebinned.wl).qty - other_rebinned.qty) else: error("Units are not matching for substraction.") @@ -155,7 +169,13 @@ class SpectralQty: return SpectralQty(self.wl, self.qty * other.qty) # Wavelengths are not matching, rebinning needed else: - return SpectralQty(self.wl, self.qty * other.rebin(self.wl).qty) + # Rebin factor + other_rebinned = other.rebin(self.wl) + if len(self.wl) == len(other_rebinned.wl) and all(self.wl == other_rebinned.wl): + return SpectralQty(self.wl, self.qty * other_rebinned.qty) + else: + # Wavelengths are still not matching as extrapolation is disabled, rebin this spectral quantity + return SpectralQty(other_rebinned.wl, self.rebin(other_rebinned.wl).qty * other_rebinned.qty) else: error("Units are not matching for multiplication.") @@ -179,5 +199,10 @@ class SpectralQty: if wl.unit != self.wl.unit: error("Mismatching units for rebinning: " + wl.unit + ", " + self.wl.unit) - f = interp1d(self.wl, self.qty, fill_value="extrapolate") - return SpectralQty(wl, f(wl) * self.qty.unit) + if not self._extrapolate: + if min(wl) < min(self.wl) or max(wl) > max(self.wl): + logging.warning("Extrapolation disabled, bandwidth will be reduced.") + # Remove new wavelengths where extrapolation would have been necessary + wl = [x.value for x in wl if min(self.wl) <= x <= max(self.wl)] * wl.unit + f = interp1d(self.wl, self.qty.value, fill_value="extrapolate") + return SpectralQty(wl, f(wl.to(self.wl.unit)) * self.qty.unit) diff --git a/tests/test_SpectralQty.py b/tests/test_SpectralQty.py index 542c857..4e10c49 100644 --- a/tests/test_SpectralQty.py +++ b/tests/test_SpectralQty.py @@ -31,9 +31,14 @@ class TestSpectralQty(TestCase): SpectralQty(self.wl, [1.1, 2.4, 3.9, 5.6] << u.W / (u.m * u.nm))) self.assertEqual(SpectralQty(self.wl, np.arange(1, 5, 1) << u.m) * self.sqty, SpectralQty(self.wl, [1.1, 2.4, 3.9, 5.6] << u.W / (u.m * u.nm))) - # rebin - self.assertEqual(self.sqty * SpectralQty(np.arange(200.5, 204.5, 1) << u.nm, np.arange(1, 5, 1) << u.m), - SpectralQty(self.wl, [0.55, 1.8, 3.25, 4.9] << u.W / (u.m * u.nm))) + # rebin without extrapolation and without reduction + self.assertEqual( + self.sqty * SpectralQty(np.arange(199.5, 204.5, 1) << u.nm, np.arange(1, 6, 1) << u.m), + SpectralQty(self.wl, [1.65, 3.0, 4.55, 6.3] * u.W / (u.m * u.nm))) + # rebin without extrapolation and with reduction + self.assertEqual( + self.sqty * SpectralQty(np.arange(200.5, 204.5, 1) << u.nm, np.arange(1, 5, 1) << u.m), + SpectralQty(range(201, 204) << u.nm, [1.8, 3.25, 4.9] << u.W / (u.m * u.nm))) def test___sub__(self): # Quantity @@ -44,10 +49,14 @@ class TestSpectralQty(TestCase): self.assertEqual( self.sqty - SpectralQty(np.arange(200, 204, 1) << u.nm, np.arange(1, 5, 1) << u.W / (u.m ** 2 * u.nm)), SpectralQty(self.wl, [0.1, -0.8, -1.7, -2.6] * u.W / (u.m ** 2 * u.nm))) - # rebin + # rebin without extrapolation and without reduction + self.assertEqual( + self.sqty - SpectralQty(np.arange(199.5, 204.5, 1) << u.nm, np.arange(1, 6, 1) << u.W / (u.m ** 2 * u.nm)), + SpectralQty(self.wl, [-0.4, -1.3, -2.2, -3.1] * u.W / (u.m ** 2 * u.nm))) + # rebin without extrapolation and with reduction 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)), - SpectralQty(self.wl, [0.6, -0.3, -1.2, -2.1] * u.W / (u.m ** 2 * u.nm))) + SpectralQty(range(201, 204) << u.nm, [-0.3, -1.2, -2.1] << u.W / (u.m ** 2 * u.nm))) def test___add__(self): # Quantity @@ -58,22 +67,33 @@ class TestSpectralQty(TestCase): self.assertEqual( self.sqty + SpectralQty(np.arange(200, 204, 1) << u.nm, np.arange(1, 5, 1) << u.W / (u.m ** 2 * u.nm)), SpectralQty(self.wl, [2.1, 3.2, 4.3, 5.4] * u.W / (u.m ** 2 * u.nm))) - # rebin + # rebin without extrapolation and without reduction + self.assertEqual( + self.sqty + SpectralQty(np.arange(199.5, 204.5, 1) << u.nm, np.arange(1, 6, 1) << u.W / (u.m ** 2 * u.nm)), + SpectralQty(self.wl, [2.6, 3.7, 4.8, 5.9] * u.W / (u.m ** 2 * u.nm))) + # rebin without extrapolation and with reduction 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)), - SpectralQty(self.wl, [1.6, 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))) def test_rebinning(self): # Test interpolation wl_new = np.arange(200.5, 210.5, 1) << u.nm + sqty_res = SpectralQty(wl_new[:3], [1.15, 1.25, 1.35] << u.W / (u.m ** 2 * u.nm)) + sqty_rebin = self.sqty.rebin(wl_new) + self.assertEqual(sqty_rebin, sqty_res) + + # Test extrapolation + wl_new = np.arange(200.5, 210.5, 1) << u.nm sqty_res = SpectralQty(wl_new, [1.15, 1.25, 1.35, 1.45, 1.55, 1.65, 1.75, 1.85, 1.95, 2.05] << u.W / (u.m ** 2 * u.nm)) - sqty_rebin = self.sqty.rebin(wl_new) + sqty_extrapol = SpectralQty(self.wl, self.qty, extrapolate=True) + sqty_rebin = sqty_extrapol.rebin(wl_new) self.assertEqual(sqty_rebin, sqty_res) # Test binning self.setUp() wl_new = np.arange(200.5, 210, 2) << u.nm - sqty_res = SpectralQty(wl_new, [1.15, 1.35, 1.55, 1.75, 1.95] << u.W / (u.m ** 2 * u.nm)) + sqty_res = SpectralQty(wl_new[:2], [1.15, 1.35] << u.W / (u.m ** 2 * u.nm)) sqty_rebin = self.sqty.rebin(wl_new) self.assertEqual(sqty_rebin, sqty_res)