merge with Master completed

constants/juobs_const.jl

@@ -101,11 +101,77 @@ rm(beta::Float64)         = RM[b_values .== beta][1]
 ba_bp(beta::Float64)      = BA_BP[b_values .== beta][1]
 Z(beta::Float64)          = ZZ[b_values .== beta][1]
 
-function ca(beta::Float64)
-  g02 = 6/beta; 
-  p0 = 9.2056
-  p1 = -13.9847
-  e= exp(p0+p1/g02)
-  return -0.006033*g02*(1+e)
-end
+const ens_db = Dict(
+    #"ens_id"=>[L, T, beta, dtr, vrw, trunc_cnfg]
+    "H101"     => [32, 96, 3.4, 2, "1.2", [1001,1009]],
+    "H102r001" => [32, 96, 3.4, 2, "2.0", [997]],
+    "H102r002" => [32, 96, 3.4, 2, "2.0", [1008]],
+    "H105"     => [32, 96, 3.4, 2, "2.0", [947,1042]],
+    "H105r005" => [32, 96, 3.4, 1, "1.2", [837]],
+    "H400"     => [32, 96, 3.46, 1, "1.2", [505,540]],
+    "D450"     => [64, 128, 3.46, 1, ["2.0"], [1000]],
+    "N202"     => [48, 128, 3.55, 2, "1.2", [899]],
+    "N203"     => [48, 128, 3.55, 1, "2.0", [756,787]],
+    "N200"     => [48, 128, 3.55, 1, "2.0", [856,856]],
+    "D200"     => [64, 128, 3.55, 2, "2.0", [2001]],
+    "E250"     => [96, 192, 3.55, 1, ["2.0"], [1009]],
+    "N300"     => [48, 128, 3.70, 1, "1.2", [1521]],
+    "N302"     => [48, 128, 3.70, 1, "1.2", [2201]],
+    "J303"     => [64, 192, 3.70, 2, "2.0", [1073]],
+    "E300"     => [96, 192, 3.70, 1, ["1.4"], [1139]],
+    "J500"     => [64, 192, 3.85, 2, ["1.2", "1.4", "2.0"], [789,655,431]],
+    "J501"     => [64, 192, 3.85, 1, ["1.2", "1.4", "2.0"], [1635,1142,1150]]
+)
+
+
+const db = Dict(
+    "J501" => ["ts001_chunk1", "ts001_chunk3", "ts190_chunk1", "ts190_chunk2"],
+    "J500" => ["ts001_chunk1", "ts001_chunk2", "ts190_chunk1", "ts190_chunk2"],
+    "E250" => ["ts001", "ts097"],
+    "E300" => ["ts001_chunk2", "ts001_chunk3", "ts190_chunk1"],#, "ts001_chunk1"],
+    "D450" => ["ts001", "ts065_1", "ts065_2"]
+)
+
+const db_c = Dict(
+    "J501" => ["ts001", "ts190"],
+    "J500" => ["ts001_chunk1", "ts190_chunk2"],
+    "E250" => ["ts001"],
+    "E300" => ["ts001_chunk2"],#, "ts001_chunk1"]
+    "D450" => ["ts001_1", "ts001_2"]
+)
+
+const sym_bool = Dict(
+    "J501" => true,
+    "J500" => true,
+    "E250" => false,
+    "E300" => false,
+    "D450" => false
+)
+
+const flag_s = Dict(
+    "J303r003" => [324,325,326],
+    "H105r001" => [100,105,106],
+    "H105r002" => [1],
+    "H105r005" => [254, 255, 256, 257, 259, 260, 261, 264, 265, 266, 269, 280, 282, 283, 284, 285, 286, 287, 288, 289, 291, 299, 301, 313, 314, 315, 316, 331, 332, 333, 334, 335, 336, 337, 338, 339, 340, 341, 342]
+)
 
+const ensemble_inv = Dict(
+    "H101"     => 1,
+    "H102r001" => 2,
+    "H102r002" => 3,
+    "H105"     => 4,
+    "H105r005" => 5,
+    "H400"     => 6,
+    "D450"     => 7,
+    "N202"     => 8,
+    "N203"     => 9,
+    "N200"     => 10,
+    "D200"     => 11,
+    "E250"     => 12,
+    "N300"     => 13,
+    "N302"     => 14,
+    "J303"     => 15,
+    "E300"     => 16,
+    "J500"     => 17,
+    "J501"     => 18
+)
\ No newline at end of file

src/juobs.jl

@@ -10,11 +10,15 @@ include("juobs_reader.jl")
 include("juobs_tools.jl")
 include("juobs_plots.jl")
 include("juobs_obs.jl")
+include("../constants/juobs_const.jl")
+include("../constants/path_csv.jl")
 
-export read_mesons, read_mesons_correction, read_mesons_chunks, read_ms1, read_ms, read_md, truncate_data!, concat_data!
+export EnsInfo
+export ens_db, db, db_c, flag_s, sym_bool, ensemble_inv
+export read_mesons, read_mesons_correction, read_mesons_multichunks, read_mesons_correction_multichunks, read_ens_tm, read_ens_tm_sym, read_ens_TSM, read_ens_wil, read_ens_csv, get_corr_tm, get_corr_TSM, get_corr_TSM_multichunks, get_corr_wil, read_ms1, read_ms, read_md, get_YM, get_YM_dYM, truncate_data!, concat_data!
 export get_matrix, energies, uwdot, uweigvals, uweigvecs, uweigen, invert, getall_eigvals, getall_eigvecs, hess_reduce, uwcholesky, transpose, tridiag_reduction, make_positive_def, invert_covar_matrix
-export corr_obs, corr_obs_TSM, corr_sym, md_sea, md_val, plat_av, lin_fit, x_lin_fit, y_lin_fit, fit_routine, global_fit_routine, bayesian_av, pvalue
-export plot_data,plot_func
-export meff, mpcac, dec_const, dec_const_w, dec_const_pcvc, comp_t0
+export corr_obs, corr_obs_TSM, corr_sym, corr_sym_E250, corr_sym_D450, md_sea, md_val, plat_av, lin_fit, x_lin_fit, y_lin_fit, fit_routine, global_fit_routine, bayesian_av, pvalue
+export plot_data,plot_func, pvalue, fve, model_av, fit_alg
+export meff, mpcac, dec_const, dec_const_w, dec_const_w, dec_const_pcvc, comp_t0, get_m, get_m_pbc, get_mpcac, get_f_wil, get_f_wil_pbc, get_f_tm, get_f_tm_pbc, get_w0t0_plat
 
 end # module

src/juobs_types.jl

@@ -193,6 +193,42 @@ mutable struct YData
     YData(a, b, c, d) = new(a, b, c, d)
 end
 
+@doc raw"""
+
+    EnsInfo(ens_id::String, info::Vector{Any})
+
+Examples:
+```@example    
+id = "H101"
+ens = EnsInfo(id, ens_db[id])
+```
+"""
+mutable struct EnsInfo
+    id::String
+    L::Int64
+    T::Int64
+    beta::Float64
+    ca::Float64
+    dtr::Int64
+    vrw::Union{String, Vector{String}}
+    cnfg::Vector{Int64}
+    function EnsInfo(ens_id::String, info::Vector{Any})
+        id = ens_id
+        L = info[1]
+        T = info[2]
+        beta = info[3]
+        dtr = info[4]
+        vrw = info[5]
+	    cnfg = info[6]
+
+        p0 = 9.2056
+        p1 = -13.9847
+        g2 = 6 ./ beta 
+        ca = - 0.006033 .* g2 .*( 1 .+exp.(p0 .+ p1./g2)) 
+        return new(id, L, T, beta, ca, dtr, vrw, cnfg)
+    end
+end
+
 function Base.show(io::IO, a::GHeader)
     print(io, "ncorr = ", a.ncorr, "\t")
     print(io, "nnoise = ", a.nnoise, "\t")