Merge branch 'feat-logger/3-replace-print-logger-tools' into feat-log…

…ger/4-replace-print-logger-config
brown-ccv · Mar 13, 2024 · 5830f6d · 5830f6d
2 parents 3fd8a3c + 9976046
commit 5830f6d
Show file tree

Hide file tree

Showing 12 changed files with 2,254 additions and 2,586 deletions.
diff --git a/src/icesat2waves/analysis_db/A02c_IOWAGA_thredds_prior.py b/src/icesat2waves/analysis_db/A02c_IOWAGA_thredds_prior.py
@@ -387,7 +387,7 @@ def draw_range(lon_range, lat_range, *args, **kwargs):
 
         font_for_print()
 
-        F = M.figure_axis_xy(4, 3.5, view_scale=0.9, container=True)
+        F = M.FigureAxisXY(4, 3.5, view_scale=0.9, container=True)
 
         file_name_base = "LOPS_WW3-GLOB-30M_"
         plt.suptitle(
@@ -562,7 +562,7 @@ def plot_prior(Prior, axx):
         # plot 2nd figure
 
         font_for_print()
-        F = M.figure_axis_xy(2, 4.5, view_scale=0.9, container=False)
+        F = M.FigureAxisXY(2, 4.5, view_scale=0.9, container=False)
 
         ax1 = F.ax
         lon, lat = G_beam.longitude, G_beam.latitude

diff --git a/src/icesat2waves/analysis_db/B01_SL_load_single_file.py b/src/icesat2waves/analysis_db/B01_SL_load_single_file.py
@@ -173,7 +173,7 @@ def run_B01_SL_load_single_file(
         cdict[s] = color_schemes.rels[b]
 
     font_for_pres()
-    F_atl06 = M.figure_axis_xy(6.5, 5, view_scale=0.6)
+    F_atl06 = M.FigureAxisXY(6.5, 5, view_scale=0.6)
     F_atl06.fig.suptitle(track_name)
 
     beam_stats.plot_ATL06_track_data(gdf, cdict)
@@ -223,7 +223,7 @@ def run_B01_SL_load_single_file(
 
     if plot_flag:
         font_for_pres()
-        F = M.figure_axis_xy(8, 4.3, view_scale=0.6)
+        F = M.FigureAxisXY(8, 4.3, view_scale=0.6)
         beam_stats.plot_beam_statistics(
             D,
             high_beams,

diff --git a/src/icesat2waves/analysis_db/B02_make_spectra_gFT.py b/src/icesat2waves/analysis_db/B02_make_spectra_gFT.py
@@ -274,7 +274,7 @@ def run_B02_make_spectra_gFT(
                 xi_1 = GG_x.x[i]
                 xi_2 = GG_x.x[i + 1]
 
-                F = M.figure_axis_xy(16, 2)
+                F = M.FigureAxisXY(16, 2)
                 eta = GG_x.eta
 
                 y_model = GG_x.y_model[:, i]

diff --git a/src/icesat2waves/analysis_db/B03_plot_spectra_ov.py b/src/icesat2waves/analysis_db/B03_plot_spectra_ov.py
@@ -132,7 +132,7 @@ def run_B03_plot_spectra_ov(
     color_schemes.colormaps2(21)
 
     col_dict = color_schemes.rels
-    F = M.figure_axis_xy(9, 3, view_scale=0.5)
+    F = M.FigureAxisXY(9, 3, view_scale=0.5)
 
     plt.subplot(1, 3, 1)
     plt.title(track_name, loc="left")
@@ -204,7 +204,7 @@ def run_B03_plot_spectra_ov(
 
     k_max_range = (k_max * 0.75, k_max, k_max * 1.25)
     font_for_print()
-    F = M.figure_axis_xy(6.5, 5.6, container=True, view_scale=1)
+    F = M.FigureAxisXY(6.5, 5.6, container=True, view_scale=1)
     Lmeters = Gk.L.data[0]
 
     plt.suptitle("gFT Slope Spectrograms\n" + track_name, y=0.98)
@@ -382,7 +382,7 @@ def run_B03_plot_spectra_ov(
     xpp = np.insert(xpp, 0, x_pos_max)
 
     for i in xpp:
-        F = M.figure_axis_xy(6, 8, container=True, view_scale=0.8)
+        F = M.FigureAxisXY(6, 8, container=True, view_scale=0.8)
 
         plt.suptitle(
             "gFT Model and Spectrograms | x="

diff --git a/src/icesat2waves/analysis_db/B04_angle.py b/src/icesat2waves/analysis_db/B04_angle.py
@@ -201,7 +201,7 @@ def run_B04_angle(
 
     font_for_pres()
 
-    F = M.figure_axis_xy(5, 4.5, view_scale=0.5)
+    F = M.FigureAxisXY(5, 4.5, view_scale=0.5)
     plt.subplot(2, 1, 1)
     plt.title("Prior angle smoothed\n" + track_name, loc="left")
 
@@ -418,7 +418,7 @@ def plot_instance(
     ):
         x_concat, y_concat, z_concat = fargs
 
-        F = M.figure_axis_xy(5, 6, view_scale=view_scale, container=True)
+        F = M.FigureAxisXY(5, 6, view_scale=view_scale, container=True)
         plt.suptitle(title_str)
         gs = GridSpec(4, 3, wspace=0.4, hspace=1.2)
         F.gs = gs
@@ -501,7 +501,7 @@ def plot_instance(
 
     # plot
     font_for_print()
-    F = M.figure_axis_xy(5.5, 3, view_scale=0.8)
+    F = M.FigureAxisXY(5.5, 3, view_scale=0.8)
     plt.suptitle(track_name)
     ax1 = plt.subplot(2, 1, 1)
     plt.title("Data in Beam", loc="left")
@@ -883,7 +883,7 @@ def get_instance(k_pair):
     else:
         # plotting with LL
         font_for_print()
-        F = M.figure_axis_xy(6, 5.5, view_scale=0.7, container=True)
+        F = M.FigureAxisXY(6, 5.5, view_scale=0.7, container=True)
 
         gs = GridSpec(4, 6, wspace=0.2, hspace=0.8)
 

diff --git a/src/icesat2waves/analysis_db/B05_define_angle.py b/src/icesat2waves/analysis_db/B05_define_angle.py
@@ -299,7 +299,7 @@ def define_angle(
     col_dict = color_schemes.rels
     x_list = corrected_marginals.x
     for xi, xval in enumerate(x_list):
-        F = M.figure_axis_xy(7, 3.5, view_scale=0.8, container=True)
+        F = M.FigureAxisXY(7, 3.5, view_scale=0.8, container=True)
         gs = GridSpec(3, 2, wspace=0.1, hspace=0.8)
         x_str = convert_to_kilo_string(xval)
 
@@ -432,7 +432,7 @@ def define_angle(
         exit()
 
     font_for_print()
-    F = M.figure_axis_xy(6, 5.5, view_scale=0.7, container=True)
+    F = M.FigureAxisXY(6, 5.5, view_scale=0.7, container=True)
     gs = GridSpec(8, 6, wspace=0.1, hspace=3.1)
     color_schemes.colormaps2(21)
 

diff --git a/src/icesat2waves/analysis_db/B06_correct_separate_var.py b/src/icesat2waves/analysis_db/B06_correct_separate_var.py
@@ -378,7 +378,7 @@ def run_B06_correct_separate_var(
 
     k = G_gFT_smth.k
 
-    F = M.figure_axis_xy()
+    F = M.FigureAxisXY()
 
     plt.loglog(k, G_gFT_smth / k)
 
@@ -410,7 +410,7 @@ def run_B06_correct_separate_var(
     font_for_print()
 
     fn = copy.copy(lstrings)
-    F = M.figure_axis_xy(
+    F = M.FigureAxisXY(
         fig_sizes["two_column"][0],
         fig_sizes["two_column"][0] * 0.9,
         container=True,
@@ -729,7 +729,7 @@ def reconstruct_displacement(Gx_1, Gk_1, T3, k_thresh):
         theta_flag = True
 
         font_for_print()
-        F = M.figure_axis_xy(3, 5, view_scale=0.7)
+        F = M.FigureAxisXY(3, 5, view_scale=0.7)
 
         plt.subplot(2, 1, 1)
         plt.pcolor(Ga_abs)