From b6421266d9916c369e0db29a065359125db3f6d6 Mon Sep 17 00:00:00 2001
From: Matthew Grasinger <grasingerm@gmail.com>
Date: Mon, 1 Feb 2021 15:39:26 -0500
Subject: [PATCH] small edits

---
 aggregate_mcmc.jl | 17 ++++++++++++-----
 mean_field.jl     |  2 +-
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/aggregate_mcmc.jl b/aggregate_mcmc.jl
index 4985887..90f0d94 100644
--- a/aggregate_mcmc.jl
+++ b/aggregate_mcmc.jl
@@ -3,8 +3,8 @@ using DelimitedFiles;
 using Quadmath;
 using DecFP;
 
-if length(ARGS) != 3
-  println("usage: julia aggregate.jl <outfile> <indir> <pattern>");
+if length(ARGS) != 4
+  println("usage: julia aggregate.jl <outfile> <indir> <pattern> <dielectric|polar>");
   exit(1);
 end
 
@@ -12,13 +12,20 @@ outfile = open(ARGS[1], "w");
 indir = ARGS[2];
 pattern = Glob.GlobMatch(ARGS[3]);
 
-writedlm(outfile, ["E0" "K1" "K2" "kT" "Fz" "Fx" "n" "b" "r1" "r2" "r3" "lambda1" "lambda2" "lambda3" "r1sq" "r2sq" "r3sq" "rsquared" "p1" "p2" "p3" "p1sq" "p2sq" "p3sq" "psquared" "U" "Usquared" "AR"], ',');
+if ARGS[4] == "dielectric"
+  writedlm(outfile, ["E0" "K1" "K2" "kT" "Fz" "Fx" "n" "b" "r1" "r2" "r3" "lambda1" "lambda2" "lambda3" "r1sq" "r2sq" "r3sq" "rsquared" "p1" "p2" "p3" "p1sq" "p2sq" "p3sq" "psquared" "U" "Usquared" "AR"], ',');
+elseif ARGS[4] == "polar"
+  writedlm(outfile, ["E0" "mu" "kT" "Fz" "Fx" "n" "b" "r1" "r2" "r3" "lambda1" "lambda2" "lambda3" "r1sq" "r2sq" "r3sq" "rsquared" "p1" "p2" "p3" "p1sq" "p2sq" "p3sq" "psquared" "U" "Usquared" "AR"], ',');
+else
+  println("I don't understand the last argument");
+  exit(1);
+end
 
 for infile in readdir(pattern, indir)
   writedlm(outfile, 
            hcat(
-                transpose(map(pair -> eval(Meta.parse(split(pair, "-")[2]))*1e-3,
-                          split(split(infile, ".")[1], "_"))),
+                transpose(map(pair -> eval(Meta.parse(split(pair, "-"; limit=2)[2]))*1e-3,
+                              split(split(basename(infile), ".")[1], "_"))),
                 map(line -> transpose(eval(Meta.parse(split(line, "=")[2]))),
                     readlines(infile))...
                ),
diff --git a/mean_field.jl b/mean_field.jl
index 94b45ac..caf7abb 100644
--- a/mean_field.jl
+++ b/mean_field.jl
@@ -4,7 +4,7 @@ using ArgParse;
 using Plots;
 
 s = ArgParseSettings();
-@add_arg_table s begin
+@add_arg_table! s begin
   "--E0", "-z"
     help = "magnitude of electric field"
     arg_type = Float64