plotastrodata 1.6.0__tar.gz → 1.6.2__tar.gz

{plotastrodata-1.6.0 → plotastrodata-1.6.2}/PKG-INFO

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

@@ -1,4 +1,4 @@
 import warnings
 
 warnings.simplefilter('ignore', UserWarning)
-__version__ = '1.6.0'
+__version__ = '1.6.2'

{plotastrodata-1.6.0 → plotastrodata-1.6.2}/plotastrodata/analysis_utils.py

@@ -4,7 +4,7 @@ from scipy.interpolate import RegularGridInterpolator as RGI
 from scipy.optimize import curve_fit
 from scipy.signal import convolve
 
-from plotastrodata.coord_utils import coord2xy, rel2abs
+from plotastrodata.coord_utils import coord2xy, xy2coord, rel2abs
 from plotastrodata.matrix_utils import Mfac, Mrot, dot2d
 from plotastrodata.other_utils import (estimate_rms, trim,
                                        gaussian2d, isdeg,
@@ -68,7 +68,7 @@ def filled2d(data: np.ndarray, x: np.ndarray, y: np.ndarray, n: int = 1,
     return d, xnew, ynew
 
 
-def need_multipixel(method):
+def _need_multipixels(method):
     def wrapper(self, *args, **kwargs):
         singlepixel = self.dx is None or self.dy is None
         if singlepixel:
@@ -153,9 +153,14 @@ class AstroData():
             print(f'width was changed to [{ws}].')
         newsize = size // w
         grid = [None, self.v, self.y, self.x]
-        for n in range(4):
+        dgrid = [None, self.dv, self.dy, self.dx]
+        for n in range(1, 4):
             if w[n] == 1 or grid[n] is None:
                 continue
+            if dgrid[n] is None:
+                s = ['v', 'y', 'x'][n - 1]
+                print(f'Skip binning in the {s}-axis because d{s} is None.')
+                continue
             size[n] = newsize[n]
             olddata = np.moveaxis(d, n, 0)
             newdata = np.moveaxis(np.zeros(size), n, 0)
@@ -166,9 +171,11 @@ class AstroData():
                 t += grid[n][i:i_stop:i_step]
                 newdata += olddata[i:i_stop:i_step]
             grid[n] = t / w[n]
+            dgrid[n] = dgrid[n] * w[n]
             d = np.moveaxis(newdata, 0, n) / w[n]
         self.data = np.squeeze(d)
         _, self.v, self.y, self.x = grid
+        _, self.dv, self.dy, self.dx = dgrid
 
     def centering(self, includexy: bool = True, includev: bool = False,
                   **kwargs):
@@ -206,7 +213,7 @@ class AstroData():
         else:
             print('No change because includexy=False and includev=False.')
 
-    @need_multipixel
+    @_need_multipixels
     def circularbeam(self):
         """Make the beam circular by convolving with 1D Gaussian
         """
@@ -259,7 +266,7 @@ class AstroData():
             bmin_new = 1 / np.sqrt(alpha + Det)
             self.beam = np.array([bmaj_new, bmin_new, bpa_new])
 
-    @need_multipixel
+    @_need_multipixels
     def fit2d(self, model: object, bounds: np.ndarray,
               progressbar: bool = False,
               kwargs_fit: dict = {}, kwargs_plotcorner: dict = {},
@@ -307,15 +314,15 @@ class AstroData():
         return {'popt': popt, 'plow': plow, 'pmid': pmid, 'phigh': phigh,
                 'model': modelopt, 'residual': residual}
 
-    @need_multipixel
-    def gaussfit2d(self, chan: int | None = None):
+    @_need_multipixels
+    def gaussfit2d(self, chan: int | None = None) -> dict:
         """Fit a 2D Gaussian function to self.data.
 
         Args:
             chan (int): The channel number where the 2D Gaussian is fitted. Defaults to None.
 
         Returns:
-            dict: The best parameter set (popt), the covariance set (pcov), the best 2D Gaussian array (model), and the residual from the model (residual).
+            dict: The best parameter set (popt), the covariance set (pcov), the best 2D Gaussian array (model), the residual from the model (residual), and the coordinates of the best-fit center (center).
         """
         d = self.data if chan is None else self.data[chan]
         x = self.x
@@ -331,12 +338,21 @@ class AstroData():
         bounds = [[-amax, xmin, ymin, ds, ds, -90],
                   [amax, xmax, ymax, smax, smax, 90]]
         x, y = np.meshgrid(x, y)
-        popt, pcov = curve_fit(gaussian2d, (x.ravel(), y.ravel()), d.ravel(),
+        popt, pcov = curve_fit(gaussian2d,
+                               (x.ravel(), y.ravel()), d.ravel(),
                                p0=p0, bounds=bounds)
         model = gaussian2d((x, y), *popt)
         residual = d - model
+        if (center := self.center) is not None:
+            xy = popt[1:3] / 3600
+            newcenter = xy2coord(xy, coordorg=center)
+            if len(c := center.split()) == 3:
+                newcenter = f'{c[0]} {newcenter}'
+        else:
+            newcenter = None
         return {'popt': popt, 'pcov': pcov,
-                'model': model, 'residual': residual}
+                'model': model, 'residual': residual,
+                'center': newcenter}
 
     def histogram(self, **kwargs) -> tuple:
         """Output histogram of self.data using numpy.histogram. This method can take the arguments of numpy.histogram.
@@ -495,7 +511,7 @@ class AstroData():
              'sigma': self.sigma, 'center': self.center, 'pv': self.pv}
         return d
 
-    @need_multipixel
+    @_need_multipixels
     def writetofits(self, fitsimage: str = 'out.fits', header: dict = {}):
         """Write out the AstroData to a FITS file.
 
@@ -629,9 +645,8 @@ class AstroFrame():
          Returns:
             np.ndarray: absolute coordinates.
          """
-        if np.shape(poslist) == () \
-            or (np.shape(poslist) == (2,)
-                and type(poslist[0]) is not str):
+        onexy = np.shape(poslist) == (2,) and type(poslist[0]) is not str
+        if np.shape(poslist) == () or onexy:
             poslist = [poslist]
         x, y = [None] * len(poslist), [None] * len(poslist)
         for i, p in enumerate(poslist):

{plotastrodata-1.6.0 → plotastrodata-1.6.2}/plotastrodata/other_utils.py

@@ -12,10 +12,10 @@ def listing(*args) -> list:
     Returns:
         list: With a single non-list input, the output is a list like ['a'], rather than [['a']].
     """
-    nums = [float, int, np.float64, np.int64, np.float32, np.int32]
+    strnum = [str, float, int, np.float64, np.int64, np.float32, np.int32]
     b = [None] * len(args)
     for i, a in enumerate(args):
-        b[i] = [a] if type(a) in (nums + [str]) else a
+        b[i] = [a] if type(a) in strnum else a
     if len(args) == 1:
         b = b[0]
     return b

{plotastrodata-1.6.0 → plotastrodata-1.6.2}/plotastrodata/plot_utils.py

@@ -513,8 +513,9 @@ class PlotAstroData(AstroFrame):
         if patch not in ['rectangle', 'ellipse']:
             print('Only patch=\'rectangle\' or \'ellipse\' supported. ')
             return
-        for x, y, width, height, angle in zip(*self.pos2xy(poslist),
-                                              *listing(minlist, majlist, palist)):
+
+        z = listing(*self.pos2xy(poslist), minlist, majlist, palist)
+        for x, y, width, height, angle in zip(*z):
             for ch, axnow in enumerate(self.ax):
                 if type(self.channelnumber) is int:
                     ch = self.channelnumber
@@ -549,12 +550,15 @@ class PlotAstroData(AstroFrame):
         """
         if not show_beam:
             return
-        include_chan = self.bottomleft if self.channelnumber is None else self.allchan
+
+        animation = self.channelnumber is not None
+        include_chan = self.allchan if animation else self.bottomleft
         patch = 'rectangle' if self.pv else 'ellipse'
         blist = [beam] if np.ndim(beam) == 1 else beam
         n = len(blist)
         bclist = beamcolor if type(beamcolor) is list else [beamcolor] * n
-        bplist = beampos if beampos == [None] * 3 or np.ndim(beampos) == 2 else [beampos] * n
+        islist = beampos == [None] * 3 or np.ndim(beampos) == 2
+        bplist = beampos if islist else [beampos] * n
         for (bmaj, bmin, bpa), bc, bp in zip(blist, bclist, bplist):
             if None in [bmaj, bmin, bpa]:
                 print('No beam to plot.')
@@ -613,7 +617,8 @@ class PlotAstroData(AstroFrame):
                 ch = self.channelnumber
             if ch not in include_chan:
                 continue
-            for x, y, s in zip(*self.pos2xy(poslist), listing(slist)):
+            z = listing(*self.pos2xy(poslist), slist)
+            for x, y, s in zip(*z):
                 axnow.text(x=x, y=y, s=s, **_kw)
 
     def add_line(self, poslist: list[str | list[float, float]] = [],
@@ -639,7 +644,8 @@ class PlotAstroData(AstroFrame):
             if ch not in include_chan:
                 continue
             alist = np.radians(anglelist)
-            for x, y, a, r in zip(*self.pos2xy(poslist), *listing(alist, rlist)):
+            z = listing(*self.pos2xy(poslist), alist, rlist)
+            for x, y, a, r in zip(*z):
                 axnow.plot([x, x + r * np.sin(a)],
                            [y, y + r * np.cos(a)], **_kw)
 
@@ -666,7 +672,8 @@ class PlotAstroData(AstroFrame):
             if ch not in include_chan:
                 continue
             alist = np.radians(anglelist)
-            for x, y, a, r in zip(*self.pos2xy(poslist), *listing(alist, rlist)):
+            z = listing(*self.pos2xy(poslist), alist, rlist)
+            for x, y, a, r in zip(*z):
                 axnow.quiver(x, y, r * np.sin(a), r * np.cos(a),
                              angles='xy', scale_units='xy', scale=1,
                              **_kw)

{plotastrodata-1.6.0 → plotastrodata-1.6.2}/plotastrodata.egg-info/PKG-INFO

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