Commit 1ac1cf56 authored by Alessandro 's avatar Alessandro

plateau.txt update, H101 and N202 added in const.jl, analysis.jl modified to work on ift pc

parent 578d4fd9
#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
......
......@@ -34,11 +34,11 @@ data->
using Revise, juobs, PyPlot, LaTeXStrings, ADerrors, DelimitedFiles
#============= SET UP VARIABLES ===========#
const path_data = "/Users/ale/Desktop/data"
const path_plat = "/Users/ale/automation/plat.txt"
const path_results = "/Users/ale/Desktop/results"
const ensembles = ["J303", "H400", "N300"]
const sector = Dict("ll"=>false, "ls"=>false, "lh"=>true, "ss"=>false, "sh"=>true, "hh"=>true )
const path_data = "/media/alessandro/4277fef2-edc5-4e0d-89cb-f5d1d44fbc8c/data"
const path_plat = "/home/alessandro/automated-analysis/plat.txt"
const path_results = "/home/alessandro/Desktop/results"
const ensembles = ["J303", "H400", "N200" , "N202", "N300", "H101", "N203"]
const sector = Dict("ll"=>true, "ls"=>true, "lh"=>true, "ss"=>true, "sh"=>true, "hh"=>true )
const rwf = false
const compute_t0 = false
const mass_shift = false #not implemented yet
......@@ -78,6 +78,8 @@ println("\n Computing Observables \n")
mu_list = getfield.(pp, :mu)
m_ps = get_meff(pp, ens)
m_vec = get_meff(a1a1, ens)
println("\n pseudo mass ", m_ps, "\n")
println("\n vec mass ", m_vec, "\n")
f_ps = get_f(pp, m_ps, ens)
f_vec = get_f(a1a1, m_vec, ens)
ensobs[i] = EnsObs(ens, mu_list, m_ps, f_ps, m_vec, f_vec)
......@@ -436,7 +438,7 @@ catch
end
#===== CONTINUUM AND CHIRAL EXTRAPOLATION =======#
##
println("\n Continuum and Chiral Extrapolation \n")
obs_db =Dict(
"muc"=> [muc],
......@@ -499,7 +501,7 @@ for k = 1:length(obs)
axvline(0, ls="--", color="black", zorder=1, lw=0.6, label="")
xlabel(L"$a^2/8t_0$")
ylabel(ylbl[k])
xlim(-0.002,0.04)
xlim(-0.002,0.05)
#ylim(2.8,3.4)
legend(ncol=2)
display(gcf())
......
......@@ -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]
......
......@@ -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