Merge e7b8370 into 59b3f77

karllark · Sep 5, 2019 · ee12afc · ee12afc
2 parents 59b3f77 + e7b8370
commit ee12afc
Show file tree

Hide file tree

Showing 15 changed files with 91 additions and 359 deletions.
diff --git a/dust_extinction/averages.py b/dust_extinction/averages.py
@@ -184,7 +184,7 @@ def evaluate(self, in_x):
             optnir_axav_x,
             optnir_axav_y,
             self.x_range,
-            "G03",
+            "G03_SMCBar",
         )
 
 
@@ -350,7 +350,7 @@ def evaluate(self, in_x):
             optnir_axav_x,
             optnir_axav_y,
             self.x_range,
-            "G03",
+            "G03_LMCAvg",
         )
 
 
@@ -519,7 +519,7 @@ def evaluate(self, in_x):
             optnir_axav_x,
             optnir_axav_y,
             self.x_range,
-            "G03",
+            "G03_LMC2",
         )
 
 
@@ -1577,7 +1577,7 @@ def evaluate(self, in_x):
         x = _get_x_in_wavenumbers(in_x)
 
         # check that the wavenumbers are within the defined range
-        _test_valid_x_range(x, x_range_GCC09, "GCC09")
+        _test_valid_x_range(x, x_range_GCC09, "GCC09_MWAvg")
 
         # P92 parameters fit to the data using uncs as weights
         p92_fit = P92(

diff --git a/dust_extinction/parameter_averages.py b/dust_extinction/parameter_averages.py
@@ -859,7 +859,7 @@ class M14(BaseExtRvModel):
         plt.show()
     """
 
-    Rv_range = [2.0, 7.0]
+    Rv_range = [2.0, 6.0]
     x_range = x_range_M14
 
     def evaluate(self, in_x, Rv):

diff --git a/dust_extinction/tests/test_ccm89.py b/dust_extinction/tests/test_ccm89.py
@@ -5,36 +5,6 @@
 from astropy.modeling import InputParameterError
 
 from ..parameter_averages import CCM89
-from .helpers import _invalid_x_range
-
-
-@pytest.mark.parametrize("Rv_invalid", [-1.0, 0.0, 1.9, 6.1, 10.0])
-def test_invalid_Rv_input(Rv_invalid):
-    with pytest.raises(InputParameterError) as exc:
-        CCM89(Rv=Rv_invalid)
-    assert exc.value.args[0] == "parameter Rv must be between 2.0 and 6.0"
-
-
-@pytest.mark.parametrize("x_invalid", [-1.0, 0.2, 10.1, 100.0])
-def test_invalid_wavenumbers(x_invalid):
-    _invalid_x_range(x_invalid, CCM89(Rv=3.1), "CCM89")
-
-
-@pytest.mark.parametrize("x_invalid_wavenumber", [-1.0, 0.2, 10.1, 100.0] / u.micron)
-def test_invalid_wavenumbers_imicron(x_invalid_wavenumber):
-    _invalid_x_range(x_invalid_wavenumber, CCM89(Rv=3.1), "CCM89")
-
-
-@pytest.mark.parametrize("x_invalid_micron", u.micron / [-1.0, 0.2, 10.1, 100.0])
-def test_invalid_micron(x_invalid_micron):
-    _invalid_x_range(x_invalid_micron, CCM89(Rv=3.1), "CCM89")
-
-
-@pytest.mark.parametrize(
-    "x_invalid_angstrom", u.angstrom * 1e4 / [-1.0, 0.2, 10.1, 100.0]
-)
-def test_invalid_angstrom(x_invalid_angstrom):
-    _invalid_x_range(x_invalid_angstrom, CCM89(Rv=3.1), "CCM89")
 
 
 def test_axav_ccm89_table3():

diff --git a/dust_extinction/tests/test_f04.py b/dust_extinction/tests/test_f04.py
@@ -4,30 +4,6 @@
 import astropy.units as u
 
 from ..parameter_averages import F04
-from .helpers import _invalid_x_range
-
-
-x_bad = [-1.0, 0.1, 12.0, 100.0]
-
-
-@pytest.mark.parametrize("x_invalid", x_bad)
-def test_invalid_wavenumbers(x_invalid):
-    _invalid_x_range(x_invalid, F04(), "F04")
-
-
-@pytest.mark.parametrize("x_invalid_wavenumber", x_bad / u.micron)
-def test_invalid_wavenumbers_imicron(x_invalid_wavenumber):
-    _invalid_x_range(x_invalid_wavenumber, F04(), "F04")
-
-
-@pytest.mark.parametrize("x_invalid_micron", u.micron / x_bad)
-def test_invalid_micron(x_invalid_micron):
-    _invalid_x_range(x_invalid_micron, F04(), "F04")
-
-
-@pytest.mark.parametrize("x_invalid_angstrom", u.angstrom * 1e4 / x_bad)
-def test_invalid_angstrom(x_invalid_angstrom):
-    _invalid_x_range(x_invalid_angstrom, F04(), "F04")
 
 
 def get_axav_cor_vals():

diff --git a/dust_extinction/tests/test_f20.py b/dust_extinction/tests/test_f20.py
@@ -4,30 +4,6 @@
 import astropy.units as u
 
 from ..parameter_averages import F20
-from .helpers import _invalid_x_range
-
-
-x_bad = [-1.0, 0.1, 12.0, 100.0]
-
-
-@pytest.mark.parametrize("x_invalid", x_bad)
-def test_invalid_wavenumbers(x_invalid):
-    _invalid_x_range(x_invalid, F20(), "F20")
-
-
-@pytest.mark.parametrize("x_invalid_wavenumber", x_bad / u.micron)
-def test_invalid_wavenumbers_imicron(x_invalid_wavenumber):
-    _invalid_x_range(x_invalid_wavenumber, F20(), "F20")
-
-
-@pytest.mark.parametrize("x_invalid_micron", u.micron / x_bad)
-def test_invalid_micron(x_invalid_micron):
-    _invalid_x_range(x_invalid_micron, F20(), "F20")
-
-
-@pytest.mark.parametrize("x_invalid_angstrom", u.angstrom * 1e4 / x_bad)
-def test_invalid_angstrom(x_invalid_angstrom):
-    _invalid_x_range(x_invalid_angstrom, F20(), "F20")
 
 
 def get_axav_cor_vals():

diff --git a/dust_extinction/tests/test_f99.py b/dust_extinction/tests/test_f99.py
@@ -4,30 +4,6 @@
 import astropy.units as u
 
 from ..parameter_averages import F99
-from .helpers import _invalid_x_range
-
-
-x_bad = [-1.0, 0.1, 12.0, 100.0]
-
-
-@pytest.mark.parametrize("x_invalid", x_bad)
-def test_invalid_wavenumbers(x_invalid):
-    _invalid_x_range(x_invalid, F99(), "F99")
-
-
-@pytest.mark.parametrize("x_invalid_wavenumber", x_bad / u.micron)
-def test_invalid_wavenumbers_imicron(x_invalid_wavenumber):
-    _invalid_x_range(x_invalid_wavenumber, F99(), "F99")
-
-
-@pytest.mark.parametrize("x_invalid_micron", u.micron / x_bad)
-def test_invalid_micron(x_invalid_micron):
-    _invalid_x_range(x_invalid_micron, F99(), "F99")
-
-
-@pytest.mark.parametrize("x_invalid_angstrom", u.angstrom * 1e4 / x_bad)
-def test_invalid_angstrom(x_invalid_angstrom):
-    _invalid_x_range(x_invalid_angstrom, F99(), "F99")
 
 
 def get_axav_cor_vals():

diff --git a/dust_extinction/tests/test_g03.py b/dust_extinction/tests/test_g03.py
@@ -5,36 +5,10 @@
 from astropy.modeling import InputParameterError
 
 from ..averages import G03_SMCBar, G03_LMCAvg, G03_LMC2
-from .helpers import _invalid_x_range
 
-x_bad = [-1.0, 0.1, 10.1, 100.0]
 models = [G03_SMCBar(), G03_LMCAvg(), G03_LMC2()]
 
 
-@pytest.mark.parametrize("x_invalid", x_bad)
-@pytest.mark.parametrize("tmodel", models)
-def test_invalid_wavenumbers(x_invalid, tmodel):
-    _invalid_x_range(x_invalid, tmodel, "G03")
-
-
-@pytest.mark.parametrize("x_invalid_wavenumber", x_bad / u.micron)
-@pytest.mark.parametrize("tmodel", models)
-def test_invalid_wavenumbers_imicron(x_invalid_wavenumber, tmodel):
-    _invalid_x_range(x_invalid_wavenumber, tmodel, "G03")
-
-
-@pytest.mark.parametrize("x_invalid_micron", u.micron / x_bad)
-@pytest.mark.parametrize("tmodel", models)
-def test_invalid_micron(x_invalid_micron, tmodel):
-    _invalid_x_range(x_invalid_micron, tmodel, "G03")
-
-
-@pytest.mark.parametrize("x_invalid_angstrom", u.angstrom * 1e4 / x_bad)
-@pytest.mark.parametrize("tmodel", models)
-def test_invalid_angstrom(x_invalid_angstrom, tmodel):
-    _invalid_x_range(x_invalid_angstrom, tmodel, "G03")
-
-
 @pytest.mark.parametrize("tmodel", models)
 def test_extinguish_no_av_or_ebv(tmodel):
     with pytest.raises(InputParameterError) as exc:

diff --git a/dust_extinction/tests/test_g16.py b/dust_extinction/tests/test_g16.py
@@ -1,50 +1,9 @@
 import numpy as np
 import pytest
 
-import astropy.units as u
-from astropy.modeling import InputParameterError
-
 from ..parameter_averages import G16
 from ..averages import G03_SMCBar
 from .test_f99 import get_axav_cor_vals as get_axav_cor_vals_fA_1
-from .helpers import _invalid_x_range
-
-
-@pytest.mark.parametrize("RvA_invalid", [-1.0, 0.0, 1.9, 6.1, 10.0])
-def test_invalid_RvA_input(RvA_invalid):
-    with pytest.raises(InputParameterError) as exc:
-        G16(RvA=RvA_invalid)
-    assert exc.value.args[0] == "parameter RvA must be between 2.0 and 6.0"
-
-
-@pytest.mark.parametrize("fA_invalid", [-1.0, -0.1, 1.1, 10.0])
-def test_invalid_fA_input(fA_invalid):
-    with pytest.raises(InputParameterError) as exc:
-        G16(fA=fA_invalid)
-    assert exc.value.args[0] == "parameter fA must be between 0.0 and 1.0"
-
-
-x_bad = [-1.0, 0.1, 12.0, 100.0]
-
-
-@pytest.mark.parametrize("x_invalid", x_bad)
-def test_invalid_wavenumbers(x_invalid):
-    _invalid_x_range(x_invalid, G16(), "G16")
-
-
-@pytest.mark.parametrize("x_invalid_wavenumber", x_bad / u.micron)
-def test_invalid_wavenumbers_imicron(x_invalid_wavenumber):
-    _invalid_x_range(x_invalid_wavenumber, G16(), "G16")
-
-
-@pytest.mark.parametrize("x_invalid_micron", u.micron / x_bad)
-def test_invalid_micron(x_invalid_micron):
-    _invalid_x_range(x_invalid_micron, G16(), "G16")
-
-
-@pytest.mark.parametrize("x_invalid_angstrom", u.angstrom * 1e4 / x_bad)
-def test_invalid_angstrom(x_invalid_angstrom):
-    _invalid_x_range(x_invalid_angstrom, G16(), "G16")
 
 
 def test_extinction_G16_fA_1_values():

diff --git a/dust_extinction/tests/test_gcc09.py b/dust_extinction/tests/test_gcc09.py
@@ -4,30 +4,6 @@
 import astropy.units as u
 
 from ..parameter_averages import GCC09
-from .helpers import _invalid_x_range
-
-
-x_bad = [-1.0, 0.1, 12.0, 100.0]
-
-
-@pytest.mark.parametrize("x_invalid", x_bad)
-def test_invalid_wavenumbers(x_invalid):
-    _invalid_x_range(x_invalid, GCC09(), "GCC09")
-
-
-@pytest.mark.parametrize("x_invalid_wavenumber", x_bad / u.micron)
-def test_invalid_wavenumbers_imicron(x_invalid_wavenumber):
-    _invalid_x_range(x_invalid_wavenumber, GCC09(), "GCC09")
-
-
-@pytest.mark.parametrize("x_invalid_micron", u.micron / x_bad)
-def test_invalid_micron(x_invalid_micron):
-    _invalid_x_range(x_invalid_micron, GCC09(), "GCC09")
-
-
-@pytest.mark.parametrize("x_invalid_angstrom", u.angstrom * 1e4 / x_bad)
-def test_invalid_angstrom(x_invalid_angstrom):
-    _invalid_x_range(x_invalid_angstrom, GCC09(), "GCC09")
 
 
 def get_axav_cor_vals(Rv):

diff --git a/dust_extinction/tests/test_gcc09_ave.py b/dust_extinction/tests/test_gcc09_ave.py
@@ -5,30 +5,6 @@
 from astropy.modeling import InputParameterError
 
 from ..averages import GCC09_MWAvg
-from .helpers import _invalid_x_range
-
-
-x_bad = [-1.0, 0.1, 11.0, 100.0]
-
-
-@pytest.mark.parametrize("x_invalid", x_bad)
-def test_invalid_wavenumbers(x_invalid):
-    _invalid_x_range(x_invalid, GCC09_MWAvg(), "GCC09")
-
-
-@pytest.mark.parametrize("x_invalid_wavenumber", x_bad / u.micron)
-def test_invalid_wavenumbers_imicron(x_invalid_wavenumber):
-    _invalid_x_range(x_invalid_wavenumber, GCC09_MWAvg(), "GCC09")
-
-
-@pytest.mark.parametrize("x_invalid_micron", u.micron / x_bad)
-def test_invalid_micron(x_invalid_micron):
-    _invalid_x_range(x_invalid_micron, GCC09_MWAvg(), "GCC09")
-
-
-@pytest.mark.parametrize("x_invalid_angstrom", u.angstrom * 1e4 / x_bad)
-def test_invalid_angstrom(x_invalid_angstrom):
-    _invalid_x_range(x_invalid_angstrom, GCC09_MWAvg(), "GCC09")
 
 
 def test_extinguish_no_av_or_ebv():

diff --git a/dust_extinction/tests/test_ma14.py b/dust_extinction/tests/test_ma14.py
@@ -4,30 +4,6 @@
 import astropy.units as u
 
 from ..parameter_averages import M14
-from .helpers import _invalid_x_range
-
-
-x_bad = [-1.0, 0.1, 12.0, 100.0]
-
-
-@pytest.mark.parametrize("x_invalid", x_bad)
-def test_invalid_wavenumbers(x_invalid):
-    _invalid_x_range(x_invalid, M14(), "M14")
-
-
-@pytest.mark.parametrize("x_invalid_wavenumber", x_bad / u.micron)
-def test_invalid_wavenumbers_imicron(x_invalid_wavenumber):
-    _invalid_x_range(x_invalid_wavenumber, M14(), "M14")
-
-
-@pytest.mark.parametrize("x_invalid_micron", u.micron / x_bad)
-def test_invalid_micron(x_invalid_micron):
-    _invalid_x_range(x_invalid_micron, M14(), "M14")
-
-
-@pytest.mark.parametrize("x_invalid_angstrom", u.angstrom * 1e4 / x_bad)
-def test_invalid_angstrom(x_invalid_angstrom):
-    _invalid_x_range(x_invalid_angstrom, M14(), "M14")
 
 
 def get_axav_cor_vals():