plotastrodata 1.9.13__tar.gz → 1.9.15__tar.gz

{plotastrodata-1.9.13/plotastrodata.egg-info → plotastrodata-1.9.15}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: plotastrodata
-Version: 1.9.13
+Version: 1.9.15
 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.9.13 → plotastrodata-1.9.15}/plotastrodata/__init__.py

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

{plotastrodata-1.9.13 → plotastrodata-1.9.15}/plotastrodata/analysis_utils.py

@@ -3,7 +3,7 @@ import warnings
 from dataclasses import dataclass
 from scipy.interpolate import RegularGridInterpolator as RGI
 from scipy.signal import convolve
-from typing import Callable
+from typing import Any, Callable
 
 from plotastrodata import const_utils as cu
 from plotastrodata.coord_utils import coord2xy, rel2abs, xy2coord
@@ -18,7 +18,7 @@ from plotastrodata.other_utils import (isdeg, nearest_index,
 
 def quadrantmean(data: np.ndarray, x: np.ndarray, y: np.ndarray,
                  quadrants: str = '13'
-                 ) -> tuple[np.ndarray, np.ndarray, np.ndarray]:
+                 ) -> tuple[np.ndarray, np.ndarray, np.ndarray] | None:
     """Take mean between 1st and 3rd (or 2nd and 4th) quadrants.
 
     Args:
@@ -52,7 +52,7 @@ def quadrantmean(data: np.ndarray, x: np.ndarray, y: np.ndarray,
 
 
 def filled2d(data: np.ndarray, x: np.ndarray, y: np.ndarray, n: int = 1,
-             **kwargs) -> tuple[np.ndarray, np.ndarray, np.ndarray]:
+             **kwargs: Any) -> tuple[np.ndarray, np.ndarray, np.ndarray]:
     """Fill 2D data, 1D x, and 1D y by a factor of n using RGI.
 
     Args:
@@ -71,8 +71,8 @@ def filled2d(data: np.ndarray, x: np.ndarray, y: np.ndarray, n: int = 1,
     return d, xnew, ynew
 
 
-def _need_multipixels(method):
-    def wrapper(cls, *args, **kwargs):
+def _need_multipixels(method: Callable) -> Callable:
+    def wrapper(cls: Any, *args: Any, **kwargs: Any) -> Any | None:
         singlepixel = cls.dx is None or cls.dy is None
         if singlepixel:
             print('No pixel size.')
@@ -90,7 +90,7 @@ class AstroData():
         x (np.ndarray, optional): 1D array. Defaults to None.
         y (np.ndarray, optional): 1D array. Defaults to None.
         v (np.ndarray, optional): 1D array. Defaults to None.
-        beam (np.ndarray, optional): [bmaj, bmin, bpa]. Defaults ot [None, None, None].
+        beam (np.ndarray, optional): [bmaj, bmin, bpa]. Defaults to [None, None, None].
         fitsimage (str, optional): Input fits name. Defaults to None.
         Tb (bool, optional): True means the data array is brightness temperature. Defaults to False.
         sigma (float or str, optional): Noise level or method for measuring it. Defaults to 'hist'.
@@ -116,7 +116,7 @@ class AstroData():
     pv: bool = False
     bunit: str = ''
 
-    def __post_init__(self):
+    def __post_init__(self) -> None:
         n = 0
         if self.fitsimage is not None:
             if not isinstance(self.fitsimage, list):
@@ -142,7 +142,7 @@ class AstroData():
         self.beam_org = None
         self.fitsheader = None
 
-    def _binning_one(self, t: str, width: float):
+    def _binning_one(self, t: str, width: float) -> None:
         grid = getattr(self, t)
         if width == 1 or grid is None:
             return
@@ -168,7 +168,7 @@ class AstroData():
         setattr(self, t, gridnew / width)
         setattr(self, dt, sep * width)
 
-    def binning(self, width: list[int] = [1, 1, 1]):
+    def binning(self, width: list[int] = [1, 1, 1]) -> None:
         """Binning up neighboring pixels in the v, y, and x domain.
 
         Args:
@@ -202,7 +202,7 @@ class AstroData():
 
     def centering(self, includexy: bool = True,
                   includev: bool = False,
-                  **kwargs):
+                  **kwargs: Any) -> None:
         """Spatial regridding to set the center at (x,y,v)=(0,0,0).
 
         Args:
@@ -238,7 +238,7 @@ class AstroData():
             print('No change because includexy=False and includev=False.')
 
     @_need_multipixels
-    def circularbeam(self):
+    def circularbeam(self) -> None:
         """Make the beam circular by convolving with 1D Gaussian
         """
         if None in self.beam:
@@ -262,7 +262,8 @@ class AstroData():
         self.beam[1] = self.beam[0]
         self.beam[2] = 0
 
-    def deproject(self, pa: float = 0, incl: float = 0, **kwargs):
+    def deproject(self, pa: float = 0, incl: float = 0,
+                  **kwargs: Any) -> None:
         """Exapnd by a factor of 1/cos(incl) in the direction of pa+90 deg.
 
         Args:
@@ -294,9 +295,12 @@ class AstroData():
     def fit2d(self, model: Callable, bounds: np.ndarray,
               progressbar: bool = False,
               kwargs_fit: dict = {}, kwargs_plotcorner: dict = {},
-              chan: int | None = None):
+              chan: int | None = None) -> dict[str, Any] | None:
         """Fit a given 2D model function to self.data.
 
+        Default keyword values:
+            kwargs_plotcorner: ``show=False`` and ``savefig=None``. User-supplied values in ``kwargs_plotcorner`` override these defaults.
+
         Args:
             model (function): The model function in the form of f(par, x, y).
             bounds (np.ndarray): bounds for fitting_utils.EmceeCorner.
@@ -320,7 +324,7 @@ class AstroData():
             + ' This correction is relatively conservative.'
         warnings.warn(s, UserWarning)
 
-        def logl(p):
+        def logl(p: np.ndarray) -> float:
             rss = np.nansum((model(p, x, y) - d)**2)
             return -0.5 * rss / self.sigma**2 / pixelperbeam
 
@@ -374,7 +378,7 @@ class AstroData():
                 'model': model, 'residual': residual,
                 'center': newcenter}
 
-    def histogram(self, **kwargs) -> tuple:
+    def histogram(self, **kwargs: Any) -> tuple[np.ndarray, np.ndarray]:
         """Output histogram of self.data using numpy.histogram. This method can take the arguments of numpy.histogram.
 
         Returns:
@@ -387,12 +391,12 @@ class AstroData():
 
     def mask(self, dataformask: np.ndarray | None = None,
              includepix: list[float, float] = [],
-             excludepix: list[float, float] = []):
+             excludepix: list[float, float] = []) -> None:
         """Mask self.data using a 2D or 3D array of dataformask.
 
         Args:
             dataformask (np.ndarray, optional): 2D or 3D array is used for specifying the mask.
-            includepix (list, optional): Data in this range survivies. Defaults to [].
+            includepix (list, optional): Data in this range survives. Defaults to [].
             excludepix (list, optional): Data in this range is masked. Defaults to [].
         """
         if dataformask is None:
@@ -411,7 +415,7 @@ class AstroData():
         if len(excludepix) == 2:
             self.data[(excludepix[0] < mask) * (mask < excludepix[1])] = np.nan
 
-    def _gfit_profile(self, prof: list, gaussfit: bool):
+    def _gfit_profile(self, prof: list, gaussfit: bool) -> dict[str, Any]:
         if not gaussfit:
             return {}
 
@@ -431,7 +435,7 @@ class AstroData():
                 ellipse: list[float, float, float] | None = None,
                 ninterp: int = 1,
                 flux: bool = False, gaussfit: bool = False
-                ) -> tuple[np.ndarray, np.ndarray, dict]:
+                ) -> tuple[np.ndarray, np.ndarray, dict] | None:
         """Get a list of line profiles at given spatial coordinates.
 
         Args:
@@ -477,7 +481,7 @@ class AstroData():
         gfitres = self._gfit_profile(prof, gaussfit)
         return self.v, prof, gfitres
 
-    def rotate(self, pa: float = 0, **kwargs):
+    def rotate(self, pa: float = 0, **kwargs: Any) -> None:
         """Counter clockwise rotation with respect to the center.
 
         Args:
@@ -489,7 +493,7 @@ class AstroData():
             self.beam[2] = self.beam[2] + pa
 
     def slice(self, length: float = 0, pa: float = 0,
-              dx: float | None = None, **kwargs) -> np.ndarray:
+              dx: float | None = None, **kwargs: Any) -> np.ndarray | None:
         """Get 1D slice with given a length and a position-angle.
 
         Args:
@@ -557,7 +561,7 @@ class AstroData():
         """Write out the AstroData to a FITS file.
 
         Args:
-            fitsimage (str, optional): Output FITS file name. Defaults to 'out.fits'.
+            fitsimage (str, optional): Output FITS file name. Existing files with the same name are overwritten. Defaults to 'out.fits'.
             header (dict, optional): Header dictionary. Defaults to {}.
         """
         h = {}
@@ -588,18 +592,18 @@ class AstroData():
                   fitsimage=fitsimage)
 
 
-def _as_list(value, n: int, isbeam: bool = False):
+def _as_list(value: Any, n: int, isbeam: bool = False) -> Any:
     if isbeam:
         return [value] * n if np.ndim(value) == 1 else value
     else:
         return value if isinstance(value, list) else [value] * n
 
 
-def _scalar_if_single(value, n: int):
+def _scalar_if_single(value: Any, n: int) -> Any:
     return value[0] if n == 1 else value
 
 
-def _get_gridsep(axis: np.ndarray | None):
+def _get_gridsep(axis: np.ndarray | None) -> float | None:
     return axis[1] - axis[0] if axis is not None and len(axis) > 1 else None
 
 
@@ -618,7 +622,7 @@ class AstroFrame():
         vsys (float, optional): Each channel shows v-vsys. Defaults to 0..
         center (str, optional): Central coordinate like '12h34m56.7s 12d34m56.7s'. Defaults to None.
         fitsimage (str, optional): Fits to get center. Defaults to None.
-        rmax (float, optional): The x range is [-rmax, rmax]. The y range is [-rmax, ramx]. Defaults to 1e10.
+        rmax (float, optional): The x range is [-rmax, rmax]. The y range is [-rmax, rmax]. Defaults to 1e10.
         xmax (float, optional): The x range is [xmin, xmax]. Defaults to None.
         xmin (float, optional): The x range is [xmin, xmax]. Defaults to None.
         ymax (float, optional): The y range is [ymin, ymax]. Defaults to None.
@@ -651,7 +655,7 @@ class AstroFrame():
     pv: bool = False
     quadrants: str | None = None
 
-    def __post_init__(self):
+    def __post_init__(self) -> None:
         self.xdir = -1 if self.xflip else 1
         self.ydir = -1 if self.yflip else 1
         self.xmin = -self.rmax if self.xmin is None else self.xmin
@@ -699,7 +703,7 @@ class AstroFrame():
                 x[i], y[i] = rel2abs(*p, self.Xlim, self.Ylim)
         return np.array([x, y])
 
-    def _get_restfreq(self, header: dict):
+    def _get_restfreq(self, header: dict) -> float | None:
         """Extract rest frequency from FITS header."""
         if 'RESTFRQ' in header:
             return header['RESTFRQ']
@@ -743,21 +747,22 @@ class AstroFrame():
         d.center[i] = cnew
         return grid
 
-    def _ascending_v(self, d: AstroData, i: int, v: np.ndarray | None):
+    def _ascending_v(self, d: AstroData, i: int,
+                     v: np.ndarray | None) -> None:
         if v is not None and len(v) > 1 and v[1] < v[0]:
             d.data[i], v = d.data[i][::-1], v[::-1]
             print('Velocity has been inverted.')
         d.v = v
 
     def _xyskip(self, d: AstroData, i: int,
-                x: np.ndarray | None, y: np.ndarray | None):
+                x: np.ndarray | None, y: np.ndarray | None) -> None:
         d.x = x[::self.xskip]
         d.y = y[::self.yskip]
         data = np.moveaxis(d.data[i], [-2, -1], [0, 1])
         data = data[::self.yskip, ::self.xskip]
         d.data[i] = np.moveaxis(data, [0, 1], [-2, -1])
 
-    def _trim_skip(self, d: AstroData, i: int, grid: list):
+    def _trim_skip(self, d: AstroData, i: int, grid: list) -> None:
         d.data[i], grid = trim(data=d.data[i],
                                x=grid[0], y=grid[1], v=grid[2],
                                xlim=self.xlim, ylim=self.ylim,
@@ -773,7 +778,7 @@ class AstroFrame():
         for axis in ['x', 'y', 'v']:
             setattr(d, f'd{axis}', _get_gridsep(getattr(d, axis)))
 
-    def _convert_to_Tb(self, d: AstroData, i: int):
+    def _convert_to_Tb(self, d: AstroData, i: int) -> None:
         """Convert Jy/beam data to brightness temperature if requested."""
         if not d.Tb[i]:
             return
@@ -790,7 +795,7 @@ class AstroFrame():
         if d.sigma[i] is not None:
             d.sigma[i] = d.sigma[i] * factor
 
-    def _set_pv_beam(self, d: AstroData, i: int):
+    def _set_pv_beam(self, d: AstroData, i: int) -> None:
         """Set effective PV beam."""
         if not self.pv or d.pv[i] or None in d.beam[i]:
             return
@@ -803,7 +808,7 @@ class AstroFrame():
         beam_incut = 1 / np.hypot(np.cos(angle) / bmaj, np.sin(angle) / bmin)
         d.beam[i] = np.array([np.abs(d.dv), beam_incut, 0])
 
-    def _read_one(self, d: AstroData, i: int):
+    def _read_one(self, d: AstroData, i: int) -> None:
         if d.center[i] == 'common':
             d.center[i] = self.center
         d.sigma_org[i] = d.sigma[i]
@@ -826,9 +831,11 @@ class AstroFrame():
         d.fitsimage_org[i] = d.fitsimage[i]
         d.fitsimage[i] = None
 
-    def read(self, d: AstroData, xskip: int = 1, yskip: int = 1):
+    def read(self, d: AstroData, xskip: int = 1, yskip: int = 1) -> None:
         """Get data, grid, sigma, beam, and bunit from AstroData, which is a part of the input of add_color, add_contour, add_segment, and add_rgb.
 
+        This method modifies ``d`` in place. During the read, the input fields are normalized to per-dataset lists, FITS-derived values are filled, trimming and coordinate-frame changes are applied, and bookkeeping fields such as ``fitsimage``, ``fitsimage_org``, ``Tb``, ``cfactor``, and ``sigma`` are updated.
+
         Args:
             d (AstroData): Dataclass for the add_* input.
             xskip, yskip (int): Spatial pixel skip. Defaults to 1.

{plotastrodata-1.9.13 → plotastrodata-1.9.15}/plotastrodata/ext_utils.py

@@ -1,26 +1,41 @@
 import numpy as np
 import shlex
 import subprocess
+from typing import Any
 
 from plotastrodata import const_utils as cu
 
 
-def terminal(cmd: str, **kwargs) -> None:
+def terminal(cmd: str, check: bool = True,
+             **kwargs: Any) -> subprocess.CompletedProcess:
     """Run a terminal command through subprocess.run.
 
+    The command is split with ``shlex.split`` and executed without a shell. It can still run destructive programs, so pass only trusted command strings.
+
     Args:
         cmd (str): Terminal command.
+        check (bool, optional): Whether to raise an exception if the command fails. Defaults to True.
+
+    Returns:
+        subprocess.CompletedProcess: Result from subprocess.run.
     """
-    subprocess.run(shlex.split(cmd), **kwargs)
+    return subprocess.run(shlex.split(cmd), check=check, **kwargs)
 
 
-def runpython(filename: str, **kwargs) -> None:
+def runpython(filename: str, check: bool = True,
+              **kwargs: Any) -> subprocess.CompletedProcess:
     """Run a python file.
 
+    The file is executed as a Python script and can perform arbitrary file or system operations. Pass only trusted files.
+
     Args:
         filename (str): Python file name.
+        check (bool, optional): Whether to raise an exception if the script fails. Defaults to True.
+
+    Returns:
+        subprocess.CompletedProcess: Result from subprocess.run.
     """
-    terminal(f'python {filename}', **kwargs)
+    return subprocess.run(['python', filename], check=check, **kwargs)
 
 
 def BnuT(T: float = 30, nu: float = 230e9) -> float:

{plotastrodata-1.9.13 → plotastrodata-1.9.15}/plotastrodata/fft_utils.py

@@ -163,7 +163,7 @@ def ifftcentering2(F: np.ndarray,
     Args:
         F (np.ndarray): 2D array. An FFT result in the frequency domain.
         u (np.ndarray, optional): 1D or 2D array. The first frequency coordinate. Defaults to None.
-        v (np.ndarray, optional): 1D or 2D array. The second frequency cooridnate. Defaults to None.
+        v (np.ndarray, optional): 1D or 2D array. The second frequency coordinate. Defaults to None.
         xcenter (float, optional): x of phase reference (used in fftcentering2). Defaults to 0.
         ycenter (float, optional): y of phase reference (used in fftcentering2). Defaults to 0.
         x0 (float, optional): spatial coordinate of x[0]. Defaults to None.
@@ -221,7 +221,7 @@ class FftCentering():
                  y: np.ndarray | None = None,
                  xcenter: float = 0,
                  ycenter: float = 0,
-                 rfft: bool = False):
+                 rfft: bool = False) -> None:
         nx = len(x)
         self.x = x
         self.dx = dx = x[1] - x[0]
@@ -252,14 +252,14 @@ class FftCentering():
             np.ndarray: FFT result. When f is None, the return is the FFT function.
         """
         if self.ndim == 1:
-            def func(f: np.ndarray):
+            def func(f: np.ndarray) -> np.ndarray:
                 F, _ = fftcentering(f=f, x=self.x,
                                     xcenter=self.xcenter,
                                     rfft=self.rfft)
                 return F
 
         else:
-            def func(f: np.ndarray):
+            def func(f: np.ndarray) -> np.ndarray:
                 F, _, _ = fftcentering2(f=f, x=self.x, y=self.y,
                                         xcenter=self.xcenter,
                                         ycenter=self.ycenter,
@@ -279,7 +279,7 @@ class FftCentering():
             np.ndarray: iFFT result. When F is None, the return is the iFFT function.
         """
         if self.ndim == 1:
-            def func(F: np.ndarray):
+            def func(F: np.ndarray) -> np.ndarray:
                 f, _ = ifftcentering(F=F, u=self.u,
                                      xcenter=self.xcenter,
                                      x0=self.x[0],
@@ -289,7 +289,7 @@ class FftCentering():
                 return f
 
         else:
-            def func(F: np.ndarray):
+            def func(F: np.ndarray) -> np.ndarray:
                 f, _, _ = ifftcentering2(F=F, u=self.u, v=self.v,
                                          xcenter=self.xcenter,
                                          ycenter=self.ycenter,
@@ -349,7 +349,7 @@ def fftfits(fitsimage: str, center: str | None = None, lam: float = 1,
         lam (float, optional): Return u * lam and v * lam. Defaults to 1.
         xlim (list, optional): Range of x for zero padding in arcsec.
         ylim (list, optional): Range of y for zero padding in arcsec.
-        savefig (dict or str, optional): For plt.figure().savefig(). Defaults to None.
+        savefig (dict or str, optional): Passed to ``close_figure``. Existing files may be overwritten, and the figure is closed after saving/showing. Defaults to None.
         show (bool, optional): True means doing plt.show(). Defaults to False.
 
     Returns:
@@ -384,16 +384,16 @@ def fftfits(fitsimage: str, center: str | None = None, lam: float = 1,
 def findindex(u: np.ndarray | None = None, v: np.ndarray | None = None,
               uobs: np.ndarray | None = None, vobs: np.ndarray | None = None
               ) -> np.ndarray:
-    """Find indicies of the observed visibility points.
+    """Find indices of the observed visibility points.
 
     Args:
         u (np.ndarray, optional): 1D array. The first frequency coordinate. Defaults to None.
-        v (np.ndarray, optional): 1D array. The second frequency cooridnate. Defaults to None.
+        v (np.ndarray, optional): 1D array. The second frequency coordinate. Defaults to None.
         uobs (np.ndarray, optional): 1D array. Observed u. Defaults to None.
         vobs (np.ndarray, optional): 1D array. Observed v. Defaults to None.
 
     Returns:
-        np.ndarray: Indicies or an array of indicies.
+        np.ndarray: Indices or an array of indices.
     """
     if u is not None:
         Nu, du = len(u), u[1] - u[0]
@@ -417,13 +417,13 @@ def fftfitssample(fitsimage: str, center: str | None = None,
                   getindex: bool = False,
                   u_sample: np.ndarray | None = None,
                   v_sample: np.ndarray | None = None) -> np.ndarray:
-    """Find indicies or the visibilities on them from an image fits file.
+    """Find indices or the visibilities on them from an image FITS file.
 
     Args:
         fitsimage (str): Input fits name in the unit of Jy/pixel.
         center (str, optional): Text coordinate. Defaults to None.
-        index_u (np.ndarray, optional): Indicies. Output from the getindex mode. Defaults to None.
-        index_v (np.ndarray, optional): Indicies. Output from the getindex mode. Defaults to None.
+        index_u (np.ndarray, optional): Indices. Output from the getindex mode. Defaults to None.
+        index_v (np.ndarray, optional): Indices. Output from the getindex mode. Defaults to None.
         xlim (list, optional): Range of x for zero padding in arcsec.
         ylim (list, optional): Range of y for zero padding in arcsec.
         getindex (bool, optional): True outputs [index_u, index_v]. Defaults to False.
@@ -431,7 +431,7 @@ def fftfitssample(fitsimage: str, center: str | None = None,
         v_sample (np.ndarray, optional): 1D array. Observed u. Defaults to None.
 
     Returns:
-        np.ndarray: Array of indicies or sampled FFT.
+        np.ndarray: Array of indices or sampled FFT.
     """
     F, u, v = fftfits(fitsimage=fitsimage, center=center, xlim=xlim, ylim=ylim)
     if index_u is None or index_v is None:

{plotastrodata-1.9.13 → plotastrodata-1.9.15}/plotastrodata/fits_utils.py

@@ -1,6 +1,7 @@
 import numpy as np
 from astropy import units, wcs
 from astropy.io import fits
+from typing import Any, Callable
 
 from plotastrodata import const_utils as cu
 from plotastrodata.coord_utils import coord2xy, xy2coord
@@ -9,15 +10,16 @@ from plotastrodata.noise_utils import estimate_rms
 from plotastrodata.other_utils import isdeg, RGIxy, trim
 
 
-def Jy2K(header=None, bmaj: float | None = None, bmin: float | None = None,
-         restfreq: float | None = None) -> float:
+def Jy2K(header: Any = None, bmaj: float | None = None,
+         bmin: float | None = None,
+         restfreq: float | None = None) -> float | None:
     """Calculate a conversion factor in the unit of K/Jy.
 
     Args:
         header (optional): astropy.io.fits.open('a.fits')[0].header. Defaults to None.
-        bmaj (float, optional): beam major axis in degree. Defaults to None.
-        bmin (float, optional): beam minor axis in degree. Defaults to None.
-        freq (float, optional): rest frequency in Hz. Defaults to None.
+        bmaj (float, optional): Beam major axis in arcsec. Defaults to None.
+        bmin (float, optional): Beam minor axis in arcsec. Defaults to None.
+        restfreq (float, optional): Rest frequency in Hz. Defaults to None.
 
     Returns:
         float: the conversion factor in the unit of K/Jy.
@@ -53,11 +55,11 @@ class FitsData:
     Args:
         fitsimage (str): Input FITS file name.
     """
-    def __init__(self, fitsimage: str):
+    def __init__(self, fitsimage: str) -> None:
         self.fitsimage = fitsimage
 
     def gen_hdu(self) -> None:
-        """Generate self.hdu, which is astropy,io.fits.open()[0].
+        """Generate self.hdu, which is astropy.io.fits.open()[0].
         """
         hdu = fits.open(self.fitsimage)
         self.hdu = hdu[0]
@@ -75,7 +77,7 @@ class FitsData:
             self.gen_hdu()
         self.header = self.hdu.header
 
-    def get_header(self, key: str | None = None) -> dict | float:
+    def get_header(self, key: str | None = None) -> Any:
         """Output the entire header or a value when a key is given.
 
         Args:
@@ -94,7 +96,7 @@ class FitsData:
         return None
 
     def gen_beam(self, dist: float = 1.) -> None:
-        """Generate sef.bmaj, self.bmin, self.bpa from header['BMAJ'], etc.
+        """Generate self.bmaj, self.bmin, self.bpa from header['BMAJ'], etc.
 
         Args:
             dist (float, optional): bmaj and bmin are multiplied by dist. Defaults to 1..
@@ -146,7 +148,7 @@ class FitsData:
         return a
 
     def gen_data(self, Tb: bool = False, log: bool = False,
-                 drop: bool = True, restfreq: float = None) -> None:
+                 drop: bool = True, restfreq: float | None = None) -> None:
         """Generate data, which may be brightness temperature.
 
         Args:
@@ -167,7 +169,7 @@ class FitsData:
             d = np.log10(d.clip(np.min(d[d > 0]), None))
         self.data = d
 
-    def get_data(self, **kwargs) -> np.ndarray:
+    def get_data(self, **kwargs: Any) -> np.ndarray:
         """Output data. This method can take the arguments of gen_data().
 
         Returns:
@@ -177,7 +179,7 @@ class FitsData:
             self.gen_data(**kwargs)
         return self.data
 
-    def _read_cd(self):
+    def _read_cd(self) -> None:
         h = self.header
         cdij = ['CD1_1', 'CD1_2', 'CD2_1', 'CD2_2']
         if not np.all([k in list(h.keys()) for k in cdij]):
@@ -211,7 +213,7 @@ class FitsData:
             del h[k]
         print(f'WCS rotation was found (CROTA2 = {crota2:f} deg).')
 
-    def _rotate_cd(self):
+    def _rotate_cd(self) -> None:
         h = self.header
         data = self.get_data()
         ic = len(self.x) // 2
@@ -237,7 +239,10 @@ class FitsData:
         self.data = datanew
         print('Data values were interpolated for WCS rotation.')
 
-    def _get_genx_geny(self, center: str, dist: float):
+    def _get_genx_geny(self, center: str,
+                       dist: float
+                       ) -> tuple[Callable[[np.ndarray | None], None],
+                                  Callable[[np.ndarray | None], None]]:
         h = self.header
         cxy = (0, 0)
         if center is not None and not self.wcsrot:
@@ -247,7 +252,7 @@ class FitsData:
             cxy = coord2xy(center, coordorg)
         slabel = ['x', 'y']
 
-        def wrapper(i: int):
+        def wrapper(i: int) -> Callable[[np.ndarray | None], None]:
             def gen_s(s_in: np.ndarray | None) -> None:
                 if h.get(f'NAXIS{i+1}') is None or s_in is None:
                     s, ds = None, None
@@ -262,10 +267,11 @@ class FitsData:
 
         return wrapper(0), wrapper(1)
 
-    def _get_genv(self, restfreq: float | None, vsys: float, pv: bool):
+    def _get_genv(self, restfreq: float | None, vsys: float,
+                  pv: bool) -> Callable[[np.ndarray | None], None]:
         h = self.header
 
-        def gen_v(v_in: np.ndarray) -> None:
+        def gen_v(v_in: np.ndarray | None) -> None:
             vaxis = '2' if pv else '3'
             if h.get(f'NAXIS{vaxis}') is None or v_in is None:
                 self.v, self.dv = None, None
@@ -299,7 +305,7 @@ class FitsData:
 
         return gen_v
 
-    def _get_array(self, i: int) -> np.ndarray:
+    def _get_array(self, i: int) -> np.ndarray | None:
         h = self.header
         n = h.get(f'NAXIS{i:d}')
         if n is None:
@@ -337,7 +343,9 @@ class FitsData:
         if self.wcsrot:
             self._rotate_cd()
 
-    def get_grid(self, **kwargs) -> tuple[np.ndarray, np.ndarray, np.ndarray]:
+    def get_grid(self, **kwargs: Any
+                 ) -> tuple[np.ndarray | None, np.ndarray | None,
+                            np.ndarray | None]:
         """Output the grids, [x, y, v]. This method can take the arguments of gen_grid().
 
         Returns:
@@ -374,15 +382,16 @@ class FitsData:
 def fits2data(fitsimage: str, Tb: bool = False, log: bool = False,
               dist: float = 1., sigma: str | None = None,
               restfreq: float | None = None, center: str | None = None,
-              vsys: float = 0., pv: bool = False, **kwargs
-              ) -> tuple[np.ndarray, tuple[np.ndarray, np.ndarray, np.ndarray],
-                         np.ndarray, str, float]:
+              vsys: float = 0., pv: bool = False, **kwargs: Any
+              ) -> tuple[np.ndarray, tuple[np.ndarray | None, np.ndarray | None,
+                                           np.ndarray | None],
+                         np.ndarray, str | None, float | None]:
     """Extract data from a fits file. kwargs are arguments of FitsData.trim().
 
     Args:
         fitsimage (str): Input fits name.
-        Tb (bool, optional): True means ouput data are brightness temperature. Defaults to False.
-        log (bool, optional): True means output data are logarhismic. Defaults to False.
+        Tb (bool, optional): True means output data are brightness temperature. Defaults to False.
+        log (bool, optional): True means output data are logarithmic. Defaults to False.
         dist (float, optional): Change x and y in arcsec to au. Defaults to 1..
         sigma (str, optional): Noise level or method for measuring it. Defaults to None.
         restfreq (float, optional): Used for velocity and brightness temperature. Defaults to None.
@@ -411,8 +420,8 @@ def data2fits(d: np.ndarray, h: dict = {},
     Args:
         d (np.ndarray): N-D array.
         h (dict, optional): Additional FITS header. Defaults to {}.
-        templatefits (str, optional): FITS file whose header is used as a temperate. Defaults to None.
-        fitsimage (str, optional): Output filename, with or without '.fits'. Defaults to 'test'.
+        templatefits (str, optional): FITS file whose header is used as a template. Defaults to None.
+        fitsimage (str, optional): Output filename, with or without '.fits'. Existing files with the same name are overwritten. Defaults to 'test'.
     """
     _h = {} if templatefits is None else FitsData(templatefits).get_header()
     _h.update(h)