Merge branch 'new_matching' of...

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

# Conflicts:
#	src/gevp.jl

src/const.jl

 #========= ENSEMBLE DATABASE ========#
 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],
+    "H102r002" => [32, 3.4, false, 0.15306],
+    "H102r001" => [32, 3.4, false, 0.15306],
+    "H105"     => [32, 3.4, false, 0.12151],
+    "H101"     => [32, 3.4, true, 0.17979],
     "H400"     => [32, 3.46, true, 0.16345],
     "N200"     => [48, 3.55, false, 0.09222],
     "N202"     => [48, 3.55, true, 0.13407],
@@ -44,8 +45,8 @@ const ZM_tm_error = [42, 33, 42, 48, 55] .* 1e-4
 #1608.08900
 const t0_data = [2.86, 3.659, 5.164, 8.595]
 const t0_error = [11, 16, 18, 29] .* 1e-3
-const t0_ph_value = [0.415]
-const t0_ph_error = ones(1,1) .* 4e-3
+const t0_ph_value = [0.413]
+const t0_ph_error = ones(1,1) .* 5e-3
 # 1808.09236
 const ZA_data = [0.75642, 0.76169, 0.76979, 0.78378, 0.79667]
 const ZA_err = [72, 93, 43, 47, 47] .*1e-5

src/gevp.jl

@@ -12,21 +12,32 @@ rcParams["axes.labelsize"] =16
 plt.rc("text", usetex=true)
 ##
 #============= SET UP VARIABLES ===========#
+<<<<<<< HEAD
 const path_data = "/Users/ale/H101r001/dat"
 const path_plat = "/Users/ale/automation/plat.txt"
 const path_results = "/Users/ale/Desktop/results_gevp"
 const path_rw = "/Users/ale/Desktop/data/ms1_dat"
+=======
+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_gevp"
+const path_rw = "/media/alessandro/4277fef2-edc5-4e0d-89cb-f5d1d44fbc8c/data/rwf"
+>>>>>>> 1ae3a758e8dc65a7d5326d67c550dd1d1f6fe8ad
 const path_md = "/Users/ale/Desktop/data/md_dat"
 const path_t0 = "/Users/ale/Desktop/data/t0_shifted.bdio"
 const path_deltam = "/Users/ale/Desktop/data/deltam.bdio"
-const ens_list = ["H101", "H102r001", "H102r002", "H400", "N202", "N200", "N203", "N300", "J303"]
+const ens_list = ["H101", "H102r001", "H102r002"]#, "H400", "N202", "N200", "N203", "N300", "J303"]
 const bdio_rec = [0, 2, 4, 6, 8, 10, 12, 14, 16 ]
 #const ens_list = [ "H400", "N202", "N200", "N203", "N300", "J303"]
 #const bdio_rec = [ 6, 8, 10, 12, 14, 16 ]
-const sector = Dict("ll"=>true, "ls"=>false, "lh"=>true, "ss"=>false, "sh"=>true, "hh"=>true )
+const sector = Dict("ll"=>true, "ls"=>false, "lh"=>true, "ss"=>false, "sh"=>false, "hh"=>true )
 const tau = 3
 const _t0 = 2
+<<<<<<< HEAD
 const range_t_fit = [3,3]
+=======
+const range_t_fit = [2,5]
+>>>>>>> 1ae3a758e8dc65a7d5326d67c550dd1d1f6fe8ad
 const rwf = false
 const compute_t0 = false
 const mass_shift = false 

src/tools.jl

@@ -302,10 +302,10 @@ function param_av(fit_masses::Vector{uwreal})
     av = sum(w .* fit_masses) / sum(w)
     return av  
 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{Nothing, Dict{String,Vector{Float64}}}=nothing)
     mu_list  = getfield.(obs, :mu)
     plat = select_plateau(ens, mu_list)
-    return meff.(obs, plat, pl=pl)
+    return meff.(obs, plat, pl=pl, wpm=wpm)
 end
 function get_f(obs::Vector{juobs.Corr}, m::Vector{uwreal}, ens::EnsInfo; pl::Bool=false)
     mu_list = getfield.(obs, :mu)