Bug Fix SiPM Simple Calibration + Optimization

src/sipm_simple_calibration.jl

@@ -33,59 +33,59 @@
 )
 
     # Initial peak search
     cuts_1pe = cut_single_peak(pe_uncal, initial_min_amp, initial_max_amp, relative_cut=relative_cut_noise_cut)
 
     bin_width_cut_min = cuts_1pe.max+n_fwhm_noise_cut*(cuts_1pe.high - cuts_1pe.max)
     bin_width_cut = get_friedman_diaconis_bin_width(filter(in(bin_width_cut_min..quantile(pe_uncal, initial_max_bin_width_quantile)), pe_uncal))
     peakpos = []
-    for bin_width_scale in 10 .^ range(0, stop=-3, length=50)
+    for bin_width_scale in exp10.(range(0, stop=-3, length=50))  # 1e-3 to 1
         @debug "Using bin width: $(bin_width_cut)"
 
-        bin_width_cut = bin_width_cut * bin_width_scale
-        h_uncal_cut = fit(Histogram, pe_uncal, bin_width_cut_min:bin_width_cut:initial_max_amp)
+        bin_width_cut_scaled = bin_width_cut * bin_width_scale
+        h_uncal_cut = fit(Histogram, pe_uncal, bin_width_cut_min:bin_width_cut_scaled:initial_max_amp)
         if peakfinder_σ <= 0.0
-            peakfinder_σ = round(Int, 2*(cuts_1pe.high - cuts_1pe.max) / bin_width_cut / 2.355)
+            peakfinder_σ = round(Int, 2*(cuts_1pe.high - cuts_1pe.max) / bin_width_cut_scaled / 2.355)
         end
         @debug "Peakfinder σ: $(peakfinder_σ)"
         try
             c, h_deconv, peakpos, threshold = RadiationSpectra.determine_calibration_constant_through_peak_ratios(h_uncal_cut, collect(range(min_pe_peak, max_pe_peak, step=1)),
                 min_n_peaks = 2, max_n_peaks = max_pe_peak, threshold=peakfinder_threshold, rtol=peakfinder_rtol, α=peakfinder_α, σ=peakfinder_σ)
         catch e
             @warn "Failed to find peaks with bin width scale $(bin_width_scale): $(e)"
             continue
         else
             @debug "Found peaks with bin width scale $(bin_width_scale)"
             if !isempty(peakpos)
                 break
             end
         end
     end
 
     if isempty(peakpos) || length(peakpos) < 2
         throw(ErrorException("Failed to find peaks"))
     end
 
     # simple calibration
     sort!(peakpos)
     @debug "Found $(min_pe_peak) PE Peak positions: $(peakpos[1])"
     @debug "Found $(min_pe_peak+1) PE Peak positions: $(peakpos[2])"
     gain = peakpos[2] - peakpos[1]
     @debug "Calculated gain: $(round(gain, digits=2))"
     c = 1/gain
     offset = - (peakpos[1] * c - min_pe_peak)
     @debug "Calculated offset: $(round(offset, digits=2))"
 
     f_simple_calib = x -> x .* c .+ offset
     f_simple_uncal = x -> (x .- offset) ./ c
 
     pe_simple_cal = f_simple_calib.(pe_uncal)
     peakpos_cal = f_simple_calib.(peakpos)
 
     bin_width_cal = get_friedman_diaconis_bin_width(filter(in(0.5..min_pe_peak), pe_simple_cal))
     bin_width_uncal = f_simple_uncal(bin_width_cal) - f_simple_uncal(0.0)
 
     h_calsimple = fit(Histogram, pe_simple_cal, 0.0:bin_width_cal:max_pe_peak + 1)
     h_uncal = fit(Histogram, pe_uncal, 0.0:bin_width_uncal:f_simple_uncal(max_pe_peak + 1))
 
     result = (
         pe_simple_cal = pe_simple_cal,