update user option t0 and tau

gevp.jl

@@ -7,6 +7,9 @@ const path_plat = "/Users/ale/automation/plat.txt"
 const path_results = "/Users/ale/Desktop/results_gevp"
 const ensembles = [ "J303", "N300", "H400"]
 const sector = Dict("ll"=>false, "ls"=>false, "lh"=>true, "ss"=>false, "sh"=>true, "hh"=>true )
+const tau = 4
+const _t0 = 2
+const range_t_fit = [2,5]
 const rwf = false
 const compute_t0 = false
 const mass_shift = false #not implemented yet
@@ -43,8 +46,8 @@ println("\n Building matrices \n")
             pp = get_corr(ens,"G5", "G5", rw=rwf)
             gen_mulist[i] = getfield.(pp, :mu)
             a1a1 = get_corr(ens, "G1G5", "G1G5", rw=rwf)
-            matinfo[i] = comp_mat(ens, pp, 4)
-            matinfo_vec[i] = comp_mat(ens, a1a1, 4)
+            matinfo[i] = comp_mat(ens, pp, tau)
+            matinfo_vec[i] = comp_mat(ens, a1a1, tau)
             println("Time:")
         end
     end
@@ -62,8 +65,8 @@ println("\n Computing observables \n")
         @time begin
             ens = ensinfo[i]
             println("\n Ensemble: ", ens.id)
-            en0_ps = gevp_mass(matinfo[i], t0=2, wpm=wpmm)
-            en0_vec = gevp_mass(matinfo_vec[i], t0=2, wpm=wpmm)
+            en0_ps = gevp_mass(matinfo[i], t0=_t0, delta_t_in=range_t_fit, wpm=wpmm)
+            en0_vec = gevp_mass(matinfo_vec[i], t0=_t0, delta_t_in=range_t_fit, wpm=wpmm)
             println( "\nground  ps state: ", en0_ps)
             println( "\nground  vec state: ", en0_vec)
             ensobs[i] = EnsObs(ens, gen_mulist[i], en0_ps, en0_vec)

tools.jl

@@ -129,32 +129,6 @@ function comp_mat(ensinfo::EnsInfo, tot_obs::Vector{juobs.Corr}, tau::Int64)
     end
     return mat_info
 end
-function relevant_corr(ensinfo::EnsInfo, tot_obs::Vector{juobs.Corr})
-    mulist = getfield.(tot_obs, :mu)
-    res_obs = Vector{juobs.Corr}(undef, 0)
-    if sector["ll"]
-        push!(res_obs, get_ll(mulist, tot_obs, ensinfo.deg))
-    end
-    if sector["ls"]
-        push!(res_obs, get_ls(mulist, tot_obs, ensinfo.deg))
-    end
-    if sector["lh"]
-        toadd = get_lh(mulist, tot_obs, ensinfo.deg)
-        [push!(res_obs, toadd[i]) for i=1:length(toadd)]
-    end
-    if sector["ss"]
-        push!(res_obs, get_ss(mulist, tot_obs, ensinfo.deg))
-    end
-    if sector["sh"]
-        toadd = get_sh(mulist, tot_obs, ensinfo.deg)
-        [push!(res_obs, toadd[i]) for i=1:length(toadd)]  
-    end
-    if sector["hh"]
-        toadd = get_hh(mulist, tot_obs, ensinfo.deg)
-        [push!(res_obs, toadd[i]) for i=1:length(toadd)]
-    end
-    return res_obs
-end
 function gevp_mass(mat_obs::Vector{MatInfo}; t0::Int64=2, delta_t_in::Array{Int64}=[2,5], wpm::Union{Nothing, Dict{Int64,Vector{Float64}}}=nothing)
     y0s = getfield.(mat_obs, :y0)
     mu_list = getfield.(mat_obs, :mu)