Commit de9b8d48 authored by Alessandro 's avatar Alessandro

update from my local mac

parent 578d4fd9
...@@ -47,5 +47,5 @@ lh 123 140 ...@@ -47,5 +47,5 @@ lh 123 140
ss 123 140 ss 123 140
sh 123 140 sh 123 140
hh 123 155 hh 123 155
t0 40 160 t0 25 170
#end #end
...@@ -37,8 +37,8 @@ using Revise, juobs, PyPlot, LaTeXStrings, ADerrors, DelimitedFiles ...@@ -37,8 +37,8 @@ using Revise, juobs, PyPlot, LaTeXStrings, ADerrors, DelimitedFiles
const path_data = "/Users/ale/Desktop/data" const path_data = "/Users/ale/Desktop/data"
const path_plat = "/Users/ale/automation/plat.txt" const path_plat = "/Users/ale/automation/plat.txt"
const path_results = "/Users/ale/Desktop/results" const path_results = "/Users/ale/Desktop/results"
const ensembles = ["J303", "H400", "N300"] const ensembles = ["H400", "J303"]
const sector = Dict("ll"=>false, "ls"=>false, "lh"=>true, "ss"=>false, "sh"=>true, "hh"=>true ) const sector = Dict("ll"=>true, "ls"=>true, "lh"=>true, "ss"=>true, "sh"=>true, "hh"=>true )
const rwf = false const rwf = false
const compute_t0 = false const compute_t0 = false
const mass_shift = false #not implemented yet const mass_shift = false #not implemented yet
...@@ -64,8 +64,8 @@ end ...@@ -64,8 +64,8 @@ end
#======== ANALYSIS ==========# #======== ANALYSIS ==========#
println("\n Computing Observables \n") println("\n Computing Observables \n")
wpm = Dict{String,Vector{Float64}}()
wpm["H102"] = [-1.0, 1.0, -1.0, -1.0]
@time begin @time begin
ensobs = Vector{EnsObs}(undef,length(ensembles)) ensobs = Vector{EnsObs}(undef,length(ensembles))
...@@ -77,8 +77,8 @@ println("\n Computing Observables \n") ...@@ -77,8 +77,8 @@ println("\n Computing Observables \n")
a1a1 = get_corr(ens, "G1G5", "G1G5", rw=rwf) a1a1 = get_corr(ens, "G1G5", "G1G5", rw=rwf)
mu_list = getfield.(pp, :mu) mu_list = getfield.(pp, :mu)
m_ps = get_meff(pp, ens) m_ps = get_meff(pp, ens)
m_vec = get_meff(a1a1, ens) m_vec = get_meff(a1a1, ens, wpm=wpm)
f_ps = get_f(pp, m_ps, ens) f_ps = get_f(pp, m_ps, ens, wpm=wpm)
f_vec = get_f(a1a1, m_vec, ens) f_vec = get_f(a1a1, m_vec, ens)
ensobs[i] = EnsObs(ens, mu_list, m_ps, f_ps, m_vec, f_vec) ensobs[i] = EnsObs(ens, mu_list, m_ps, f_ps, m_vec, f_vec)
if ens.deg if ens.deg
...@@ -100,8 +100,7 @@ println("\n Computing Observables \n") ...@@ -100,8 +100,7 @@ println("\n Computing Observables \n")
end end
println("Total time:") println("Total time:")
end end
##
#=========== MATCHING =============# #=========== MATCHING =============#
println("\n Matching Procedure \n") println("\n Matching Procedure \n")
......
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