Commit 5b679026 authored by Antonino D'Anna's avatar Antonino D'Anna

fixed some bugs and included into juobs' module

parent d3e648ea
...@@ -5,21 +5,21 @@ let ...@@ -5,21 +5,21 @@ let
C = zeros(8, 8) C = zeros(8, 8)
M_values = [1869.65, 2010.26, 1968.34, 2112.2, 2980.3, 3096.916, 5279.65, 5366.3] #MD, MD*, MDs, MDs*, \eta_c, J/\psi , MB, MBs(MeV) M_values = [1869.65, 2010.26, 1968.34, 2112.2, 2980.3, 3096.916, 5279.65, 5366.3] #MD, MD*, MDs, MDs*, \eta_c, J/\psi , MB, MBs(MeV)
M_error = [0.05, 0.05, 0.07, 0.4, 1.2, 0.011, 0.12, 0.6] M_error = [0.05, 0.05, 0.07, 0.4, 1.2, 0.011, 0.12, 0.6]
M = Ref{Vector{uwreal}}() M_ = Ref{Vector{uwreal}}()
for i = 1:8 for i = 1:8
C[i, i] = M_error[i] ^ 2 C[i, i] = M_error[i] ^ 2
end end
global function M() global function M()
if !isassigned(M) if !isassigned(M_)
M.x = ADerrors.cobs(M_values, C, "charmed meson masses") M_.x = ADerrors.cobs(M_values, C, "charmed meson masses")
end end
return M.x; return M_.x;
end end
end end
let let
#1802.05243 taking into account correlations in zm_tm #1802.05243 taking into account correlations in zm_tm
C = [0.375369e-6, 0.429197e-6, -0.186896e-5; 0.429197e-6, 0.268393e-4, 0.686776e-4; -0.186896e-5, 0.686776e-4, 0.212386e-3] C = [0.375369e-6 0.429197e-6 -0.186896e-5; 0.429197e-6 0.268393e-4 0.686776e-4; -0.186896e-5 0.686776e-4 0.212386e-3]
z = Ref{Vector{uwreal}}(); z = Ref{Vector{uwreal}}();
global function ZP(beta::Float64) global function ZP(beta::Float64)
if !isassigned(z) if !isassigned(z)
...@@ -27,11 +27,11 @@ let ...@@ -27,11 +27,11 @@ let
end end
return z.x[1] + z.x[2] *(beta-3.79) + z.x[3]*(beta-3.79)^2 return z.x[1] + z.x[2] *(beta-3.79) + z.x[3]*(beta-3.79)^2
end end
CC = [0.164635e-4, 0.215658e-4, -0.754203e-4; 0.215658e-4, 0.121072e-2, 0.308890e-2; -0.754203e-4, 0.308890e-2, 0.953843e-2] CC = [0.164635e-4 0.215658e-4 -0.754203e-4; 0.215658e-4 0.121072e-2 0.308890e-2; -0.754203e-4 0.308890e-2 0.953843e-2]
zm = Ref{Vector{uwreal}}() zm = Ref{Vector{uwreal}}()
Mrat_ = Ref{uwreal}() Mrat_ = Ref{uwreal}()
global function Mrat_() global function Mrat()
if !isassigned(Mrat_) if !isassigned(Mrat_)
Mrat_.x =ADerrors.uwreal([.9148, 0.0088], "M/mhad") Mrat_.x =ADerrors.uwreal([.9148, 0.0088], "M/mhad")
end end
......
...@@ -12,6 +12,7 @@ include("juobs_plots.jl") ...@@ -12,6 +12,7 @@ include("juobs_plots.jl")
include("juobs_obs.jl") include("juobs_obs.jl")
include("../constants/juobs_const.jl") include("../constants/juobs_const.jl")
include("../constants/path_csv.jl") include("../constants/path_csv.jl")
include("../constants/juobs_uwreal_const.jl")
export EnsInfo export EnsInfo
export ens_db, db, db_c, flag_s, sym_bool, ensemble_inv export ens_db, db, db_c, flag_s, sym_bool, ensemble_inv
...@@ -21,4 +22,5 @@ export corr_obs, corr_obs_TSM, corr_sym, corr_sym_E250, corr_sym_D450, md_sea, m ...@@ -21,4 +22,5 @@ export corr_obs, corr_obs_TSM, corr_sym, corr_sym_E250, corr_sym_D450, md_sea, m
export plot_data,plot_func, pvalue, fve, model_av, fit_alg export plot_data,plot_func, pvalue, fve, model_av, fit_alg
export meff, mpcac, dec_const, dec_const_w, dec_const_w, dec_const_pcvc, comp_t0, get_m, get_m_pbc, get_mpcac, get_f_wil, get_f_wil_pbc, get_f_tm, get_f_tm_pbc, get_w0t0_plat export meff, mpcac, dec_const, dec_const_w, dec_const_w, dec_const_pcvc, comp_t0, get_m, get_m_pbc, get_mpcac, get_f_wil, get_f_wil_pbc, get_f_tm, get_f_tm_pbc, get_w0t0_plat
end # module end # module
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment