fit routine now returns par and chi^2_corr

src/juobs_tools.jl

@@ -398,8 +398,10 @@ function fit_routine(model::Function, xdata::Array{<:Real}, ydata::Array{uwreal}
         print("\n Fit parameter: ", i, ": ")
         details(upar[i])
     end
+    chis2_corrected = (length(yval) - param) * chisq(coef(fit), ydata) / chi_exp
     println("Chisq / chiexp: ", chisq(coef(fit), ydata), " / ", chi_exp, " (dof: ", length(yval) - param,")")
-    return upar
+    println("Chisq corrected: ", chis2_corrected)
+    return upar, value(chis2_corrected)
 end
 
 function fit_routine(model::Function, xdata::Array{uwreal}, ydata::Array{uwreal}, param::Int64=3; 
@@ -454,6 +456,8 @@ function fit_routine(model::Function, xdata::Array{uwreal}, ydata::Array{uwreal}
         
         (upar, chi2_exp) = isnothing(wpm) ? fit_error(chisq_full_cov, sol.minimizer, data) : fit_error(chisq_full_cov, sol.minimizer, data, wpm)
         println("Chisq / chiexp: ", min_fun_cov(sol.minimizer), " / ", chi2_exp, " (dof: ", length(ydata) - param,")")
+        chis2_corrected = (length(ydata) - param) * min_fun_cov(sol.minimizer) / chi2_exp
+        println("Chisq corrected: ", chis2_corrected)
     else
         chisq_full(p, d) = get_chi2(model, d, ddat, p, Nalpha)
         min_fun(t) = chisq_full(t, dat)
@@ -461,19 +465,20 @@ function fit_routine(model::Function, xdata::Array{uwreal}, ydata::Array{uwreal}
         
         (upar, chi2_exp) = isnothing(wpm) ? fit_error(chisq_full, sol.minimizer, data) : fit_error(chisq_full, sol.minimizer, data, wpm)
         println("Chisq / chiexp: ", min_fun(sol.minimizer), " / ", chi2_exp, " (dof: ", length(ydata) - param,")")
-
+        chis2_corrected = (length(ydata) - param) * min_fun(sol.minimizer) / chi2_exp
+        println("Chisq corrected: ", chis2_corrected)
     end
 
     #### chisq_full, min_fun out of conditional ->
     #### COMPILER WARNING ** incremental compilation may be fatally broken for this module **
 
     # Info
-    for i = 1:length(upar)
-        isnothing(wpm) ? uwerr(upar[i]) : uwerr(upar[i], wpm)
-        print("\n Fit parameter: ", i, ": ")
-        details(upar[i])
-    end
-    return upar
+    #for i = 1:length(upar)
+    #    isnothing(wpm) ? uwerr(upar[i]) : uwerr(upar[i], wpm)
+    #    print("\n Fit parameter: ", i, ": ")
+    #    details(upar[i])
+    #end
+    return upar, chis2_corrected
     
 end