Commit 578d4fd9 authored by Alessandro 's avatar Alessandro

ensemble db update, wpm added in get_meff, plat.txt update

parent b3fc808b
#H102r002
ll 60 88
ls 60 88
lh 60 88
ss 60 88
sh 60 88
hh 60 88
t0 20 88
#H102r001
ll 60 88
ls 60 88
lh 60 88
ss 60 88
sh 60 88
hh 60 88
t0 20 88
#H400 #H400
ll 40 83 ll 40 83
lh 40 83 lh 40 83
......
#========= ENSEMBLE DATABASE ========# #========= ENSEMBLE DATABASE ========#
ens_db = Dict( ens_db = Dict(
#"ens_id"=>[L, beta, is_deg?, m_pi] #"ens_id"=>[L, beta, is_deg?, m_pi]
"H400" => [32, 3.46, true, 0.16345], "H102r002" => [32, 3.4, false, 0.17979],
"N200" => [48, 3.55, false, 0.09222], "H102r001" => [32, 3.4, false, 0.17979],
"N203" => [48, 3.55, false, 0.11224], "H400" => [32, 3.46, true, 0.16345],
"N300" => [48, 3.70, true, 0.10630], "N200" => [48, 3.55, false, 0.09222],
"J303" => [64, 3.70, false, 0.06514] "N203" => [48, 3.55, false, 0.11224],
"N300" => [48, 3.70, true, 0.10630],
"J303" => [64, 3.70, false, 0.06514]
) )
ttl_obs_db = Dict( ttl_obs_db = Dict(
"muc"=> ["mu_c"], "muc"=> ["mu_c"],
......
...@@ -117,15 +117,15 @@ function get_hh(mu_list, obs::Vector{uwreal}, deg::Bool) ...@@ -117,15 +117,15 @@ function get_hh(mu_list, obs::Vector{uwreal}, deg::Bool)
end end
return obs_hh return obs_hh
end end
function get_meff(obs::Vector{juobs.Corr}, ens::EnsInfo; pl::Bool=false) 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) mu_list = getfield.(obs, :mu)
plat = select_plateau(ens, mu_list) plat = select_plateau(ens, mu_list)
return meff.(obs, plat, pl=pl) return meff.(obs, plat, pl=pl, wpm=wpm)
end end
function get_f(obs::Vector{juobs.Corr}, m::Vector{uwreal}, ens::EnsInfo; pl::Bool=false) 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)
mu_list = getfield.(obs, :mu) mu_list = getfield.(obs, :mu)
plat = select_plateau(ens, mu_list) plat = select_plateau(ens, mu_list)
return dec_const_pcvc.(obs, plat, m, pl=pl) return dec_const_pcvc.(obs, plat, m, pl=pl, wpm=wpm)
end end
function select_plateau(ensinfo::EnsInfo) function select_plateau(ensinfo::EnsInfo)
ens = ensinfo.id ens = ensinfo.id
......
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