plotastrodata 1.8.2__tar.gz → 1.8.3__tar.gz

{plotastrodata-1.8.2/plotastrodata.egg-info → plotastrodata-1.8.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: plotastrodata
-Version: 1.8.2
+Version: 1.8.3
 Summary: plotastrodata is a tool for astronomers to create figures from FITS files and perform fundamental data analyses with ease.
 Home-page: https://github.com/yusukeaso-astron/plotastrodata
 Download-URL: https://github.com/yusukeaso-astron/plotastrodata

{plotastrodata-1.8.2 → plotastrodata-1.8.3}/plotastrodata/__init__.py

@@ -1,4 +1,4 @@
 import warnings
 
 warnings.simplefilter('ignore', FutureWarning)
-__version__ = '1.8.2'
+__version__ = '1.8.3'

{plotastrodata-1.8.2 → plotastrodata-1.8.3}/plotastrodata/noise_utils.py

@@ -4,6 +4,7 @@ import matplotlib.pyplot as plt
 from scipy.special import erf
 
 from plotastrodata.fitting_utils import EmceeCorner
+from plotastrodata.other_utils import close_figure
 
 
 def normalize(range: tuple = (-3.5, 3.5), bins: int = 100):
@@ -166,21 +167,13 @@ class Noise:
             savefig (dict or str, optional): For plt.figure().savefig(). Defaults to None.
             show (bool, optional): True means doing plt.show(). Defaults to False.
         """
-        savefig0 = {'bbox_inches': 'tight', 'transparent': True}
         fig = plt.figure()
         ax = fig.add_subplot(1, 1, 1)
         ax.plot(self.hbin, self.hist, drawstyle='steps-mid')
         ax.plot(self.hbin, self.model, '-')
         ax.set_xlabel('(noise - m0) / s0')
         ax.set_ylabel('Probability density')
-        fig.tight_layout()
-        if savefig is not None:
-            s = {'fname': savefig} if type(savefig) is str else savefig
-            savefig0.update(s)
-            fig.savefig(**savefig0)
-        if show:
-            plt.show()
-        plt.close()
+        close_figure(fig, savefig, show)
 
 
 def estimate_rms(data: np.ndarray,

{plotastrodata-1.8.2 → plotastrodata-1.8.3}/plotastrodata/other_utils.py

@@ -1,4 +1,5 @@
 import numpy as np
+import matplotlib.pyplot as plt
 from scipy.interpolate import RegularGridInterpolator as RGI
 
 from plotastrodata.matrix_utils import Mrot, dot2d
@@ -206,3 +207,24 @@ def gaussian2d(xy: np.ndarray,
     s, t = dot2d(Mrot(-pa), [xy[1] - yo, xy[0] - xo])
     g = amplitude * np.exp2(-4 * ((s / fwhm_major)**2 + (t / fwhm_minor)**2))
     return g
+
+
+def close_figure(fig: object,
+                 savefig: dict | str | None = None,
+                 show: bool = False) -> None:
+    """Save, show, and close the figure.
+
+    Args:
+        fig (object): External plt.figure(). Defaults to None.
+        savefig (dict or str, optional): For plt.figure().savefig(). Defaults to None.
+        show (bool, optional): True means doing plt.show(). Defaults to False.
+    """
+    savefig0 = {'bbox_inches': 'tight', 'transparent': True}
+    fig.tight_layout()
+    if savefig is not None:
+        s = {'fname': savefig} if type(savefig) is str else savefig
+        savefig0.update(s)
+        fig.savefig(**savefig0)
+    if show:
+        plt.show()
+    plt.close()

{plotastrodata-1.8.2 → plotastrodata-1.8.3}/plotastrodata/plot_utils.py

@@ -7,7 +7,7 @@ from dataclasses import dataclass
 
 from plotastrodata.coord_utils import coord2xy, xy2coord
 from plotastrodata.noise_utils import estimate_rms
-from plotastrodata.other_utils import listing
+from plotastrodata.other_utils import listing, close_figure
 from plotastrodata.analysis_utils import AstroData, AstroFrame
 
 
@@ -1163,30 +1163,6 @@ class PlotAstroData(AstroFrame):
         return fig, self.ax[0]
 
 
-def close_figure(fig: object,
-                 savefig: dict | str | None = None,
-                 show: bool = False) -> tuple[object, object]:
-    """Save, show, and close the figure.
-
-    Args:
-        fig (optional): External plt.figure(). Defaults to None.
-        savefig (dict or str, optional): For plt.figure().savefig(). Defaults to None.
-        show (bool, optional): True means doing plt.show(). Defaults to False.
-
-    Returns:
-        tuple: (fig, ax), where ax is a list, if getfigax=True. Otherwise, no return.
-    """
-    savefig0 = {'bbox_inches': 'tight', 'transparent': True}
-    fig.tight_layout()
-    if savefig is not None:
-        s = {'fname': savefig} if type(savefig) is str else savefig
-        savefig0.update(s)
-        fig.savefig(**savefig0)
-    if show:
-        plt.show()
-    plt.close()
-
-
 def plotprofile(coords: list[str] | str = [],
                 xlist: list[float] = [], ylist: list[float] = [],
                 ellipse: list[float, float, float] | None = None,
@@ -1218,8 +1194,8 @@ def plotprofile(coords: list[str] | str = [],
         text (list, optional): For each plot. Defaults to None.
         nrows (int, optional): Used for channel maps. Defaults to 0.
         ncols (int, optional): Used for channel maps. Defaults to 1.
-        fig (optional): External plt.figure(). Defaults to None.
-        ax (optional): External fig.add_subplot(). Defaults to None.
+        fig (object, optional): External plt.figure(). Defaults to None.
+        ax (object, optional): External fig.add_subplot(). Defaults to None.
         getfigax (bool, optional): Defaults to False.
         savefig (dict or str, optional): For plt.figure().savefig(). Defaults to None.
         show (bool, optional): True means doing plt.show(). Defaults to False.
@@ -1306,8 +1282,8 @@ def plotslice(length: float, dx: float | None = None, pa: float = 0,
         dx (float, optional): Grid increment. Defaults to None.
         pa (float, optional): Degree. Position angle. Defaults to 0.
         txtfile (str, optional): File name for numpy.savetxt(). Defaults to None.
-        fig (optional): External plt.figure(). Defaults to None.
-        ax (optional): External fig.add_subplot(). Defaults to None.
+        fig (object, optional): External plt.figure(). Defaults to None.
+        ax (object, optional): External fig.add_subplot(). Defaults to None.
         getfigax (bool, optional): Defaults to False.
         savefig (dict or str, optional): For plt.figure().savefig(). Defaults to None.
         show (bool, optional): True means doing plt.show(). Defaults to False.

{plotastrodata-1.8.2 → plotastrodata-1.8.3/plotastrodata.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: plotastrodata
-Version: 1.8.2
+Version: 1.8.3
 Summary: plotastrodata is a tool for astronomers to create figures from FITS files and perform fundamental data analyses with ease.
 Home-page: https://github.com/yusukeaso-astron/plotastrodata
 Download-URL: https://github.com/yusukeaso-astron/plotastrodata