Merge branch 'alessandro'

.gitignore

-analysis/plots/*
 
 analysis/plat\.txt
+
+*.pdf

Manifest.toml

@@ -27,9 +27,9 @@ version = "2.1.0"
 
 [[ArrayInterface]]
 deps = ["LinearAlgebra", "Requires", "SparseArrays"]
-git-tree-sha1 = "bd09109dffaa3926a20178cb8432edd729be0db0"
+git-tree-sha1 = "22a41da12a13baf9bd22f16fb866086c33ad7835"
 uuid = "4fba245c-0d91-5ea0-9b3e-6abc04ee57a9"
-version = "2.13.7"
+version = "2.13.5"
 
 [[Artifacts]]
 deps = ["Pkg"]
@@ -209,9 +209,9 @@ version = "0.4.3"
 
 [[FillArrays]]
 deps = ["LinearAlgebra", "Random", "SparseArrays"]
-git-tree-sha1 = "502b3de6039d5b78c76118423858d981349f3823"
+git-tree-sha1 = "b955c227b0d1413a1a97e2ca0635a5de019d7337"
 uuid = "1a297f60-69ca-5386-bcde-b61e274b549b"
-version = "0.9.7"
+version = "0.9.6"
 
 [[FiniteDiff]]
 deps = ["ArrayInterface", "LinearAlgebra", "Requires", "SparseArrays", "StaticArrays"]
@@ -300,9 +300,9 @@ uuid = "82899510-4779-5014-852e-03e436cf321d"
 version = "1.0.0"
 
 [[JLLWrappers]]
-git-tree-sha1 = "c70593677bbf2c3ccab4f7500d0f4dacfff7b75c"
+git-tree-sha1 = "dbc0967f6403829a6682493fdb4ec7c0ebfd2e68"
 uuid = "692b3bcd-3c85-4b1f-b108-f13ce0eb3210"
-version = "1.1.3"
+version = "1.1.1"
 
 [[JSON]]
 deps = ["Dates", "Mmap", "Parsers", "Unicode"]
@@ -672,9 +672,9 @@ version = "1.2.0"
 
 [[Zlib_jll]]
 deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"]
-git-tree-sha1 = "320228915c8debb12cb434c59057290f0834dbf6"
+git-tree-sha1 = "ded43825988ace7a311ee7e1d0f09571822509c4"
 uuid = "83775a58-1f1d-513f-b197-d71354ab007a"
-version = "1.2.11+18"
+version = "1.2.11+17"
 
 [[libass_jll]]
 deps = ["Artifacts", "Bzip2_jll", "FreeType2_jll", "FriBidi_jll", "JLLWrappers", "Libdl", "Pkg", "Zlib_jll"]

constants/juobs_const.jl

@@ -9,6 +9,9 @@ const ZM_data = [1.9684, 1.9935, 2.0253, 2.0630, 2.0814]
 const ZM_error = [35, 27, 33, 38, 45] .* 1e-4
 const ZM_tm_data = [2.6047, 2.6181, 2.6312, 2.6339, 2.6127]
 const ZM_tm_error = [42, 33, 42, 48, 55] .* 1e-4
+# 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
 #1608.08900
 const b_values2 = [3.40, 3.46, 3.55, 3.70]
 const t0_data = [2.86, 3.659, 5.164, 8.595]
@@ -21,11 +24,13 @@ const C1 = zeros(5, 5)
 const C2 = zeros(5, 5)
 const C3 = zeros(4, 4)
 const C4 = zeros(6, 6)
+const C5 = zeros(5, 5)
 for i = 1:6
     C4[i, i] = M_error[i] ^ 2
     if i<=5
         C1[i, i] = ZM_error[i] ^ 2
         C2[i, i] = ZM_tm_error[i] ^ 2
+        C5[i, i] = ZA_err[i]^2
         if i <= 4
             C3[i, i] = t0_error[i] ^ 2
         end
@@ -38,8 +43,10 @@ const t0_ = cobs(t0_data, C3, "t0")
 const t0_ph = cobs(t0_ph_value, t0_ph_error .^ 2, "sqrt(8 t0) (fm)")
 const a_ = t0_ph ./ sqrt.(8 .* t0_)
 const M = cobs(M_values, C4, "charmed meson masses")
+const Za = cobs(ZA_data, C5, "ZA")
 
 zm(beta::Float64) = ZM[b_values .== beta][1]
 zm_tm(beta::Float64) = ZM_tm[b_values .== beta][1]
 t0(beta::Float64) = t0_[b_values2 .== beta][1]
 a(beta::Float64) = a_[b_values2 .== beta][1]
+za(beta::Float64) = Za[b_values .== beta][1]
\ No newline at end of file

src/juobs_obs.jl

@@ -73,7 +73,7 @@ function dec_const_pcvc(corr::Vector{uwreal}, plat::Vector{Int64}, m::uwreal, mu
     dim = length(corr_pp)
                                                                  
     aux = exp.((collect(1:dim) .- y0 ) .* [m for k in 1:dim])
-    R = (aux .* corr_pp).^0.5
+    R = ((aux .* corr_pp).^2).^0.25
     R_av = plat_av(R, plat)
     f = sqrt(2) * (mu[1] + mu[2]) *R_av / m^1.5
     uwerr(f)
@@ -93,7 +93,7 @@ function dec_const_pcvc(corr::Vector{uwreal}, plat::Vector{Int64}, m::uwreal, mu
     if data == false
         return f
     else
-        return (f, R)                   
+        return (f, uwdot(sqrt(2) * (mu[1] + mu[2]) / m^1.5, R))                   
     end 
 end 
 dec_const_pcvc(corr::Corr, plat::Vector{Int64}, m::uwreal; pl::Bool=true, data::Bool=false) =

src/juobs_tools.jl

@@ -120,10 +120,14 @@ m2_phys = fitp[1] + fitp[2] * phi2_phys
 function lin_fit(x::Vector{<:Real}, y::Vector{uwreal})
     uwerr.(y)
     par = lin_fit(x, value.(y), err.(y))
-
     chisq(p, d) = sum((d .- p[1] .- p[2].*x).^2 ./ err.(y) .^2)
     (fitp, csqexp) = fit_error(chisq, par, y)
-    
+    for i = 1:length(fitp)
+        uwerr(fitp[i])
+        print("\n Fit parameter: ", i, ": ")
+        details(fitp[i])
+    end
+    println("Chisq / chiexp: ", chisq(par, y), " / ", csqexp, " (dof: ", x[end]-length(par),")")
     return (fitp, csqexp)
 end