Commit e7f6600e authored by ale's avatar ale

add constants

parent f8c5573f
...@@ -8,6 +8,7 @@ include("juobs_linalg.jl") ...@@ -8,6 +8,7 @@ include("juobs_linalg.jl")
include("juobs_reader.jl") include("juobs_reader.jl")
include("juobs_tools.jl") include("juobs_tools.jl")
include("juobs_obs.jl") include("juobs_obs.jl")
include("../constants/juobs_const.jl")
export read_mesons, read_mesons_correction, read_mesons_multichunks, read_mesons_correction_multichunks, read_ms1, read_ms, read_md, get_YM, get_YM_dYM, truncate_data!, concat_data! export read_mesons, read_mesons_correction, read_mesons_multichunks, read_mesons_correction_multichunks, 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 get_matrix, energies, uwdot, uweigvals, uweigvecs, uweigen, invert, getall_eigvals, getall_eigvecs, hess_reduce, uwcholesky, transpose, tridiag_reduction, make_positive_def, invert_covar_matrix
......
...@@ -21,7 +21,9 @@ function apply_rw(data::Array{Float64}, W::Matrix{Float64}, vcfg::Union{Nothing, ...@@ -21,7 +21,9 @@ function apply_rw(data::Array{Float64}, W::Matrix{Float64}, vcfg::Union{Nothing,
rw1 = W[1, 1:nc] rw1 = W[1, 1:nc]
rw2 = W[2, 1:nc] rw2 = W[2, 1:nc]
rw_s = [1.0 for i in 1:nc] rw_s = [1.0 for i in 1:nc]
if id in ["H105r001", "H105r002", "H105r005", "J303", "J303r003"]
rw_s[flag_s[id]] .= -1.0 rw_s[flag_s[id]] .= -1.0
end
rw = rw1 .* rw2 .* rw_s rw = rw1 .* rw2 .* rw_s
data_r = data .* rw[vcfg] data_r = data .* rw[vcfg]
return (data_r, rw) return (data_r, rw)
...@@ -147,7 +149,7 @@ function corr_obs(cdata::CData; real::Bool=true, rw::Union{Array{Float64, 2}, No ...@@ -147,7 +149,7 @@ function corr_obs(cdata::CData; real::Bool=true, rw::Union{Array{Float64, 2}, No
real ? data = cdata.re_data ./ L^3 : data = cdata.im_data ./ L^3 real ? data = cdata.re_data ./ L^3 : data = cdata.im_data ./ L^3
nt = size(data)[2] nt = size(data)[2]
idm = isnothing(idm) ? cdata.vcfg : idm idm = isnothing(idm) ? Int64.(cdata.vcfg) : idm
if isnothing(rw) if isnothing(rw)
# idm = isnothing(idm) ? collect(1:nms) : idm # idm = isnothing(idm) ? collect(1:nms) : idm
......
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