Merge branch 'alessandro' of gitlab.ift.uam-csic.es:jugarrio/juobs into alessandro

# Conflicts:
#	src/juobs.jl
#	src/juobs_linalg.jl

gevp tools/tools.jl

@@ -138,11 +138,11 @@ function comp_energy(tot11::Array{Array{juobs.Corr}}, tot12::Array{Array{juobs.C
         evec = Array{Array{}}(undef, length(aux_mat))
         for i = 1:length(aux_mat)
             mat_obs = getfield(aux_mat[i], :mat)[y0+1:end-1]
-            evalues, eigvec = uwgevp_tot(mat_obs, tnot, evec=true, iter=50)
-            res_en[i] = infoEn(energies(evalues), aux_mat[i])
+            eigvec = uwgevp_tot(mat_obs, delta_t=3)
+            #res_en[i] = infoEn(energies(evalues), aux_mat[i])
             evec[i] = eigvec
         end
-        return res_en, evec
+        return  evec
     end
 end
 function comp_energy(tot11::Array{Array{juobs.Corr}}, tot12::Array{Array{juobs.Corr}}, tot13::Array{Array{juobs.Corr}}, tot22::Array{Array{juobs.Corr}}, tot33::Array{Array{juobs.Corr}}, tot23::Array{Array{juobs.Corr}}, evec::Bool=false; tnot::Int64=2)
@@ -160,12 +160,12 @@ function comp_energy(tot11::Array{Array{juobs.Corr}}, tot12::Array{Array{juobs.C
         evec = Array{Array{}}(undef, length(aux_mat))
         for i = 1:length(aux_mat)
             mat_obs = getfield(aux_mat[i], :mat)[y0+1:end-1]
-            evalues, eigvec = uwgevp_tot(mat_obs, tnot, evec=true)
+            eigvec = uwgevp_tot(mat_obs, delta_t=3)
             println("in comp_energy, i is = ", i)
-            res_en[i] = infoEn(energies(evalues), aux_mat[i])
+            #res_en[i] = infoEn(energies(evalues), aux_mat[i])
             evec[i] = eigvec
         end
-        return res_en, evec
+        return  evec
     end
 end
 mutable struct infoEn
@@ -180,13 +180,22 @@ mutable struct infoEn
     end
 end
 function pseudo_mat_elem(evec::Array{Array{T,2} where T,1}, mass::uwreal, mu::Array{Float64})
-    Rn = [exp(mass * (t)/2) * evec[t][1] for t =2:length(evec)]
+    Rn = [exp(mass * (t)/2) * evec[t][1] for t =1:length(evec)]
     aux = sqrt(2)*sum(mu)  / mass^1.5 
     return uwdot(aux,Rn)
 end
-function vec_mat_elem(evec::Array{Array{T,2} where T,1}, mass::uwreal)
+function vec_mat_elem(evec::Array{Array{T,2} where T,1}, mass::uwreal, deg::Bool)
+    if !deg
         Rn = [exp(mass * t/2) * evec[t][1] for t =1:length(evec)]
-    return uwdot(Rn , 1/ mass)
+        return uwdot(Rn , za(beta[iens]) * sqrt(2/ mass))
+    else
+        Rn = [exp(mass * t/2) * evec[t][4] for t =1:length(evec)]
+        println(za(beta[iens]))
+        println(mass)
+        return uwdot(Rn , za(beta[iens]) * sqrt(2/ mass))
+        #return uwdot(Rn , 1/mass)# * sqrt(2/ mass))
+end
+
 end
 function extract_dec_const(mat_elem::uwreal, mass::uwreal, mu::Array{Float64})
     return sqrt(2)*sum(mu)*mat_elem / mass^1.5

src/juobs.jl

@@ -8,9 +8,16 @@ include("juobs_reader.jl")
 include("juobs_tools.jl")
 include("juobs_obs.jl")
 
+<<<<<<< HEAD
 export read_mesons, read_ms1, read_ms, read_md, truncate_data!
 export get_matrix, energies, uwdot, uweigvals, uweigvecs, uweigen, invert, getall_eigvals, getall_eigvecs, hess_reduce, uwcholesky, transpose, tridiag_reduction
 export corr_obs, corr_sym, md_sea, md_val, plat_av, lin_fit, x_lin_fit, y_lin_fit, fit_routine
 export meff, mpcac, dec_const, dec_const_pcvc, comp_t0
+=======
+export read_mesons, read_ms1, read_ms, read_md
+export get_matrix, uwgevp_tot, energies, uwdot, transpose, uwgevp, invert
+export corr_obs, plat_av, lin_fit, x_lin_fit, y_lin_fit, fit_routine
+export meff, dec_const_pcvc, comp_t0
+>>>>>>> 5f368dae0ea2c9e608f49d29b8d1fbc31bc1a463
 
 end # module