From cca2488480bad504bbb99ddc3ae5524f3e47326b Mon Sep 17 00:00:00 2001
From: Eric Teunis de Boone <ericteunis@deboone.nl>
Date: Tue, 18 Oct 2022 07:31:51 +0200
Subject: [PATCH] Move beacon field figures into subdir

---
 figures/beacon/Makefile                       | 104 ++----------------
 figures/beacon/field/Makefile                 | 103 +++++++++++++++++
 .../beacon/{ => field}/src/beacon_field.py    |   3 +
 .../2022-10-06_CRHEP.tex                      |  28 ++---
 4 files changed, 129 insertions(+), 109 deletions(-)
 create mode 100644 figures/beacon/field/Makefile
 rename figures/beacon/{ => field}/src/beacon_field.py (99%)

diff --git a/figures/beacon/Makefile b/figures/beacon/Makefile
index 82af667..fa78ad9 100644
--- a/figures/beacon/Makefile
+++ b/figures/beacon/Makefile
@@ -1,29 +1,21 @@
-.PHONY: all dist dist-clean
+SUBDIRS := $(subst Makefile,,$(wildcard */Makefile))
+
+.PHONY: all dist dist-clean $(SUBDIRS)
+
+all: dist $(SUBDIRS)
 
-all: dist
 dist: \
 	single_beacon \
-	field_single \
-	field_three \
-	field_square \
+	field \
 	antenna_setup \
 	#
 
+$(SUBDIRS):
+	@$(MAKE) -C $@
+
 dist-clean:
 	rm -v sine_beacon.*
 	rm -v ttl_beacon.*
-	rm -v field_single_left_time.*
-	rm -v field_single_left_phase.*
-	rm -v field_single_center_time.*
-	rm -v field_single_center_phase.*
-	rm -v field_three_left_time.*
-	rm -v field_three_left_phase.*
-	rm -v field_three_center_time.*
-	rm -v field_three_center_phase.*
-	rm -v field_square_all_time.*
-	rm -v field_square_all_phase.*
-	rm -v field_square_ref0_time.*
-	rm -v field_square_ref0_phase.*
 
 beacon_spatial_time_difference_setup.pdf: src/beacon_spatial_time_difference_setup.py
 	$< $@
@@ -39,84 +31,6 @@ ttl_beacon.%: src/single_beacon.py
 	$< --periods 2 --no-grid --with-rates ttl $@
 
 
-field_single: \
-	field_single_left_time.pdf    field_single_left_time.png \
-	field_single_left_phase.pdf   field_single_left_phase.png \
-	field_single_left_time_nomax.pdf    field_single_left_time_nomax.png \
-	field_single_center_time.pdf  field_single_center_time.png \
-	field_single_center_phase.pdf field_single_center_phase.png \
-	field_single_center_time_nomax.pdf  field_single_center_time_nomax.png \
-	#
-
-field_single_left_time.%: src/beacon_field.py
-	$< --time $@ single-left
-field_single_left_phase.%: src/beacon_field.py
-	$< --phase $@ single-left
-field_single_left_time_nomax.%: src/beacon_field.py
-	$< --time $@ single-left --max-rms 0
-
-field_single_center_time.%: src/beacon_field.py
-	$< --time $@ single-center
-field_single_center_phase.%: src/beacon_field.py
-	$< --phase $@ single-center
-field_single_center_time_nomax.%: src/beacon_field.py
-	$< --time $@ single-center --max-rms 0
-
-field_three: \
-	field_three_left_time.pdf    field_three_left_time.png \
-	field_three_left_phase.pdf   field_three_left_phase.png \
-	field_three_center_time.pdf  field_three_center_time.png \
-	field_three_center_phase.pdf field_three_center_phase.png \
-	field_three_left_time_nomax.pdf    field_three_left_time_nomax.png \
-	field_three_center_time_nomax.pdf  field_three_center_time_nomax.png \
-	#
-
-field_three_left_time.%: src/beacon_field.py
-	$< --time $@ three-left
-field_three_left_phase.%: src/beacon_field.py
-	$< --phase $@ three-left
-field_three_left_time_nomax.%: src/beacon_field.py
-	$< --time $@ three-left --max-rms 0
-
-field_three_center_time.%: src/beacon_field.py
-	$< --time $@ three-center
-field_three_center_time_nomax.%: src/beacon_field.py
-	$< --time $@ three-center --max-rms 0
-field_three_center_phase.%: src/beacon_field.py
-	$< --phase $@ three-center
-field_three_center_time_nomax.%: src/beacon_field.py
-	$< --time $@ three-center --no-max
-
-
-field_square: \
-	field_square_all_time.pdf	field_square_all_time.png \
-	field_square_all_phase.pdf	field_square_all_phase.png \
-	field_square_ref0_time.pdf	field_square_ref0_time.png \
-	field_square_ref0_phase.pdf	field_square_ref0_phase.png \
-	field_square_all_time_zoomtx.pdf	field_square_all_time_zoomtx.png \
-	field_square_all_phase_zoomtx.pdf	field_square_all_phase_zoomtx.png \
-	field_square_ref0_time_zoomtx.pdf	field_square_ref0_time_zoomtx.png \
-	field_square_ref0_phase_zoomtx.pdf	field_square_ref0_phase_zoomtx.png \
-	#
-
-field_square_ref0_time.%: src/beacon_field.py
-	$< --time $@ square --ref 0
-field_square_ref0_phase.%: src/beacon_field.py
-	$< --phase $@ square --ref 0
-field_square_all_time.%: src/beacon_field.py
-	$< --time $@ square
-field_square_all_phase.%: src/beacon_field.py
-	$< --phase $@ square
-
-field_square_ref0_time_zoomtx.%: src/beacon_field.py
-	$< --time $@ square --ref 0 --zoom tx
-field_square_ref0_phase_zoomtx.%: src/beacon_field.py
-	$< --phase $@ square --ref 0 --zoom tx
-field_square_all_time_zoomtx.%: src/beacon_field.py
-	$< --time $@ square --zoom tx
-field_square_all_phase_zoomtx.%: src/beacon_field.py
-	$< --phase $@ square --zoom tx
-
 antenna_setup: \
 	antenna_setup_four.pdf  antenna_setup_four.png \
 	antenna_setup_three.pdf antenna_setup_three.png \
diff --git a/figures/beacon/field/Makefile b/figures/beacon/field/Makefile
new file mode 100644
index 0000000..7217e09
--- /dev/null
+++ b/figures/beacon/field/Makefile
@@ -0,0 +1,103 @@
+.PHONY: all dist distclean
+
+all: dist
+
+dist: \
+	field_single \
+	field_three \
+	field_square \
+	#
+
+
+distclean:
+	rm -v field_single_left_time.*
+	rm -v field_single_left_phase.*
+	rm -v field_single_center_time.*
+	rm -v field_single_center_phase.*
+	rm -v field_three_left_time.*
+	rm -v field_three_left_phase.*
+	rm -v field_three_center_time.*
+	rm -v field_three_center_phase.*
+	rm -v field_square_all_time.*
+	rm -v field_square_all_phase.*
+	rm -v field_square_ref0_time.*
+	rm -v field_square_ref0_phase.*
+
+field_single: \
+	field_single_left_time.pdf    field_single_left_time.png \
+	field_single_left_phase.pdf   field_single_left_phase.png \
+	field_single_left_time_nomax.pdf    field_single_left_time_nomax.png \
+	field_single_center_time.pdf  field_single_center_time.png \
+	field_single_center_phase.pdf field_single_center_phase.png \
+	field_single_center_time_nomax.pdf  field_single_center_time_nomax.png \
+	#
+
+field_single_left_time.%: src/beacon_field.py
+	$< --time $@ single-left
+field_single_left_phase.%: src/beacon_field.py
+	$< --phase $@ single-left
+field_single_left_time_nomax.%: src/beacon_field.py
+	$< --time $@ single-left --max-rms 0
+
+field_single_center_time.%: src/beacon_field.py
+	$< --time $@ single-center
+field_single_center_phase.%: src/beacon_field.py
+	$< --phase $@ single-center
+field_single_center_time_nomax.%: src/beacon_field.py
+	$< --time $@ single-center --max-rms 0
+
+field_three: \
+	field_three_left_time.pdf    field_three_left_time.png \
+	field_three_left_phase.pdf   field_three_left_phase.png \
+	field_three_center_time.pdf  field_three_center_time.png \
+	field_three_center_phase.pdf field_three_center_phase.png \
+	field_three_left_time_nomax.pdf    field_three_left_time_nomax.png \
+	field_three_center_time_nomax.pdf  field_three_center_time_nomax.png \
+	#
+
+field_three_left_time.%: src/beacon_field.py
+	$< --time $@ three-left
+field_three_left_phase.%: src/beacon_field.py
+	$< --phase $@ three-left
+field_three_left_time_nomax.%: src/beacon_field.py
+	$< --time $@ three-left --max-rms 0
+
+field_three_center_time.%: src/beacon_field.py
+	$< --time $@ three-center
+field_three_center_time_nomax.%: src/beacon_field.py
+	$< --time $@ three-center --max-rms 0
+field_three_center_phase.%: src/beacon_field.py
+	$< --phase $@ three-center
+field_three_center_time_nomax.%: src/beacon_field.py
+	$< --time $@ three-center --no-max
+
+
+field_square: \
+	field_square_all_time.pdf	field_square_all_time.png \
+	field_square_all_phase.pdf	field_square_all_phase.png \
+	field_square_ref0_time.pdf	field_square_ref0_time.png \
+	field_square_ref0_phase.pdf	field_square_ref0_phase.png \
+	field_square_all_time_zoomtx.pdf	field_square_all_time_zoomtx.png \
+	field_square_all_phase_zoomtx.pdf	field_square_all_phase_zoomtx.png \
+	field_square_ref0_time_zoomtx.pdf	field_square_ref0_time_zoomtx.png \
+	field_square_ref0_phase_zoomtx.pdf	field_square_ref0_phase_zoomtx.png \
+	#
+
+field_square_ref0_time.%: src/beacon_field.py
+	$< --time $@ square --ref 0
+field_square_ref0_phase.%: src/beacon_field.py
+	$< --phase $@ square --ref 0
+field_square_all_time.%: src/beacon_field.py
+	$< --time $@ square
+field_square_all_phase.%: src/beacon_field.py
+	$< --phase $@ square
+
+field_square_ref0_time_zoomtx.%: src/beacon_field.py
+	$< --time $@ square --ref 0 --zoom tx
+field_square_ref0_phase_zoomtx.%: src/beacon_field.py
+	$< --phase $@ square --ref 0 --zoom tx
+field_square_all_time_zoomtx.%: src/beacon_field.py
+	$< --time $@ square --zoom tx
+field_square_all_phase_zoomtx.%: src/beacon_field.py
+	$< --phase $@ square --zoom tx
+
diff --git a/figures/beacon/src/beacon_field.py b/figures/beacon/field/src/beacon_field.py
similarity index 99%
rename from figures/beacon/src/beacon_field.py
rename to figures/beacon/field/src/beacon_field.py
index 9b9c46f..6d33656 100755
--- a/figures/beacon/src/beacon_field.py
+++ b/figures/beacon/field/src/beacon_field.py
@@ -255,6 +255,9 @@ if __name__ == "__main__":
 
     args = parser.parse_args()
 
+    if args.fname == 'none':
+        args.fname = None
+
     if args.fname is not None:
         if path.isdir(args.fname):
             args.fname = path.join(args.fname, path.splitext(path.basename(__file__))[0]) # leave off extension
diff --git a/presentations/2022-10-06_group_meeting/2022-10-06_CRHEP.tex b/presentations/2022-10-06_group_meeting/2022-10-06_CRHEP.tex
index 39906f7..406043c 100644
--- a/presentations/2022-10-06_group_meeting/2022-10-06_CRHEP.tex
+++ b/presentations/2022-10-06_group_meeting/2022-10-06_CRHEP.tex
@@ -125,50 +125,50 @@
 \subsection{Pulse}
 \begin{frame}{Beacon: Pulse (single baseline)}
 	\begin{figure}
-		\includegraphics<1>[width=\textwidth]{beacon/field_single_center_time.pdf}
-		\includegraphics<2>[width=\textwidth]{beacon/field_single_left_time.pdf}
+		\includegraphics<1>[width=\textwidth]{beacon/field/field_single_center_time.pdf}
+		\includegraphics<2>[width=\textwidth]{beacon/field/field_single_left_time.pdf}
 	\end{figure}
 \end{frame}
 \begin{frame}{Beacon: Pulse (3 baselines)}
 	\begin{figure}
-		\includegraphics<1>[width=\textwidth]{beacon/field_three_center_time.pdf}
-		\includegraphics<2>[width=\textwidth]{beacon/field_three_left_time.pdf}
+		\includegraphics<1>[width=\textwidth]{beacon/field/field_three_center_time.pdf}
+		\includegraphics<2>[width=\textwidth]{beacon/field/field_three_left_time.pdf}
 	\end{figure}
 \end{frame}
 
 \begin{frame}{Beacon: Pulse (multi baseline)}
 	\begin{figure}
-		\includegraphics<1>[width=\textwidth]{beacon/field_square_ref0_time.pdf}
-		\includegraphics<2>[width=\textwidth]{beacon/field_square_all_time.pdf}
+		\includegraphics<1>[width=\textwidth]{beacon/field/field_square_ref0_time.pdf}
+		\includegraphics<2>[width=\textwidth]{beacon/field/field_square_all_time.pdf}
 	\end{figure}
 \end{frame}
 
 \subsection{Sine}
 \begin{frame}{Beacon: Sine (single baseline)}
 	\begin{figure}
-		\includegraphics<1>[width=\textwidth]{beacon/field_single_center_phase.pdf}
-		\includegraphics<2>[width=\textwidth]{beacon/field_single_left_phase.pdf}
+		\includegraphics<1>[width=\textwidth]{beacon/field/field_single_center_phase.pdf}
+		\includegraphics<2>[width=\textwidth]{beacon/field/field_single_left_phase.pdf}
 	\end{figure}
 \end{frame}
 \begin{frame}{Beacon: Sine (3 baseline)}
 	\begin{figure}
-		\includegraphics<1>[width=\textwidth]{beacon/field_three_center_phase.pdf}
-		\includegraphics<2>[width=\textwidth]{beacon/field_three_left_phase.pdf}
+		\includegraphics<1>[width=\textwidth]{beacon/field/field_three_center_phase.pdf}
+		\includegraphics<2>[width=\textwidth]{beacon/field/field_three_left_phase.pdf}
 	\end{figure}
 \end{frame}
 
 \begin{frame}{Beacon: Sine (multi baseline reference antenna)}
 	\begin{figure}
-		\includegraphics<1>[width=\textwidth]{beacon/field_square_ref0_phase.pdf}
-		\includegraphics<2>[width=\textwidth]{beacon/field_square_ref0_phase_zoomtx.pdf}
+		\includegraphics<1>[width=\textwidth]{beacon/field/field_square_ref0_phase.pdf}
+		\includegraphics<2>[width=\textwidth]{beacon/field/field_square_ref0_phase_zoomtx.pdf}
 	\end{figure}
 \end{frame}
 
 
 \begin{frame}{Beacon: Sine (all baselines)}
 	\begin{figure}
-		\includegraphics<1>[width=\textwidth]{beacon/field_square_all_phase.pdf}
-		\includegraphics<2>[width=\textwidth]{beacon/field_square_all_phase_zoomtx.pdf}
+		\includegraphics<1>[width=\textwidth]{beacon/field/field_square_all_phase.pdf}
+		\includegraphics<2>[width=\textwidth]{beacon/field/field_square_all_phase_zoomtx.pdf}
 	\end{figure}
 \end{frame}