Skip to content

Commit f2a860d

Browse files
authored
Merge pull request #67 from JuliaAstro/docs-law-units
Clarify A(x)/A(V) units in docs
2 parents 2dad230 + a3e7c72 commit f2a860d

19 files changed

+552
-544
lines changed

docs/plots.jl

Lines changed: 20 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
11
using Plots, LaTeXStrings
2-
import DustExtinction: ccm89_ca, ccm89_cb, od94_ca, od94_cb, cal00, ccm89_invum,
3-
vcg04_invum, gcc09_invum, f99_invum, f04_invum, f19_invum,
4-
m14_invum, FM90, G16, SFD98Map
2+
import DustExtinction: ccm89_ca, ccm89_cb, od94_ca, od94_cb,
3+
# TODO: replace deprecated invum functions
4+
ccm89_invum, vcg04_invum, gcc09_invum, m14_invum,
5+
f99_invum, f04_invum, f19_invum,
6+
CAL00, FM90, G16, SFD98Map,
7+
# Kludge until Makie PR merged
8+
aa_to_invum
59

610
dir = joinpath(@__DIR__, "src", "assets")
711

@@ -14,8 +18,8 @@ for rv in [2.0, 3.1, 4.0, 5.0, 6.0]
1418
m = ccm89_invum.(w, rv, Ref(ccm89_ca), Ref(ccm89_cb))
1519
plot!(w, m, label="Rv=$rv")
1620
end
17-
xlabel!(L"\mu m ^{-1}")
18-
ylabel!("E(B-V)")
21+
xlabel!(L"x\ \left[\mu m ^{-1}\right]")
22+
ylabel!(L"A(x)/A(V)")
1923
savefig(joinpath(dir, "ccm89_plot.svg"))
2024

2125
#--------------------------------------------------------------------------------
@@ -27,8 +31,8 @@ for rv in [2.0, 3.1, 4.0, 5.0, 6.0]
2731
m = ccm89_invum.(w, rv, Ref(od94_ca), Ref(od94_cb))
2832
plot!(w, m, label="Rv=$rv")
2933
end
30-
xlabel!(L"\mu m ^{-1}")
31-
ylabel!("E(B-V)")
34+
xlabel!(L"x\ \left[\mu m ^{-1}\right]")
35+
ylabel!(L"A(x)/A(V)")
3236
savefig(joinpath(dir, "od94_plot.svg"))
3337

3438
#--------------------------------------------------------------------------------
@@ -37,11 +41,11 @@ savefig(joinpath(dir, "od94_plot.svg"))
3741
w = range(0.46, 8.3, length=1000)
3842
plot(legend=:topleft)
3943
for rv in [2.0, 3.0, 4.05, 5.0, 6.0]
40-
m = cal00.(w, rv)
44+
m = CAL00(Rv=rv).(aa_to_invum.(w)) # kludge until Makie
4145
plot!(w, m, label="Rv=$rv")
4246
end
43-
xlabel!(L"\mu m ^{-1}")
44-
ylabel!("E(B-V)")
47+
xlabel!(L"x\ \left[\mu m ^{-1}\right]")
48+
ylabel!(L"A(x)/A(V)")
4549
savefig(joinpath(dir, "cal00_plot.svg"))
4650

4751
#--------------------------------------------------------------------------------
@@ -65,8 +69,8 @@ for rv in [2.0, 3.1, 4.0, 5.0, 6.0]
6569
m = gcc09_invum.(w, rv)
6670
plot!(w, m, label="Rv=$rv")
6771
end
68-
xlabel!(L"\mu m ^{-1}")
69-
ylabel!("E(B-V)")
72+
xlabel!(L"x\ \left[\mu m ^{-1}\right]")
73+
ylabel!(L"A(x)/A(V)")
7074
savefig(joinpath(dir, "gcc09_plot.svg"))
7175

7276
#--------------------------------------------------------------------------------
@@ -78,8 +82,8 @@ for rv in [2.0, 3.1, 4.0, 5.0, 6.0]
7882
m = vcg04_invum.(w, rv)
7983
plot!(w, m, label="Rv=$rv")
8084
end
81-
xlabel!(L"\mu m ^{-1}")
82-
ylabel!("E(B-V)")
85+
xlabel!(L"x\ \left[\mu m ^{-1}\right]")
86+
ylabel!(L"A(x)/A(V)")
8387
savefig(joinpath(dir, "vcg04_plot.svg"))
8488

8589
#--------------------------------------------------------------------------------
@@ -153,8 +157,8 @@ plot!(w, m3, label = "bump term")
153157
m4 = FM90(c1=0.0, c2=0.0, c3=0.0).(x)
154158
plot!(w, m4, label = "FUV rise term")
155159

156-
xlabel!(L"\mu m ^{-1}")
157-
ylabel!(L"E(\lambda - V)/E(B - V)")
160+
xlabel!(L"x\ \left[\mu m ^{-1}\right]")
161+
ylabel!(L"E(x - V)/E(B - V)")
158162
savefig(joinpath(dir, "FM90_plot.svg"))
159163

160164
#--------------------------------------------------------------------------------

docs/src/assets/F04_plot.svg

Lines changed: 40 additions & 40 deletions
Loading

docs/src/assets/F19_plot.svg

Lines changed: 42 additions & 42 deletions
Loading

docs/src/assets/F99_plot.svg

Lines changed: 40 additions & 40 deletions
Loading

docs/src/assets/FM90_plot.svg

Lines changed: 38 additions & 38 deletions
Loading

docs/src/assets/G16_fixed_Rv_plot.svg

Lines changed: 42 additions & 42 deletions
Loading

docs/src/assets/G16_fixed_f_A_plot.svg

Lines changed: 40 additions & 40 deletions
Loading

docs/src/assets/M14_plot.svg

Lines changed: 42 additions & 42 deletions
Loading

docs/src/assets/cal00_plot.svg

Lines changed: 43 additions & 39 deletions
Loading

docs/src/assets/ccm89_plot.svg

Lines changed: 40 additions & 40 deletions
Loading

0 commit comments

Comments
 (0)