Merge branch 'nansmoother' of github.com:tjgalvin/flint into nansmoother

tjgalvin · Jan 11, 2024 · 4c20f2e · 4c20f2e
2 parents 1c611b5 + 18d9388
commit 4c20f2e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/flint/calibrate/aocalibrate.py b/flint/calibrate/aocalibrate.py
@@ -668,7 +668,7 @@ def flag_aosolutions(
     flag_ant_xyyx_mean_gain: bool = False,
     zero_cross_terms: bool = False,
     smooth_solutions: bool = False,
-    plot_solutions: bool = True,
+    plot_solutions_throughout: bool = True,
 ) -> Path:
     """Will open a previously solved ao-calibrate solutions file and flag additional channels and antennae.
 
@@ -687,7 +687,7 @@ def flag_aosolutions(
         flag_ant_xyyx_mean_gain (bool, optional): Whether to flag antennas based on the mean gain ratio of the XY and YX amplitude gains. Defaults to False.
         zero_cross_terms (bool, optional): Set the XY and YX terms of each Jones to be 0. Defaults to False.
         smooth_solutions (blool, optional): Smooth the complex gain solutions after flaggined. Defaults to False.
-        plot_solutions (bool, Optional): If True, the solutions will be plotted at different stages of processing. Defaults to True.
+        plot_solutions_throughout (bool, Optional): If True, the solutions will be plotted at different stages of processing. Defaults to True.
 
     Returns:
         Path: Path to the updated solutions file. This is out_solutions_path if provided, otherwise solutions_path
@@ -814,7 +814,7 @@ def flag_aosolutions(
         ms_path=solutions_path, include_preflagger=True, include_smoother=False
     )
     solutions.save(output_path=out_solutions_path)
-    if plot_solutions:
+    if plot_solutions_throughout:
         plot_solutions(solutions=out_solutions_path, ref_ant=ref_ant)
 
     if smooth_solutions:
@@ -829,7 +829,7 @@ def flag_aosolutions(
             ms_path=solutions_path, include_preflagger=True, include_smoother=True
         )
         solutions.save(output_path=out_solutions_path)
-        if plot_solutions:
+        if plot_solutions_throughout:
             plot_solutions(solutions=out_solutions_path, ref_ant=None)
 
     total_flagged = np.sum(~np.isfinite(bandpass)) / np.prod(bandpass.shape)

diff --git a/tests/test_aocalibrate.py b/tests/test_aocalibrate.py
@@ -54,7 +54,7 @@ def ao_sols_known_bad(tmpdir):
 
 
 def test_known_bad_sols(ao_sols_known_bad):
-    flag_aosolutions(solutions_path=ao_sols_known_bad, plot_solutions=False)
+    flag_aosolutions(solutions_path=ao_sols_known_bad, plot_solutions_throughout=False)
 
 
 def test_load_aosols(ao_sols):