read_mesons and read_mesons_TSM now support automatic detection of missing measurements

t0_phys changed from Bruno et al to the value from internal analysis

constants/juobs_const.jl

@@ -21,8 +21,8 @@ const ZS_over_ZP_err = [83, 64, 48, 23, 25 ] .* 1e-4
 # const b_values2 = [3.40, 3.46, 3.55, 3.70]
 const t0_data = [2.86, 3.659, 5.164, 8.595, 14.040]
 const t0_error = [11, 16, 18, 29, 49] .* 1e-3
-const t0_ph_value = [0.413]
-const t0_ph_error = ones(1,1) .* 5e-3
+const t0_ph_value = [0.4118]
+const t0_ph_error = ones(1,1) .* 25e-4
 #2101.10969
 const RM_data = [2.335, 1.869, 1.523, 1.267, 1.149]
 const RM_err  = [31, 19, 14, 16, 18] .* 1e-3

src/juobs_linalg.jl

@@ -183,7 +183,7 @@ Julia>
 function getall_eigvals(a::Vector{Matrix{uwreal}}, t0::Int64; iter=5 )
     n = length(a)
     res = Vector{Vector{uwreal}}(undef, n)
-    [res[i] = uweigvals(a[i], a[t0]) for i=1:n]
+    [res[i] = uweigvals(a[i], a[t0], iter=iter) for i=1:n]
     return res
 end
 
@@ -782,6 +782,77 @@ function more_penrose_inv(A::Matrix)
 end
 
 
+########################
+# OPERATOR OVERLOADING
+########################
+
+function Base.:*(x::uwreal, y::Array{Any})
+    N = size(y, 1)
+    return fill(x, N) .* y
+end  
+Base.:*(x::Array{Any}, y::uwreal) = Base.:*(y,x)
+function Base.:*(x::uwreal, y::Array{Float64})
+    N = size(y, 1)
+    return fill(x, N) .* y
+end
+Base.:*(x::Array{Float64}, y::uwreal) = Base.:*(y,x)
+function Base.:*(x::uwreal, y::Array{uwreal})
+    N = size(y, 1)
+    return fill(x, N) .* y
+end
+Base.:*(x::Array{uwreal}, y::uwreal) = Base.:*(y,x)
+function Base.:+(x::uwreal, y::Vector{uwreal})
+    N = size(y, 1)
+    return fill(x, N) .+ y
+end
+function Base.:+(x::Float64, y::Vector{Float64})
+    N = size(y, 1)
+    return fill(x, N) .+ y
+end
+function Base.:+(x::Float64, y::Vector{uwreal})
+    N = size(y, 1)
+    return fill(x, N) .+ y
+end
+function Base.:-(x::Float64, y::Vector{Any})
+    N = size(y, 1)
+    return fill(x, N) .- y
+end
+function Base.:-(x::Float64, y::Vector{Float64})
+    N = size(y, 1)
+    return fill(x, N) .- y
+end
+function Base.:-(x::Float64, y::Vector{uwreal})
+    N = size(y, 1)
+    return fill(x, N) .- y
+end
+
+function Base.length(uw::uwreal)
+    return length(value(uw))
+end
+function Base.iterate(uw::uwreal)
+    return iterate(uw, 1)
+end
+function Base.iterate(uw::uwreal, state::Int64)
+    if state > length(uw)
+        return nothing
+    else
+        return uw[state], state +1
+    end
+end
+function Base.iterate(uw::Vector{uwreal})
+    return iterate(uw, 1)
+end
+function Base.iterate(uw::Vector{uwreal}, state::Int64)
+    if state > length(uw)
+        return nothing
+    else
+        return uw[state], state +1
+    end
+end
+function Base.getindex(uw::uwreal, ii::Int64)
+    idx = getindex(value(uw), ii)
+    return  uw # uwreal([getindex(value(uw), kwargs...), err(uw)], " ")
+end
 
 """
 Base.:*(x::uwreal, y::Matrix{uwreal})

src/juobs_obs.jl

@@ -33,9 +33,12 @@ function meff(corr::Vector{uwreal}, plat::Vector{Int64}; pl::Bool=true, data::Bo
         errorbar(x, y, dy, fmt="x", color="black")
         ylabel(L"$m_\mathrm{eff}$")
         xlabel(L"$x_0$")
-        ylim(v-30*e, v+30*e)
-        # ylim(0.05, 0.075)
-        xlim(64,length(y))
+        _, max_idx = findmax(value.(corr))
+        ylim(v-20*e, v+20*e)
+        xlim(left=max_idx)
+        # ylim(v-30*e, v+30*e)
+        # ylim(0.15, 0.18)
+        #xlim(64,length(y))
     
         if !isnothing(kappa)
             title(string(L"$\kappa_1 = $", kappa[1], L" $\kappa_2 = $", kappa[2]))
@@ -51,7 +54,6 @@ function meff(corr::Vector{uwreal}, plat::Vector{Int64}; pl::Bool=true, data::Bo
         return (mass, aux)     
     end                    
 end   
-
 function meff(corr::Corr, plat::Vector{Int64}; pl::Bool=true, data::Bool=false, 
     wpm::Union{Dict{Int64,Vector{Float64}},Dict{String,Vector{Float64}}, Nothing}=nothing)
     
@@ -123,7 +125,9 @@ function mpcac(a0p::Vector{uwreal}, pp::Vector{uwreal}, plat::Vector{Int64}; ca:
         errorbar(x, y, dy, fmt="x", color="black")
         ylabel(L"$m_\mathrm{PCAC}$")
         xlabel(L"$x_0$")
+        _, max_idx = findmax(value.(pp))
         ylim(v-20*e, v+20*e)
+        xlim(left=max_idx)
     
         if !isnothing(kappa)
             title(string(L"$\kappa_1 = $", kappa[1], L" $\kappa_2 = $", kappa[2]))
@@ -352,7 +356,7 @@ function dec_const(vv::Vector{uwreal}, plat::Vector{Int64}, m::uwreal, y0::Int64
         fill_between(plat[1]:plat[2], v-e, v+e, color="green", alpha=0.75, label=L"$R$")
         errorbar(x, y, dy, fmt="x", color="black", label=lbl)
         legend()
-        xlim(y0, y0 +plat[2] +15)
+        xlim(left=y0)
         ylim(v-10*e, v+10*e)
         ylabel(L"$af_{B}$")
         #ylabel(L"$R_\mathrm{av}$")
@@ -617,6 +621,7 @@ function comp_t0(Y::YData, plat::Vector{Int64}; L::Int64, pl::Bool=false,
                 println("Automatic truncation in Ysl ", ivrep_ws[1], " / ", replica[1], ". R = 1")
                 Ysl = Ysl[1:ivrep_ws[1], :, :]
             elseif replica[1] < ivrep_ws[1]
+                println(replica[1])
                 error("Automatic truncation failed. R = 1\nTry using truncate_data!")
             end
         end

src/juobs_reader.jl

@@ -412,6 +412,8 @@ function read_ms(path::String; id::Union{String, Nothing}=nothing, dtr::Int64=1
     ntr = Int32((fsize - 3*4 - 8) / datsize)
 
     if mod(ntr, dtr) != 0
+        println("ntr = ", ntr)
+        println("dtr = ", dtr)
         error("ntr / dtr must be exact")
     end