plotastrodata 1.9.12__tar.gz → 1.9.13__tar.gz

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

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

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

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

@@ -3,6 +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 plotastrodata import const_utils as cu
 from plotastrodata.coord_utils import coord2xy, rel2abs, xy2coord
@@ -290,7 +291,7 @@ class AstroData():
             self.beam = np.array([bmaj_new, bmin_new, bpa_new])
 
     @_need_multipixels
-    def fit2d(self, model: object, bounds: np.ndarray,
+    def fit2d(self, model: Callable, bounds: np.ndarray,
               progressbar: bool = False,
               kwargs_fit: dict = {}, kwargs_plotcorner: dict = {},
               chan: int | None = None):

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

@@ -1,5 +1,6 @@
 import matplotlib.pyplot as plt
 import numpy as np
+from typing import Callable
 
 from plotastrodata.fits_utils import fits2data
 from plotastrodata.other_utils import close_figure
@@ -206,6 +207,101 @@ def ifftcentering2(F: np.ndarray,
     return f, x, y
 
 
+class FftCentering():
+    """Set FFT conditions and functions.
+
+    Args:
+        x (np.ndarray): 1D array.
+        y (np.ndarray, optional): 1D array. Defaults to None.
+        xcenter (float, optional): x of phase reference. Defaults to 0.
+        ycenter (float, optional): y of phase reference. Defaults to 0.
+        rfft (bool, optional): True means using rFFT. Defaults to False.
+    """
+    def __init__(self, x: np.ndarray,
+                 y: np.ndarray | None = None,
+                 xcenter: float = 0,
+                 ycenter: float = 0,
+                 rfft: bool = False):
+        nx = len(x)
+        self.x = x
+        self.dx = dx = x[1] - x[0]
+        self.xcenter = xcenter
+        self.ndim = 2 if isinstance(y, np.ndarray) else 1
+        self.rfft = rfft
+        if rfft:
+            u = np.fft.rfftfreq(nx, d=dx)
+        else:
+            u = np.fft.fftshift(np.fft.fftfreq(nx, d=dx))
+        self.u = u
+        if self.ndim == 2:
+            ny = len(y)
+            self.y = y
+            self.dy = dy = y[1] - y[0]
+            self.ycenter = ycenter
+            v = np.fft.fftshift(np.fft.fftfreq(ny, d=dy))
+            self.v = v
+
+    def fft(self, f: np.ndarray | None = None
+            ) -> np.ndarray | Callable:
+        """FFT calculation done by considering 1D/2D and fft/rfft.
+
+        Args:
+            f (np.ndarray | None, optional): 1D or 2D array. Defaults to None.
+
+        Returns:
+            np.ndarray: FFT result. When f is None, the return is the FFT function.
+        """
+        if self.ndim == 1:
+            def func(f: np.ndarray):
+                F, _ = fftcentering(f=f, x=self.x,
+                                    xcenter=self.xcenter,
+                                    rfft=self.rfft)
+                return F
+
+        else:
+            def func(f: np.ndarray):
+                F, _, _ = fftcentering2(f=f, x=self.x, y=self.y,
+                                        xcenter=self.xcenter,
+                                        ycenter=self.ycenter,
+                                        rfft=self.rfft)
+                return F
+
+        return func if f is None else func(f)
+
+    def ifft(self, F: np.ndarray | None = None, outreal: bool = False
+             ) -> np.ndarray | Callable:
+        """iFFT calculation done by considering 1D/2D and fft/rfft.
+
+        Args:
+            F (np.ndarray | None, optional): An FFT result. Defaults to None.
+
+        Returns:
+            np.ndarray: iFFT result. When F is None, the return is the iFFT function.
+        """
+        if self.ndim == 1:
+            def func(F: np.ndarray):
+                f, _ = ifftcentering(F=F, u=self.u,
+                                     xcenter=self.xcenter,
+                                     x0=self.x[0],
+                                     dx=self.dx,
+                                     outreal=outreal,
+                                     rfft=self.rfft)
+                return f
+
+        else:
+            def func(F: np.ndarray):
+                f, _, _ = ifftcentering2(F=F, u=self.u, v=self.v,
+                                         xcenter=self.xcenter,
+                                         ycenter=self.ycenter,
+                                         x0=self.x[0], y0=self.y[0],
+                                         dx=self.dx, dy=self.dy,
+                                         outreal=outreal,
+                                         rfft=self.rfft)
+                return f
+
+        return func if F is None else func(F)
+
+
 def zeropadding(f: np.ndarray, x: np.ndarray, y: np.ndarray,
                 xlim: list, ylim: list
                 ) -> tuple[np.ndarray, np.ndarray, np.ndarray]:

{plotastrodata-1.9.12 → plotastrodata-1.9.13}/plotastrodata/fitting_utils.py

@@ -7,6 +7,7 @@ import warnings
 from dynesty import DynamicNestedSampler as DNS
 from multiprocessing import Pool
 from tqdm import tqdm
+from typing import Callable
 
 from plotastrodata.matrix_utils import Mrot, dot2d
 from plotastrodata.other_utils import close_figure
@@ -63,8 +64,8 @@ def _check_GR(samples: np.ndarray, nwalkers: int, ndata: int, dim: int,
 class EmceeCorner():
     warnings.simplefilter('ignore', RuntimeWarning)
 
-    def __init__(self, bounds: np.ndarray, logl: object | None = None,
-                 model: object | None = None,
+    def __init__(self, bounds: np.ndarray, logl: Callable | None = None,
+                 model: Callable | None = None,
                  xdata: np.ndarray | None = None,
                  ydata: np.ndarray | None = None,
                  sigma: np.ndarray = 1, progressbar: bool = False,
@@ -111,7 +112,8 @@ class EmceeCorner():
 
     def _run_sampler(self, pos0: np.ndarray, pt: bool,
                      ncores: int, ntemps: int,
-                     nsteps: int, nwalkers: int) -> object:
+                     nsteps: int, nwalkers: int
+                     ) -> ptemcee.Sampler | emcee.EnsembleSampler:
         """Create and run the sampler, then return it."""
         if pt:
             sampler_cls = ptemcee.Sampler

{plotastrodata-1.9.12 → plotastrodata-1.9.13}/plotastrodata/other_utils.py

@@ -3,6 +3,7 @@ import numbers
 import numpy as np
 import warnings
 from scipy.interpolate import RegularGridInterpolator as RGI
+from typing import Callable
 
 
 def listing(*args) -> list:
@@ -217,7 +218,7 @@ def reform_data(c: np.ndarray, v_in: np.ndarray | None,
 
 def RGIxy(y: np.ndarray, x: np.ndarray, data: np.ndarray,
           yxnew: tuple[np.ndarray, np.ndarray] | None = None,
-          **kwargs) -> object | np.ndarray:
+          **kwargs) -> Callable | np.ndarray:
     """RGI for x and y at each channel.
 
     Args:
@@ -252,7 +253,7 @@ def RGIxy(y: np.ndarray, x: np.ndarray, data: np.ndarray,
 
 def RGIxyv(v: np.ndarray, y: np.ndarray, x: np.ndarray, data: np.ndarray,
            vyxnew: tuple[np.ndarray, np.ndarray, np.ndarray] | None = None,
-           **kwargs) -> object | np.ndarray:
+           **kwargs) -> Callable | np.ndarray:
     """RGI in the x-y-v space.
 
     Args:

{plotastrodata-1.9.12 → plotastrodata-1.9.13}/plotastrodata/plot_utils.py

@@ -3,7 +3,7 @@ import matplotlib.pyplot as plt
 import numpy as np
 from dataclasses import dataclass
 from matplotlib.patches import Ellipse, Rectangle
-from typing import TypeVar
+from typing import TypeVar, Callable
 
 from plotastrodata.analysis_utils import AstroData, AstroFrame
 from plotastrodata.coord_utils import (coord2xy, xy2coord,
@@ -162,13 +162,13 @@ def _get_v(p, v: np.ndarray | None = None,
     return v
 
 
-def _get_nij2ch(nrows: int = 1, ncols: int = 1) -> object:
+def _get_nij2ch(nrows: int = 1, ncols: int = 1) -> Callable:
     def nij2ch(n: int, i: int, j: int) -> int:
         return n*nrows*ncols + i*ncols + j
     return nij2ch
 
 
-def _get_ch2nij(nrows: int = 1, ncols: int = 1) -> object:
+def _get_ch2nij(nrows: int = 1, ncols: int = 1) -> Callable:
     def ch2nij(ch: int) -> tuple[int, int, int]:
         n = ch // (nrows*ncols)
         i = (ch - n*nrows*ncols) // ncols
@@ -178,7 +178,7 @@ def _get_ch2nij(nrows: int = 1, ncols: int = 1) -> object:
 
 
 def _get_vskipfill(nv: float, v_org: np.ndarray, vskip: int,
-                   channelnumber: int) -> object:
+                   channelnumber: int) -> Callable:
     def vskipfill(c: np.ndarray, v_in: np.ndarray) -> np.ndarray:
         c = reform_data(c=c, v_in=v_in, nv=nv, v_org=v_org, vskip=vskip)
         if isinstance(channelnumber, int):

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: plotastrodata
-Version: 1.9.12
+Version: 1.9.13
 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