Commit 07b0c053 authored by Alessandro 's avatar Alessandro

Merge branch 'master' of gitlab.ift.uam-csic.es:Conigli/automated-analysis

# Conflicts:
#	src/analysis.jl
parents de9b8d48 cc062c4a
#H101
ll 60 80
lh 60 80
hh 63 85
t0 20 85
#H102r002
ll 60 88
ls 60 88
......@@ -15,14 +20,14 @@ sh 60 88
hh 60 88
t0 20 88
#H400
ll 40 83
lh 40 83
hh 40 83
ll 60 83
lh 60 83
hh 60 83
t0 20 90
#N300
ll 58 95
lh 58 95
hh 58 95
ll 80 110
lh 85 115
hh 85 115
t0 20 100
#N200
ll 85 105
......@@ -32,6 +37,11 @@ ss 85 105
sh 83 110
hh 83 110
t0 40 110
#N202
ll 80 110
lh 82 105
hh 85 110
t0 40 110
#N203
ll 85 105
ls 85 105
......
......@@ -3,8 +3,10 @@ ens_db = Dict(
#"ens_id"=>[L, beta, is_deg?, m_pi]
"H102r002" => [32, 3.4, false, 0.17979],
"H102r001" => [32, 3.4, false, 0.17979],
"H101" => [32, 3.4, true, 0.18302],
"H400" => [32, 3.46, true, 0.16345],
"N200" => [48, 3.55, false, 0.09222],
"N202" => [48, 3.55, true, 0.13407],
"N203" => [48, 3.55, false, 0.11224],
"N300" => [48, 3.70, true, 0.10630],
"J303" => [64, 3.70, false, 0.06514]
......@@ -25,7 +27,7 @@ ylbl_db = Dict(
"lh" => [L"$m_D \sqrt{8t_0}$", L"$m_{D^*} \sqrt{8t_0}$", L"$f_D \sqrt{8t_0}$", L"$f_{D^*} \sqrt{8t_0}$"],
"ss" => [L"$m_{\eta'} \sqrt{8t_0}$", L"$m_{\phi} \sqrt{8t_0}$", L"$f_{η'} \sqrt{8t_0}$", L"$f_{\phi} \sqrt{8t_0}$"],
"sh" => [L"$m_{D_s} \sqrt{8t_0}$", L"$m_{D_s^*} \sqrt{8t_0}$", L"$f_{D_s} \sqrt{8t_0}$", L"$f_{D_s^*} \sqrt{8t_0}$"],
"hh" => [L"$m_etac \sqrt{8t_0}$", L"$m_{J/ψ} \sqrt{8t_0}$", L"$f_{η_c} \sqrt{8t_0}$", L"$f_{J/ψ} \sqrt{8t_0}$"]
"hh" => [L"$m_{η_c} \sqrt{8t_0}$", L"$m_{J/ψ} \sqrt{8t_0}$", L"$f_{η_c} \sqrt{8t_0}$", L"$f_{J/ψ} \sqrt{8t_0}$"]
)
#PDG
......
......@@ -120,6 +120,7 @@ end
function get_meff(obs::Vector{juobs.Corr}, ens::EnsInfo; pl::Bool=false, wpm::Union{Dict{Int64,Vector{Float64}},Dict{String,Vector{Float64}}, Nothing}=nothing)
mu_list = getfield.(obs, :mu)
plat = select_plateau(ens, mu_list)
println(plat)
return meff.(obs, plat, pl=pl, wpm=wpm)
end
function get_f(obs::Vector{juobs.Corr}, m::Vector{uwreal}, ens::EnsInfo; pl::Bool=false, wpm::Union{Dict{Int64,Vector{Float64}},Dict{String,Vector{Float64}}, Nothing}=nothing)
......
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