From 099a3014facf8437fab0293280ae4c9ad2429318 Mon Sep 17 00:00:00 2001 From: xzackli Date: Thu, 25 Mar 2021 01:02:29 -0400 Subject: [PATCH 1/2] update some examples to Plots.jl --- examples/RECFAST_example.jl | 21 +++++---------------- examples/plot_recomb.jl | 17 ++++------------- examples/plot_visibility.jl | 27 ++++++++------------------- 3 files changed, 17 insertions(+), 48 deletions(-) diff --git a/examples/RECFAST_example.jl b/examples/RECFAST_example.jl index 57db25c..303a518 100644 --- a/examples/RECFAST_example.jl +++ b/examples/RECFAST_example.jl @@ -4,21 +4,10 @@ bg = Background(𝕡) 𝕣 = Bolt.RECFAST(bg=bg, Yp=𝕡.Y_p, OmegaB=𝕡.Ω_b) # 𝕣 = Bolt.Peebles() ih = IonizationHistory(𝕣, 𝕡, bg) -Nz = 1000 -dz = 10000/float(Nz) +dz = 10000/1000 z = (10000 - dz):(-dz):0.0 -## -using PyPlot -clf() -plot(z, ih.Tmat.(z2x.(z)), "-", label=raw"$T_{\mathrm{mat}}$") -plot(z, ih.Trad.(z2x.(z)), "--", label=raw"$T_{\mathrm{rad}}$") - -yscale("log") -xscale("log") -legend() -ylim(1, 2e4) -xlim(10, 10000) -xlabel("redshift") -ylabel("temperature [K]") -gcf() +using Plots, LaTeXStrings +plot(z, ih.Tmat.(z2x.(z)), ls=:solid, label=L"T_{\mathrm{mat}}", xlim=(10,10000), + xscale=:log10, xlabel="redshift", ylabel="temperature [K]", yscale=:log10, legend=:bottomright) +plot!(z, ih.Trad.(z2x.(z)), ls=:dash, label=L"T_{\mathrm{rad}}") diff --git a/examples/plot_recomb.jl b/examples/plot_recomb.jl index 58aece5..4300726 100644 --- a/examples/plot_recomb.jl +++ b/examples/plot_recomb.jl @@ -1,7 +1,5 @@ using Bolt -using PyPlot -using Unitful, UnitfulAstro, NaturallyUnitful - +using Plots, LaTeXStrings par = CosmoParams() # integrate saha to some transition redshift, we choose 1587.4 @@ -14,13 +12,6 @@ early_time_Xₑ = Bolt.saha_Xₑ(par) late_time_Xₑ = Bolt.peebles_Xₑ( par, early_time_Xₑ(x_transition), x_transition, 1.0) -clf() -plot(saha_z_grid, [early_time_Xₑ(z2x(z)) for z in saha_z_grid], "-", label="Saha") -plot(peebles_z_grid, [late_time_Xₑ(z2x(z)) for z in peebles_z_grid], "-", label="Peebles") -ylabel(raw"$X_e$") -xlim(1800,0) -ylim(2e-4, 2) -yscale("log") -xlabel(raw"$z$") -legend() -gcf() +plot(saha_z_grid, [early_time_Xₑ(z2x(z)) for z in saha_z_grid], label="Saha", xflip=true, + yscale=:log10, xlabel="redshift", ylabel=L"X_e") +plot!(peebles_z_grid, [late_time_Xₑ(z2x(z)) for z in peebles_z_grid], label="Peebles") diff --git a/examples/plot_visibility.jl b/examples/plot_visibility.jl index dbf46af..b44636b 100644 --- a/examples/plot_visibility.jl +++ b/examples/plot_visibility.jl @@ -1,26 +1,15 @@ using Bolt -using PyPlot -using Unitful, UnitfulAstro, NaturallyUnitful -using Interpolations +using Plots, LaTeXStrings par = CosmoParams() bg = Background(par) ih = IonizationHistory(Peebles(), par, bg) x_grid = bg.x_grid -clf() -fig, ax = subplots(1,2,figsize=(10,5)) -ax[1].plot(x_grid, ih.τ.(x_grid), "-", label=raw"$\tau$") -ax[1].plot(x_grid, abs.(ih.τ′.(x_grid)), "--", label=raw"$|\tau^\prime|$") -ax[2].plot(x_grid, ih.g̃.(x_grid), "-", label=raw"$\tilde{g}$") -ax[2].plot(x_grid, ih.g̃′.(x_grid) ./ 10, "--", label=raw"$\tilde{g}\prime/10$") -ax[2].plot(x_grid, ih.g̃′′.(x_grid) ./ 300, "--", label=raw"$\tilde{g}\prime/300$") -ax[1].set_yscale("log") -ax[1].legend() -ax[1].set_xlabel(raw"$x$") -ax[2].set_xlim(-8.0, -6.0) -ax[2].set_ylim(-3.5, 5.5) -ax[2].legend() -ax[2].set_xlabel(raw"$x$") -tight_layout() -gcf() +l = @layout [a ; b] +p1 = plot(x_grid, ih.τ.(x_grid), label=L"\tau", yscale=:log10) +plot!(x_grid, abs.(ih.τ′.(x_grid)), ls=:dash, label=L"|\tau^\prime|") +p2 = plot(x_grid, ih.g̃.(x_grid), label=raw"$\tilde{g}$", xlim=(-8.0, -6.0), xlabel="x") +plot!(x_grid, ih.g̃′.(x_grid) ./ 10, ls=:dash, label=raw"$\tilde{g}\prime/10$") +plot!(x_grid, ih.g̃′′.(x_grid) ./ 300, ls=:dash, label=raw"$\tilde{g}\prime/300$") +plot(p1, p2, layout = l, size=(350,500)) From bf3d9ec9925ca9c74fdfcf17c9517ed14c38def5 Mon Sep 17 00:00:00 2001 From: xzackli Date: Thu, 25 Mar 2021 01:18:51 -0400 Subject: [PATCH 2/2] touch up latex labels --- examples/plot_visibility.jl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/plot_visibility.jl b/examples/plot_visibility.jl index b44636b..618495a 100644 --- a/examples/plot_visibility.jl +++ b/examples/plot_visibility.jl @@ -9,7 +9,7 @@ x_grid = bg.x_grid l = @layout [a ; b] p1 = plot(x_grid, ih.τ.(x_grid), label=L"\tau", yscale=:log10) plot!(x_grid, abs.(ih.τ′.(x_grid)), ls=:dash, label=L"|\tau^\prime|") -p2 = plot(x_grid, ih.g̃.(x_grid), label=raw"$\tilde{g}$", xlim=(-8.0, -6.0), xlabel="x") -plot!(x_grid, ih.g̃′.(x_grid) ./ 10, ls=:dash, label=raw"$\tilde{g}\prime/10$") -plot!(x_grid, ih.g̃′′.(x_grid) ./ 300, ls=:dash, label=raw"$\tilde{g}\prime/300$") +p2 = plot(x_grid, ih.g̃.(x_grid), label=L"\tilde{g}", xlim=(-8.0, -6.0), xlabel="x") +plot!(x_grid, ih.g̃′.(x_grid) ./ 10, ls=:dash, label=L"\tilde{g}\prime/10") +plot!(x_grid, ih.g̃′′.(x_grid) ./ 300, ls=:dash, label=L"\tilde{g}\prime/300") plot(p1, p2, layout = l, size=(350,500))