zs_over_zp renormalization constant added in juobs_const

constants/juobs_const.jl

@@ -12,6 +12,9 @@ const ZM_tm_error = [42, 33, 42, 48, 55] .* 1e-4
 # 1808.09236
 const ZA_data = [0.75642, 0.76169, 0.76979, 0.78378, 0.79667]
 const ZA_err = [72, 93, 43, 47, 47] .*1e-5
+#2005.01352
+const ZS_over_ZP_data = [1.3497, 1.2914, 1.2317, 1.1709, 1.1343]
+const ZS_over_ZP_err = [83, 64, 48, 23, 25 ] .* 1e-4
 #1608.08900
 const b_values2 = [3.40, 3.46, 3.55, 3.70]
 const t0_data = [2.86, 3.659, 5.164, 8.595]
@@ -25,12 +28,14 @@ const C2 = zeros(5, 5)
 const C3 = zeros(4, 4)
 const C4 = zeros(6, 6)
 const C5 = zeros(5, 5)
+const C6 = zeros(5, 5)
 for i = 1:6
     C4[i, i] = M_error[i] ^ 2
     if i<=5
         C1[i, i] = ZM_error[i] ^ 2
         C2[i, i] = ZM_tm_error[i] ^ 2
-        C5[i, i] = ZA_err[i]^2
+        C5[i, i] = ZA_err[i] ^ 2
+        C6[i, i] = ZS_over_ZP_err[i] ^ 2
         if i <= 4
             C3[i, i] = t0_error[i] ^ 2
         end
@@ -44,9 +49,11 @@ const t0_ph = cobs(t0_ph_value, t0_ph_error .^ 2, "sqrt(8 t0) (fm)")
 const a_ = t0_ph ./ sqrt.(8 .* t0_)
 const M = cobs(M_values, C4, "charmed meson masses")
 const Za = cobs(ZA_data, C5, "ZA")
+const ZS_over_ZP = cobs(ZS_over_ZP_data, C6, "ZS over ZP")
 
 zm(beta::Float64) = ZM[b_values .== beta][1]
 zm_tm(beta::Float64) = ZM_tm[b_values .== beta][1]
 t0(beta::Float64) = t0_[b_values2 .== beta][1]
 a(beta::Float64) = a_[b_values2 .== beta][1]
 za(beta::Float64) = Za[b_values .== beta][1]
+zs_over_zp(beta::Float64) = ZS_over_ZP[b_values .== beta][1]
\ No newline at end of file

src/juobs.jl

 module juobs
+using Base: Float64
 using ADerrors, PyPlot, LaTeXStrings, LinearAlgebra, LsqFit, LeastSquaresOptim
 import Statistics: mean
 
@@ -8,16 +9,9 @@ include("juobs_reader.jl")
 include("juobs_tools.jl")
 include("juobs_obs.jl")
 
-<<<<<<< HEAD
 export read_mesons, read_ms1, read_ms, read_md, truncate_data!
 export get_matrix, energies, uwdot, uweigvals, uweigvecs, uweigen, invert, getall_eigvals, getall_eigvecs, hess_reduce, uwcholesky, transpose, tridiag_reduction
 export corr_obs, corr_sym, md_sea, md_val, plat_av, lin_fit, x_lin_fit, y_lin_fit, fit_routine
 export meff, mpcac, dec_const, dec_const_pcvc, comp_t0
-=======
-export read_mesons, read_ms1, read_ms, read_md
-export get_matrix, uwgevp_tot, energies, uwdot, transpose, uwgevp, invert
-export corr_obs, plat_av, lin_fit, x_lin_fit, y_lin_fit, fit_routine
-export meff, dec_const_pcvc, comp_t0
->>>>>>> 5f368dae0ea2c9e608f49d29b8d1fbc31bc1a463
 
 end # module