Updated analysis program to consider g^2SF

Manifest.toml

@@ -194,9 +194,9 @@ version = "1.0.3"
 
 [[DiffRules]]
 deps = ["LogExpFunctions", "NaNMath", "Random", "SpecialFunctions"]
-git-tree-sha1 = "3287dacf67c3652d3fed09f4c12c187ae4dbb89a"
+git-tree-sha1 = "d8f468c5cd4d94e86816603f7d18ece910b4aaf1"
 uuid = "b552c78f-8df3-52c6-915a-8e097449b14b"
-version = "1.4.0"
+version = "1.5.0"
 
 [[Distributed]]
 deps = ["Random", "Serialization", "Sockets"]
@@ -261,9 +261,9 @@ version = "3.3.10+0"
 
 [[FastGaussQuadrature]]
 deps = ["LinearAlgebra", "SpecialFunctions", "StaticArrays"]
-git-tree-sha1 = "5829b25887e53fb6730a9df2ff89ed24baa6abf6"
+git-tree-sha1 = "5ccd8547615457402a499af9603d55876423eea8"
 uuid = "442a2c76-b920-505d-bb47-c5924d526838"
-version = "0.4.7"
+version = "0.4.8"
 
 [[FixedPointNumbers]]
 deps = ["Statistics"]
@@ -449,9 +449,9 @@ version = "3.100.1+0"
 
 [[LLVM]]
 deps = ["CEnum", "LLVMExtra_jll", "Libdl", "Printf", "Unicode"]
-git-tree-sha1 = "46092047ca4edc10720ecab437c42283cd7c44f3"
+git-tree-sha1 = "7cc22e69995e2329cc047a879395b2b74647ab5f"
 uuid = "929cbde3-209d-540e-8aea-75f648917ca0"
-version = "4.6.0"
+version = "4.7.0"
 
 [[LLVMExtra_jll]]
 deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"]
@@ -478,7 +478,7 @@ version = "0.15.9"
 
 [[LatticeGPU]]
 deps = ["CUDA", "Random", "TimerOutputs"]
-git-tree-sha1 = "2c2a7acbfa90bca560e294d3bb6ea9ffbb5fee40"
+git-tree-sha1 = "62c58d3256cd6dd19df44c1208a890fad886f24d"
 repo-rev = "master"
 repo-url = "https://igit.ific.uv.es/alramos/latticegpu.jl"
 uuid = "958c3683-801a-4582-9cfa-2d6e2ae1763b"
@@ -759,9 +759,9 @@ uuid = "e6cf234a-135c-5ec9-84dd-332b85af5143"
 version = "1.5.3"
 
 [[RecipesBase]]
-git-tree-sha1 = "44a75aa7a527910ee3d1751d1f0e4148698add9e"
+git-tree-sha1 = "a4425fe1cde746e278fa895cc69e3113cb2614f6"
 uuid = "3cdcf5f2-1ef4-517c-9805-6587b60abb01"
-version = "1.1.2"
+version = "1.2.0"
 
 [[RecipesPipeline]]
 deps = ["Dates", "NaNMath", "PlotUtils", "RecipesBase"]
@@ -782,9 +782,9 @@ version = "1.1.3"
 
 [[Roots]]
 deps = ["CommonSolve", "Printf", "Setfield"]
-git-tree-sha1 = "759a7063bbd4842db7d36c555be6fd2ee5c780cf"
+git-tree-sha1 = "51ee572776905ee34c0568f5efe035d44bf59f74"
 uuid = "f2b01f46-fcfa-551c-844a-d8ac1e96c665"
-version = "1.3.9"
+version = "1.3.11"
 
 [[SHA]]
 uuid = "ea8e919c-243c-51af-8825-aaa63cd721ce"
@@ -844,9 +844,9 @@ deps = ["LinearAlgebra", "SparseArrays"]
 uuid = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
 
 [[StatsAPI]]
-git-tree-sha1 = "1958272568dc176a1d881acb797beb909c785510"
+git-tree-sha1 = "0f2aa8e32d511f758a2ce49208181f7733a0936a"
 uuid = "82ae8749-77ed-4fe6-ae5f-f523153014b0"
-version = "1.0.0"
+version = "1.1.0"
 
 [[StatsBase]]
 deps = ["DataAPI", "DataStructures", "LinearAlgebra", "LogExpFunctions", "Missings", "Printf", "Random", "SortingAlgorithms", "SparseArrays", "Statistics", "StatsAPI"]
@@ -937,10 +937,10 @@ uuid = "a2964d1f-97da-50d4-b82a-358c7fce9d89"
 version = "1.19.0+0"
 
 [[Wayland_protocols_jll]]
-deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg", "Wayland_jll"]
-git-tree-sha1 = "2839f1c1296940218e35df0bbb220f2a79686670"
+deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"]
+git-tree-sha1 = "66d72dc6fcc86352f01676e8f0f698562e60510f"
 uuid = "2381bf8a-dfd0-557d-9999-79630e7b1b91"
-version = "1.18.0+4"
+version = "1.23.0+0"
 
 [[XML2_jll]]
 deps = ["Artifacts", "JLLWrappers", "Libdl", "Libiconv_jll", "Pkg", "Zlib_jll"]

main/ana.jl

@@ -36,7 +36,15 @@ function parse_commandline()
         arg_type = Float64
         default = 0.3
     end
-    
+
+    @add_arg_table s begin
+        "-l"
+        help = "Value of L/a"
+        required = false
+        arg_type = Int64
+        default = 0
+    end
+
     return parse_args(s)
 end
 
@@ -102,7 +110,10 @@ end
 function ana_record(fb, nmsm, uinfo)
 
     dt = Vector{Float64}(undef, nmsm)
-    read_record(dt, fb, uinfo)
+    if !read_record(dt, fb, uinfo)
+        return nothing
+    end
+    
     if uinfo == 3
         obs = uwreal(exp.(-dt), "Ensemble")
     else
@@ -221,6 +232,7 @@ parsed_args = parse_commandline()
 fname   = parsed_args["i"]
 dout    = parsed_args["o"]
 tsqet   = parsed_args["c"]
+lova    = parsed_args["l"]
 
 fb = BDIO_open(fname, "r")
 nthm, nmsm, nflw, eps, flw_ns = get_msm_info(fb)
@@ -246,6 +258,40 @@ println(fout, "  - tauint: ", taui(obs, "Ensemble"), " +/- ", dtaui(obs, "Ensemb
 pl = make_plot(obs)
 savefig(pl, dout*"/plaq.pdf")
 
+obs = ana_record(fb, nmsm, 9)
+if obs != nothing
+    if lova == 0
+        dk   = 12.0*pi
+    else
+        th   = pi/(3*lova^2)
+        dk   = 12*lova^2 * (sin(th) + sin(2*th)) 
+    end
+    obs = dk/obs
+
+    println(fout, " # Observable g^2_SF")
+    println(fout, "  - value:  ", obs)
+    println(fout, "  - tauint: ", taui(obs, "Ensemble"), " +/- ", dtaui(obs, "Ensemble"))
+    pl = make_plot(obs)
+    savefig(pl, dout*"/gsqSF.pdf")
+end
+
+obs = ana_record(fb, nmsm, 11)
+if obs != nothing
+    if lova == 0
+        dk   = 12.0*pi
+    else
+        th   = pi/(3*lova^2)
+        dk   = 12*lova^2 * (sin(th) + sin(2*th)) 
+    end
+    obs = -obs/dk
+
+    println(fout, " # Observable vbar")
+    println(fout, "  - value:  ", obs)
+    println(fout, "  - tauint: ", taui(obs, "Ensemble"), " +/- ", dtaui(obs, "Ensemble"))
+    pl = make_plot(obs)
+    savefig(pl, dout*"/vbar.pdf")
+end
+
 plq_t0, t0, w0, id = ana_flow_record(fb, nflw, flw_ns, eps, 12, tsqet)
 if t0 == nothing
     println(fout, " # No flow observables on file")