From 6c78fa600512eba4363530791f1aaaa7b7c75549 Mon Sep 17 00:00:00 2001
From: Luke <git@luke.fastmail.us>
Date: Mon, 23 Jul 2018 19:48:35 -0700
Subject: [PATCH] Renaming tweak for LaTeX

---
 .gitignore  |  2 +-
 runAll.sh   | 11 +++++++++++
 tankPlot.py | 12 ++++++------
 3 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index 1fca641..9cc9b92 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
 # Figures directory
-figures/
+figures*
 
 # Byte-compiled / optimized / DLL files
 __pycache__/
diff --git a/runAll.sh b/runAll.sh
index ab5aaee..f0f9f1a 100644
--- a/runAll.sh
+++ b/runAll.sh
@@ -20,7 +20,18 @@ for n in 1 2 3 4 11 12 13 14; do
 		./tankPlot.py -n $n --subplot -rq 1>/dev/null
 		echo "    止 end $n"
 	) &
+	while [[ $MAX_JOBS -le $(jobs -l | wc -l) ]]; do sleep 0.1; done
+	(
+		echo "  start $n →"
+		./tankPlot.py -n $n -sq 1>/dev/null
+		./tankPlot.py -n $n -rq 1>/dev/null
+		echo "    止 end $n"
+	) &
 done
 
+
 while [[ $(jobs -lr | wc -l) -gt 0 ]]; do sleep 0.1; done
+mkdir -p figures-png
+rm figures-png/*.png &>/dev/null
+mv figures/*.png figures-png/
 echo "DONE!"
diff --git a/tankPlot.py b/tankPlot.py
index b5214a2..3ab8f8e 100755
--- a/tankPlot.py
+++ b/tankPlot.py
@@ -369,16 +369,16 @@ if 3 in plot_list or 13 in plot_list:
 	if args.save:
 		if 13 in plot_list:
 			if not args.subplot:
-				h3[0].savefig('%s/%s.%s' % (figdir, 'NA-13.0', fig_ext))
-				h3[1].savefig('%s/%s.%s' % (figdir, 'NA-13.1', fig_ext))
+				h3[0].savefig('%s/%s.%s' % (figdir, '030-RMSGain-wgv', fig_ext))
+				h3[1].savefig('%s/%s.%s' % (figdir, '031-RMSPhase-wgv', fig_ext))
 			else:
-				h3[0].savefig('%s/%s.%s' % (figdir, 'NA-13.0', fig_ext))
+				h3[0].savefig('%s/%s.%s' % (figdir, '03d-RMSBoth-wgv', fig_ext))
 		else:
 			if not args.subplot:
-				h3[0].savefig('%s/%s.%s' % (figdir, 'NA-03.0', fig_ext))
-				h3[1].savefig('%s/%s.%s' % (figdir, 'NA-03.1', fig_ext))
+				h3[0].savefig('%s/%s.%s' % (figdir, '030-RMSGain', fig_ext))
+				h3[1].savefig('%s/%s.%s' % (figdir, '031-RMSPhase', fig_ext))
 			else:
-				h3[0].savefig('%s/%s.%s' % (figdir, 'NA-03.d', fig_ext))
+				h3[0].savefig('%s/%s.%s' % (figdir, '03d-RMSBoth', fig_ext))
 	if HEADLESS:
 		pp.close()
 	else: