Merge pull request #37 from legend-exp/sf

Add option to include survival fraction in title of survival plot

Author: fhagemann

ext/LegendMakieLegendSpecFitsExt.jl

@@ -235,7 +235,7 @@ module LegendMakieLegendSpecFitsExt
             xticks = (ceil(first(xlims)/10)*10):10:(floor(last(xlims)/10)*10),
             ylims = nothing, row::Int = 1, col::Int = 1, xlabel = "Energy (keV)",
             title::AbstractString = "", yscale = Makie.log10, show_residuals::Bool = true, 
-            watermark::Bool = true, final::Bool = true, kwargs...
+            sf_in_title::Bool = true, watermark::Bool = true, final::Bool = true, kwargs...
         )
 
         fig = Makie.current_figure()
@@ -252,9 +252,8 @@ module LegendMakieLegendSpecFitsExt
             ylims = (ylim_min, ylim_max)
         end
 
-        ax = Makie.Axis(g[1,1], yticks = (exp10.(0:10), "1" .* join.(fill.("0", 0:10))), 
-            ylabel = "Counts / $(round(step(first(report.survived.h.edges)), digits=2)) keV", 
-            limits = (xlims, ylims); yscale, xlabel, title, xticks)
+        ax = Makie.Axis(g[1,1], ylabel = "Counts / $(round(step(first(report.survived.h.edges)), digits=2)) keV", 
+            limits = (xlims, ylims); yscale, xlabel, title = sf_in_title ? "$title Survival fraction: $(round(report.sf * 100, digits = 2))%" : title, xticks)
 
         before_data = Makie.plot!(ax, report.survived.h, color = (:gray, 0.5), fillto = 0.5)
         before_fit  = Makie.lines!(ax, range(xlims..., length = 1000), x -> report.survived.f_fit(x) * step(first(report.survived.h.edges)), color = :black)

test/test_lplot.jl

@@ -202,7 +202,10 @@ end
             e_cal = 1.5u"keV" .* randn(100_000) .+ 2614.5u"keV"
             result_peaks_ds, report_peaks_ds = LegendSpecFits.get_peaks_survival_fractions(
                 aoe, e_cal, [2614.5u"keV"], [:Tl208FEP], [(35.0u"keV",35.0u"keV")], -5.0)
-            @test_nowarn LegendMakie.lplot(report_peaks_ds[:Tl208FEP], title = "Test")
+            @test_nowarn LegendMakie.lplot(report_peaks_ds[:Tl208FEP], sf_in_title = true, title = "Test")
+            @test_nowarn LegendMakie.lplot(report_peaks_ds[:Tl208FEP], sf_in_title = false, title = "Test")
+            @test_nowarn LegendMakie.lplot(report_peaks_ds, title = "Test")
+            @test_nowarn LegendMakie.lplot(report_peaks_ds, sf_in_title = false, title = "Test")
         end
 
         @testset "LQ plots" begin