many text and figure changes

3 files changed, 90 insertions, 103 deletions

diff --git a/figs/fig_clusters_ising2d.gplot b/figs/fig_clusters_ising2d.gplot
index 61172db..6f1a75d 100644
--- a/figs/fig_clusters_ising2d.gplot
+++ b/figs/fig_clusters_ising2d.gplot
@@ -1,140 +1,127 @@
 
-set terminal epslatex size 6.834, 2.81576
-set output "fig_clusters_ising2d.tex"
-
-cc1 = "#5e81b5"
-cc2 = "#e19c24"
-cc3 = "#8fb032"
-cc4 = "#eb6235"
-cc5 = "#8778b3"
-cc6 = "#c56e1a"
-
-set palette model RGB defined ( 8 cc1, 16 cc2, 32 cc3, 64 cc4, 128 cc5, 256 cc6  )
-
-unset colorbox
-set nokey
-set format x '$10^{%T}$'
-set logscale xy
-set ylabel '$\avg{s_{\text{\sc 1c}}}L^{-\gamma/\nu}$'
-set xlabel '$hL^{\beta\delta/\nu}$'
-
-set xrange [0.000005:12000000]
-
-
-set multiplot layout 2,3
+# data and constants, sorted by column
 
-set size 0.38, 0.5
-
-dataIsing2D = "data/cluster-size/cluster-size_ising2d.dat"
-
-set yrange [0.8:8]
-
-unset xlabel
-
-set label "2D Ising" at graph 0.1, 0.75
+isingRange = "[0.0000005:5000000]"
 
+dataIsing2D = "data/correlation-times/ising-2d.dat"
 betaIsing2D = 1.0 / 8.0
 nuIsing2D = 1.0
 deltaIsing2D = 15.0
 gammaIsing2D = 7.0 / 4.0
 
-plot dataIsing2D using ($3/$2 * exp(log($1) * betaIsing2D * deltaIsing2D / nuIsing2D)):($4 * exp(-log($1) * gammaIsing2D / nuIsing2D)):($5 * exp(-log($1) * gammaIsing2D/nuIsing2D)):1 with yerrorbars pt 0 lw 2 palette, dataIsing2D using ($3/$2 * exp(log($1) * betaIsing2D * deltaIsing2D / nuIsing2D)):($4 * exp(-log($1) * gammaIsing2D / nuIsing2D)):1 with lines palette, 1.5 * exp(log(x) * 2 / deltaIsing2D) with lines lc black
-
-unset label
-set origin 0.35, 0.5
-set size 0.35, 0.5
-
-data3Potts2D = "data/cluster-size/cluster-size_3potts2d.dat"
-
-set xrange [0.000005:9000000]
-set yrange [0.4:7]
-
-set label "2D 3-State Potts" at graph 0.1, 0.75
+dataIsing3D = "data/correlation-times/ising-3d.dat"
+betaIsing3D = 0.326419
+nuIsing3D = 0.629971
+deltaIsing3D = 4.78984
+gammaIsing3D = 1.237075
 
-unset xlabel
-unset ylabel
+pottsRange="[0.000001:5000000]"
 
+data3Potts2D = "data/correlation-times/potts-3.dat"
 beta3Potts2D = 1.0 / 9.0
 nu3Potts2D = 5.0 / 6.0
 delta3Potts2D = 14.0
 gamma3Potts2D = 13.0 / 9.0
 
-plot data3Potts2D using ($3/$2 * exp(log($1) * beta3Potts2D * delta3Potts2D / nu3Potts2D)):($4 * exp(-log($1) * gamma3Potts2D / nu3Potts2D)):($5 * exp(-log($1) * gamma3Potts2D/nu3Potts2D)):1 with yerrorbars pt 0 lw 2 palette, data3Potts2D using ($3/$2 * exp(log($1) * beta3Potts2D * delta3Potts2D / nu3Potts2D)):($4 * exp(-log($1) * gamma3Potts2D / nu3Potts2D)):1 with lines palette, 1.2 * exp(log(x) * 2 / delta3Potts2D) with lines lc black
-
-unset label
-set size 0.38, 0.5
-
-data2Vector3D = "data/cluster-size/cluster-size_2vector3d.dat"
-
-set xrange [0.000005:9000000]
-set yrange [0.6:200]
+data4Potts2D = "data/correlation-times/potts-4.dat"
+beta4Potts2D = 1.0 / 12.0
+nu4Potts2D = 2.0 / 3.0
+delta4Potts2D = 15.0
+gamma4Potts2D = 7.0 / 6.0
 
-set label "3D O(2)" at graph 0.1, 0.75
+vectorRange="[0.000001:10000000]"
 
+data2Vector3D = "data/correlation-times/planar-pert.dat"
 beta2Vector3D = 0.3470
 nu2Vector3D = 0.6703
 delta2Vector3D = 4.79539
 gamma2Vector3D = 1.3169
 
-plot data2Vector3D using ($3/$2 * exp(log($1) * beta2Vector3D * delta2Vector3D / nu2Vector3D)):($4 * exp(-log($1) * gamma2Vector3D / nu2Vector3D)):($5 * exp(-log($1) * gamma2Vector3D/nu2Vector3D)):1 with yerrorbars pt 0 lw 2 palette, data2Vector3D using ($3/$2 * exp(log($1) * beta2Vector3D * delta2Vector3D / nu2Vector3D)):($4 * exp(-log($1) * gamma2Vector3D / nu2Vector3D)):1 with lines palette, 3 * exp(log(x) * 2 / delta2Vector3D) with lines lc black
+data3Vector3D = "data/correlation-times/heisenberg-pert.dat"
+beta3Vector3D = 0.3662
+nu3Vector3D = 0.7073
+delta3Vector3D = 4.79465
+gamma3Vector3D = 1.3895
 
-unset label
+# define colors
 
-set origin -0.05,0.0
-set size 0.43, 0.55
+cc1 = "#5e81b5"
+cc2 = "#e19c24"
+cc3 = "#8fb032"
+cc4 = "#eb6235"
+cc5 = "#8778b3"
+cc6 = "#c56e1a"
+cc7 = "#5d9ec7"
 
-dataIsing3D = "data/cluster-size/cluster-size_ising3d.dat"
+set palette model RGB defined ( 8 cc1, 16 cc2, 32 cc3, 64 cc4, 128 cc5, 256 cc6 , 512 cc7 )
 
-set xrange [0.000005:9000000]
-set yrange [0.9:400]
+# global plotting settings
 
-set label "3D Ising" at graph 0.1, 0.75
+set terminal epslatex size 6.834, 2.81576
+set output "fig_clusters_ising2d.tex"
 
-set ylabel '$\avg{s_{\text{\sc 1c}}}L^{-\gamma/\nu}$'
-set xlabel '$hL^{\beta\delta/\nu}$'
+set multiplot layout 2,3 margins 0.05, 0.995, 0.15, 0.99 spacing 0.05, 0.015
+set size ratio 1 / 1.61803398875
+set key autotitle columnhead
+unset colorbox
+set nokey
+set logscale xy
 
-betaIsing3D = 0.326419
-nuIsing3D = 0.629971
-deltaIsing3D = 4.78984
-gammaIsing3D = 1.237075
+scaledylabel = '"$\\avg{s_{\\text{\\sc 1c}}}L^{-\\gamma/\\nu}$" offset 2,0'
 
-plot dataIsing3D using ($3/$2 * exp(log($1) * betaIsing3D * deltaIsing3D / nuIsing3D)):($4 * exp(-log($1) * gammaIsing3D / nuIsing3D)):($5 * exp(-log($1) * gammaIsing3D/nuIsing3D)):1 with yerrorbars pt 0 lw 2 palette, dataIsing3D using ($3/$2 * exp(log($1) * betaIsing3D * deltaIsing3D / nuIsing3D)):($4 * exp(-log($1) * gammaIsing3D / nuIsing3D)):1 with lines palette, 5 * exp(log(x) * 2 / deltaIsing3D) with lines lc black
+# plotting the first row
+set format x ""
+unset xlabel
+set ylabel @scaledylabel
 
+# ploting Ising 2D
+set xrange @isingRange
+#set yrange [0.8:10]
+
+plot dataIsing2D using (column("H")/column("T") * exp(log(column("L")) * betaIsing2D * deltaIsing2D / nuIsing2D)):(column("S") * exp(-log(column("L")) * (gammaIsing2D / nuIsing2D))):(column("dS") * exp(-log(column("L")) * (gammaIsing2D / nuIsing2D))):1 with yerrorbars pt 0 lw 2 palette,\
+  dataIsing2D using (column("H")/column("T") * exp(log(column("L")) * betaIsing2D * deltaIsing2D / nuIsing2D)):(column("S") * exp(-log(column("L")) * (gammaIsing2D / nuIsing2D))):1 with lines palette
 
-unset label
 unset ylabel
-set origin 0.35, 0
-set size 0.35, 0.55
 
-data4Potts2D = "data/cluster-size/cluster-size_4potts2d.dat"
+# plotting 3 Potts 2D
+set xrange @pottsRange
+set yrange [0.5:10]
 
-set xrange [0.000005:9000000]
-set yrange [0.6:4]
+plot data3Potts2D using (column("H")/column("T") * exp(log(column("L")) * beta3Potts2D * delta3Potts2D / nu3Potts2D)):(column("S") * exp(-log(column("L")) * (gamma3Potts2D / nu3Potts2D))):(column("dS") * exp(-log(column("L")) * (gamma3Potts2D / nu3Potts2D))):1 with yerrorbars pt 0 lw 2 palette,\
+  data3Potts2D using (column("H")/column("T") * exp(log(column("L")) * beta3Potts2D * delta3Potts2D / nu3Potts2D)):(column("S") * exp(-log(column("L")) * (gamma3Potts2D / nu3Potts2D))):1 with lines palette
 
-set label "2D 4-State Potts" at graph 0.1, 0.75
+# plotting 2 Vector 3D
+set xrange @vectorRange
+set yrange [0.4:250]
 
-beta4Potts2D = 1.0 / 12.0
-nu4Potts2D = 2.0 / 3.0
-delta4Potts2D = 15.0
-gamma4Potts2D = 7.0 / 6.0
+plot data2Vector3D using (column("H")/column("T") * exp(log(column("L")) * beta2Vector3D * delta2Vector3D / nu2Vector3D)):(column("S") * exp(-log(column("L")) * (gamma2Vector3D / nu2Vector3D))):(column("dS") * exp(-log(column("L")) * (gamma2Vector3D / nu2Vector3D))):1 with yerrorbars pt 0 lw 2 palette,\
+  data2Vector3D using (column("H")/column("T") * exp(log(column("L")) * beta2Vector3D * delta2Vector3D / nu2Vector3D)):(column("S") * exp(-log(column("L")) * (gamma2Vector3D / nu2Vector3D))):1 with lines palette
 
-plot data4Potts2D using ($3/$2 * exp(log($1) * beta4Potts2D * delta4Potts2D / nu4Potts2D)):($4 * exp(-log($1) * gamma4Potts2D / nu4Potts2D)):($5 * exp(-log($1) * gamma4Potts2D/nu4Potts2D)):1 with yerrorbars pt 0 lw 2 palette, data4Potts2D using ($3/$2 * exp(log($1) * beta4Potts2D * delta4Potts2D / nu4Potts2D)):($4 * exp(-log($1) * gamma4Potts2D / nu4Potts2D)):1 with lines palette, 1.2 * exp(log(x) * 2 / delta4Potts2D) with lines lc black
+# plotting the second row
+set format x '$10^{%T}$'
+set xlabel '$hL^{\beta\delta/\nu}$'
+set ylabel @scaledylabel
 
-unset label
-set size 0.38, 0.55
+# plotting Ising 3D
+set xrange @isingRange
+set yrange [0.5:500]
 
-data3Vector3D = "data/cluster-size/cluster-size_3vector3d.dat"
+plot dataIsing3D using (column("H")/column("T") * exp(log(column("L")) * betaIsing3D * deltaIsing3D / nuIsing3D)):(column("S") * exp(-log(column("L")) * (gammaIsing3D / nuIsing3D))):(column("dS") * exp(-log(column("L")) * (gammaIsing3D / nuIsing3D))):1 with yerrorbars pt 0 lw 2 palette,\
+  dataIsing3D using (column("H")/column("T") * exp(log(column("L")) * betaIsing3D * deltaIsing3D / nuIsing3D)):(column("S") * exp(-log(column("L")) * (gammaIsing3D / nuIsing3D))):1 with lines palette
 
-set xrange [0.000005:9000000]
-set yrange [0.6:200]
+unset ylabel
 
-set label "3D O(3)" at graph 0.1, 0.75
+# plotting 4 Potts 2D
+set xrange @pottsRange
+set yrange [0.8:4]
 
-beta3Vector3D = 0.3662
-nu3Vector3D = 0.7073
-delta3Vector3D = 4.79465
-gamma3Vector3D = 1.3895
+plot data4Potts2D using (column("H")/column("T") * exp(log(column("L")) * beta4Potts2D * delta4Potts2D / nu4Potts2D)):(column("S") * exp(-log(column("L")) * (gamma4Potts2D / nu4Potts2D))):(column("dS") * exp(-log(column("L")) * (gamma4Potts2D / nu4Potts2D))):1 with yerrorbars pt 0 lw 2 palette,\
+  data4Potts2D using (column("H")/column("T") * exp(log(column("L")) * beta4Potts2D * delta4Potts2D / nu4Potts2D)):(column("S") * exp(-log(column("L")) * (gamma4Potts2D / nu4Potts2D))):1 with lines palette
+
+# plotting 3 Vector 3D
+set xrange @vectorRange
+set yrange [0.1:100]
 
-plot data3Vector3D using ($3/$2 * exp(log($1) * beta3Vector3D * delta3Vector3D / nu3Vector3D)):($4 * exp(-log($1) * gamma3Vector3D / nu3Vector3D)):($5 * exp(-log($1) * gamma3Vector3D/nu3Vector3D)):1 with yerrorbars pt 0 lw 2 palette, data3Vector3D using ($3/$2 * exp(log($1) * beta3Vector3D * delta3Vector3D / nu3Vector3D)):($4 * exp(-log($1) * gamma3Vector3D / nu3Vector3D)):1 with lines palette, 2 * exp(log(x) * 2 / delta3Vector3D) with lines lc black
+plot data3Vector3D using (column("H")/column("T") * exp(log(column("L")) * beta3Vector3D * delta3Vector3D / nu3Vector3D)):(column("S") * exp(-log(column("L")) * (gamma3Vector3D / nu3Vector3D))):(column("dS") * exp(-log(column("L")) * (gamma3Vector3D / nu3Vector3D))):1 with yerrorbars pt 0 lw 2 palette,\
+  data3Vector3D using (column("H")/column("T") * exp(log(column("L")) * beta3Vector3D * delta3Vector3D / nu3Vector3D)):(column("S") * exp(-log(column("L")) * (gamma3Vector3D / nu3Vector3D))):1 with lines palette
 
-unset multiplot
diff --git a/figs/fig_correlation-times.gplot b/figs/fig_correlation-times.gplot
index 7dac658..db62a2d 100644
--- a/figs/fig_correlation-times.gplot
+++ b/figs/fig_correlation-times.gplot
@@ -73,7 +73,7 @@ unset colorbox
 set nokey
 set logscale xy
 
-scaledylabel = '"$\\avg{s_{\\text{\\sc 1c}}}L^{-\\gamma/\\nu}$" offset 2,0'
+scaledylabel = '"$\\tau\\avg{s_{\\text{\\sc 1c}}}L^{-z}$" offset 2,0'
 
 # plotting the first row
 set format x ""
diff --git a/figs/fig_harmonic-susceptibilities.gplot b/figs/fig_harmonic-susceptibilities.gplot
index 85d474f..6129723 100644
--- a/figs/fig_harmonic-susceptibilities.gplot
+++ b/figs/fig_harmonic-susceptibilities.gplot
@@ -1,5 +1,5 @@
 
-set terminal epslatex size 3.417, 5.3
+set terminal epslatex size 3.417, 4.8
 set output "fig_harmonic-susceptibilities.tex"
 
 data4 = "data/harmonic-susceptibilities/order-4.dat"
@@ -11,12 +11,12 @@ set cbrange[STATS_min:STATS_max]
 set logscale xycb
 set nokey
 
-set xrange [1:5000]
-set yrange [0.01:10000]
+set xrange [3:5000]
+set yrange [0.005:20000]
 
 unset colorbox
 
-set multiplot layout 2,1 margins 0.15, 0.99, 0.225, 0.99 spacing 0,0.015
+set multiplot layout 2,1 margins 0.15, 0.99, 0.1, 0.88 spacing 0,0
 set size ratio 1 / 1.61803398875
 
 unset xlabel
@@ -27,9 +27,9 @@ plot data4 using "L":"X":"dX":"H" with yerrorbars pt 0 lw 2 palette,\
      data4 using "L":"X":"H"      with lines palette
 
 set xlabel '$L$' 
-set colorbox horizontal user origin 0.15, 0.1 size 0.84, 0.03
-set cblabel '(Top) $h_4$ or (bottom) $h_6$'
-set cbtics format '$10^{%T}$'
+set colorbox horizontal user origin 0.15, 0.89 size 0.84, 0.03
+set cblabel '(Top) $h_4$ or (bottom) $h_6$' offset 0,6.5
+set cbtics format '$10^{%T}$' offset 0,2.8
 set format x
 
 plot data6 using "L":"X":"dX":"H" with yerrorbars pt 0 lw 2 palette,\