added new plot, made many changes

1 files changed, 4 insertions, 37 deletions

diff --git a/figs/fig-susmag.gplot b/figs/fig-susmag.gplot
index a639f4d..80679b6 100644
--- a/figs/fig-susmag.gplot
+++ b/figs/fig-susmag.gplot
@@ -31,44 +31,11 @@ B = Tc**2 * M0 / (16 * pi)
 C0 = 0.0255369719
 A = pi / 2 * C0 / (B**2)
 
-#c0 = -0.012384
-#lamb = 1.76962
-#A2 = pi / 2 * (C0 / Tc - c0) / B**2
-
-#c0 = 0
-#lamb = 1
-#B2 = 0.521944
-#A2 = pi / 2 * C0 / (B2**2 * Tc)
-
 n = 1
 c(i) = i == 1 ? 0.00856277   : 0
 lamb = 10.487
-B2 = B
 A2 = 1.70034
-
-#n2 = 2
-#c2(i) = i == 1 ? -0.177238   : \
-#        i == 2 ? -0.0545988  : 0
-#lamb2 = 3.14865
-#B3 = B
-#A3 = 18.8816
-
-#n = 3
-#c(i) = i == 1 ? 0.00280714  : \
-#       i == 2 ? -0.00243938 : \
-#       i == 3 ? -0.0140978  : 0
-#lamb = 12.1954
-#B2 = B
-#A2 = 0.846118
-
-#n2 = 4
-#c2(i) = i == 1 ? 0.00245324  : \
-#       i == 2 ? -0.00468448 : \
-#       i == 3 ? 0.0092602   : \
-#       i == 4 ? -0.536727   : 0
-#lamb2 = 12.6068
-#B3 = B
-#A3 = 0.88157
+B2 = B
 
 n2 = 5
 c2(i) = i == 1 ? 0.00639522  : \
@@ -77,8 +44,8 @@ c2(i) = i == 1 ? 0.00639522  : \
         i == 4 ? 4.39278     : \
         i == 5 ? -56.1389    : 0
 lamb2 = 13.2489
-B3 = B
 A3 = 1.91747
+B3 = B
 
 susfunc = "figs/fig-sus_scaling-func.dat"
 magfunc = "figs/fig-mag_scaling-func.dat"
@@ -99,7 +66,7 @@ set mxtics 5
 set mytics 5
 set bmargin 0.2
 
-plot num using (X($2, $3)):(10**3 * Tc * $10 * t($2)**gamma):(10**3 * Tc * $11 * t($2)**gamma):(hsv2rgb(20 * t($2), 1, 1)) with yerrorbars pt 0 lc rgb variable, susfunc using (10**$1 / B):(10**(3+$2) * A * B**2) with linespoints pt 0 lw 2 lc rgb "black", susfunc using (10**$1 / B2):(10**(3+$2) * A2 * B2**2 + 10**3 * (sum[i=1:n] poly(c(i), lamb, i-1, 10**$1))) with lines dt 2 lw 2 lc black, susfunc using (10**$1 / B2):(10**(3+$2) * A3 * B3**2 + 10**3 * (sum[i=1:n2] poly(c2(i), lamb2, i-1, 10**$1))) with lines dt 3 lw 2 lc black, susfunc using (10**$1 / B2):(-10**3 * (sum[i=1:7] GC(i + 1) * i * (i + 1) * (10**$1 / B2)**(i-1))) with lines dt 5 lw 2 lc black
+plot num using (X($2, $3)):(10**3 * Tc * $10 * t($2)**gamma):(10**3 * Tc * $11 * t($2)**gamma):(hsv2rgb(20 * t($2), 1, 1)) with yerrorbars pt 0 lc rgb variable, susfunc using (10**$1 / B):(10**(3+$2) * A * B**2) with linespoints pt 0 lw 2 lc rgb "black", susfunc using (10**$1 / B2):(10**(3+$2) * A2 * B2**2 + 10**3 * (sum[i=1:n] poly(c(i), lamb, i-1, 10**$1))) with lines dt 2 lw 2 lc black, susfunc using (10**$1 / B3):(10**(3+$2) * A3 * B3**2 + 10**3 * (sum[i=1:n2] poly(c2(i), lamb2, i-1, 10**$1))) with lines dt 3 lw 2 lc black, susfunc using (10**$1 / B3):(-10**3 * (sum[i=1:7] GC(i + 1) * i * (i + 1) * (10**$1 / B3)**(i-1))) with lines dt 5 lw 2 lc black
 
 set bmargin -1
 set tmargin 0.2
@@ -138,5 +105,5 @@ set ylabel offset 4,0 '\footnotesize$M|t|^{-\beta}$'
 set ytics format '\footnotesize {%g}' 1.2,0.2,1.8
 set mytics 5
 
-plot num using (X($2, $3)):($6 * t($2)**(-beta)):($7 * t($2)**(-beta)):(hsv2rgb(20 * t($2), 1, 1)) with yerrorbars pt 0 lc rgb variable, magfunc using (10**$1 / B):(M0 + A * B * 10**$2) with linespoints pt 0 lw 2 lc black, magfunc using (10**$1 / B2):(M0 + 10**($2) * A2 * B2 + (sum[i=1:n] polyint(c(i), lamb, i-1, 10**$1)) / B2) with lines dt 2 lw 2 lc black, magfunc using (10**$1 / B3):(M0 + 10**($2) * A3 * B3 + (sum[i=1:n2] polyint(c2(i), lamb2, i-1, 10**$1)) / B2) with lines dt 3 lw 2 lc black, magfunc using (10**$1 / B):(-sum[i=1:8] GC(i) * i * (10 **$1 / B)**(i-1)) with lines dt 5 lw 2 lc black
+plot num using (X($2, $3)):($6 * t($2)**(-beta)):($7 * t($2)**(-beta)):(hsv2rgb(20 * t($2), 1, 1)) with yerrorbars pt 0 lc rgb variable, magfunc using (10**$1 / B):(M0 + A * B * 10**$2) with linespoints pt 0 lw 2 lc black, magfunc using (10**$1 / B2):(M0 + 10**($2) * A2 * B2 + (sum[i=1:n] polyint(c(i), lamb, i-1, 10**$1)) / B2) with lines dt 2 lw 2 lc black, magfunc using (10**$1 / B3):(M0 + 10**($2) * A3 * B3 + (sum[i=1:n2] polyint(c2(i), lamb2, i-1, 10**$1)) / B3) with lines dt 3 lw 2 lc black, magfunc using (10**$1 / B):(-sum[i=1:8] GC(i) * i * (10 **$1 / B)**(i-1)) with lines dt 5 lw 2 lc black