Merge pull request #57 from icweaver/remove-codegen

Slay the dragon

Author: icweaver

src/DustExtinction.jl

@@ -161,19 +161,9 @@ include("dust_maps.jl")
 include("fittable_laws.jl")
 include("mixture_laws.jl")
 
-# --------------------------------------------------------------------------------
-# Here be codegen!
-
-# generate unitful support for the following laws
-# this can be removed when julia support is pinned to 1.3 or higher,
-# at which point adding `(l::ExtinctionLaw)(wave::Quantity)` is possible, until then
-# using this code-gen does the trick but requires manually editing
-# instead of providing support for all <: ExtinctionLaw
-for law in [CCM89, OD94, CAL00, GCC09, VCG04, FM90, G16, G03_SMCBar, G03_LMCAve, F99, F04, F19, M14]
-    (l::law)(wavelength::U.Quantity) = l(U.ustrip(U.u"Å", wavelength)) * U.u"mag"
-end
+# generate unitful support
+(l::ExtinctionLaw)(wavelength::U.Quantity) = l(U.ustrip(U.u"Å", wavelength)) * U.u"mag"
 
-# --------------------------------------------------------------------------------
 
 function __init__()
     # register our data dependencies

src/color_laws.jl

@@ -22,7 +22,7 @@ Base.@kwdef struct OD94 <: ExtinctionLaw
     Rv::Float64 = 3.1
 end
 
-function (law::OD94)(wave::T) where T
+function (law::OD94)(wave::T) where T <: Real
     checkbounds(law, wave) || return zero(float(T))
     x = aa_to_invum(wave)
     return ccm89_invum(x, law.Rv, od94_ca, od94_cb)
@@ -50,7 +50,7 @@ fit value for such galaxies was 4.05±0.80.
 Base.@kwdef struct CAL00 <: ExtinctionLaw
     Rv::Float64 = 4.05
 end
-function (law::CAL00)(wave::T) where T
+function (law::CAL00)(wave::T) where T <: Real
     checkbounds(law, wave) || return zero(float(T))
     x = aa_to_invum(wave)
     if wave < 6300

src/color_laws/ccm89.jl

@@ -22,7 +22,7 @@ Base.@kwdef struct CCM89 <: ExtinctionLaw
     Rv::Float64 = 3.1
 end
 
-function (law::CCM89)(wave::T) where T
+function (law::CCM89)(wave::T) where T <: Real
     checkbounds(law, wave) || return zero(float(T))
     x = aa_to_invum(wave)
     return ccm89_invum(x, law.Rv, ccm89_ca, ccm89_cb)

src/color_laws/fitzpatrick.jl

@@ -76,7 +76,7 @@ Base.@kwdef struct F99 <: ExtinctionLaw
     Rv::Float64 = 3.1
 end
 
-function (law::F99)(wave::T) where T
+function (law::F99)(wave::T) where T <: Real
     checkbounds(law, wave) || return zero(float(T))
     x = aa_to_invum(wave)
     return f99_invum(x, law.Rv)
@@ -169,7 +169,7 @@ Base.@kwdef struct F04 <: ExtinctionLaw
     Rv::Float64 = 3.1
 end
 
-function (law::F04)(wave::T) where T
+function (law::F04)(wave::T) where T <: Real
     checkbounds(law, wave) || return zero(float(T))
     x = aa_to_invum(wave)
     return f04_invum(x, law.Rv)
@@ -246,7 +246,7 @@ Base.@kwdef struct F19 <: ExtinctionLaw
     Rv::Float64 = 3.1
 end
 
-function (law::F19)(wave::T) where T
+function (law::F19)(wave::T) where T <: Real
     checkbounds(law, wave) || return zero(float(T))
     x = aa_to_invum(wave)
     return f19_invum(x, law.Rv)

src/color_laws/gcc09.jl

@@ -13,7 +13,7 @@ Base.@kwdef struct GCC09 <: ExtinctionLaw
     Rv::Float64 = 3.1
 end
 
-function (law::GCC09)(wave::T) where T
+function (law::GCC09)(wave::T) where T <: Real
     checkbounds(law, wave) || return zero(float(T))
     x = aa_to_invum(wave)
     return gcc09_invum(x, law.Rv)

src/color_laws/m14.jl

@@ -69,7 +69,7 @@ Base.@kwdef struct M14 <: ExtinctionLaw
     Rv::Float64 = 3.1
 end
 
-function (law::M14)(wave::T) where T
+function (law::M14)(wave::T) where T <: Real
     checkbounds(law, wave) || return zero(float(T))
     x = aa_to_invum(wave)
     return m14_invum(x, law.Rv)

src/color_laws/vcg04.jl

@@ -13,7 +13,7 @@ Base.@kwdef struct VCG04 <: ExtinctionLaw
     Rv::Float64 = 3.1
 end
 
-function (law::VCG04)(wave::T) where T
+function (law::VCG04)(wave::T) where T <: Real
     checkbounds(law, wave) || return zero(float(T))
     x = aa_to_invum(wave)
     return vcg04_invum(x, law.Rv)

src/fittable_laws.jl

@@ -64,7 +64,7 @@ FM90(coeffs, x0=4.60, gamma=0.99) = FM90(coeffs..., x0, gamma)
 
 bounds(::Type{<:FM90}) = (912, 3200)
 
-function (law::FM90)(wave::T) where T
+function (law::FM90)(wave::T) where T <: Real
     checkbounds(law, wave) || return zero(float(T))
 
     x = aa_to_invum(wave)

src/mixture_laws.jl

@@ -99,13 +99,13 @@ bounds(::Type{<:G03_SMCBar}) = (1000.0, 33333.3)
 bounds(::Type{<:G03_LMCAve}) = (1000.0, 33333.3)
 
 
-function (law::G03_SMCBar)(wave::T) where T
+function (law::G03_SMCBar)(wave::T) where T <: Real
     checkbounds(law, wave) || return zero(float(T))
     x = aa_to_invum(wave)
     return g03_invum(x, law.Rv)
 end
 
-function (law::G03_LMCAve)(wave::T) where T
+function (law::G03_LMCAve)(wave::T) where T <: Real
     checkbounds(law, wave) || return zero(float(T))
     x = aa_to_invum(wave)
     return g03lmc_invum(x, law.Rv)
@@ -180,7 +180,7 @@ end
 
 bounds(::Type{<:G16}) = (1000.0, 33333.3)
 
-function (law::G16)(wave::T) where T
+function (law::G16)(wave::T) where T <: Real
     checkbounds(law, wave) || return zero(float(T))
     x = aa_to_invum(wave)
     return g16_invum(x, law.Rv, law.f_A)