plotastrodata 1.7.6__tar.gz → 1.7.8__tar.gz

{plotastrodata-1.7.6/plotastrodata.egg-info → plotastrodata-1.7.8}/PKG-INFO

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

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

{plotastrodata-1.7.6 → plotastrodata-1.7.8}/plotastrodata/analysis_utils.py

@@ -90,12 +90,14 @@ class AstroData():
         v (np.ndarray, optional): 1D array. Defaults to None.
         beam (np.ndarray, optional): [bmaj, bmin, bpa]. Defaults ot [None, None, None].
         fitsimage (str, optional): Input fits name. Defaults to None.
-        Tb (bool, optional): True means the mapped data are brightness T. Defaults to False.
+        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'.
         center (str, optional): Text coordinates. 'common' means initialized value. Defaults to 'common'.
-        restfreq (float, optional): Used for velocity and brightness T. Defaults to None.
-        cfactor (float, optional): Output data times cfactor. Defaults to 1.
+        restfreq (float, optional): Used for velocity and brightness temperature. Defaults to None.
+        cfactor (float, optional): The data array is multiplied by cfactor. Defaults to 1.
         pvpa (float, optional): Position angle of the PV cut. Defaults to None.
+        pv (bool, optional): True means the data array is a position-velocity diagram. Defaults to False.
+        bunit (str, optional): The unit of the data array. Defaults to ''.
     """
     data: np.ndarray | None = None
     x: np.ndarray | None = None
@@ -110,6 +112,7 @@ class AstroData():
     cfactor: float = 1
     pvpa: float | None = None
     pv: bool = False
+    bunit: str = ''
 
     def __post_init__(self):
         n = 0
@@ -132,7 +135,6 @@ class AstroData():
         if n == 0:
             print('Either data or fitsimage must be given.')
         self.n = n
-        self.bunit = ''
         self.fitsimage_org = None
         self.sigma_org = None
         self.beam_org = None
@@ -159,8 +161,10 @@ class AstroData():
             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.')
+                t = ['v', 'y', 'x'][n - 1]
+                s = f'Skip binning in the {t}-axis' \
+                    + f' because d{t} is None.'
+                warnings.warn(s, UserWarning)
                 continue
             size[n] = newsize[n]
             olddata = np.moveaxis(d, n, 0)
@@ -177,8 +181,11 @@ class AstroData():
         self.data = np.squeeze(d)
         _, self.v, self.y, self.x = grid
         _, self.dv, self.dy, self.dx = dgrid
+        s = 'AstroData.sigma is not updated by AstroData.binning().'
+        warnings.warn(s, UserWarning)
 
-    def centering(self, includexy: bool = True, includev: bool = False,
+    def centering(self, includexy: bool = True,
+                  includev: bool = False,
                   **kwargs):
         """Spatial regridding to set the center at (x,y,v)=(0,0,0).
 
@@ -520,7 +527,8 @@ class AstroData():
         d = {'data': self.data, 'x': self.x, 'y': self.y, 'v': self.v,
              'fitsimage': self.fitsimage, 'beam': self.beam, 'Tb': self.Tb,
              'restfreq': self.restfreq, 'cfactor': self.cfactor,
-             'sigma': self.sigma, 'center': self.center, 'pv': self.pv}
+             'sigma': self.sigma, 'center': self.center, 'pv': self.pv,
+             'bunit': self.bunit}
         return d
 
     @_need_multipixels

{plotastrodata-1.7.6 → plotastrodata-1.7.8}/plotastrodata/fft_utils.py

@@ -58,7 +58,7 @@ def fftcentering(f: np.ndarray, x: np.ndarray | None = None,
     dx = X[1] - X[0]
     u = np.fft.fftshift(np.fft.fftfreq(nx, d=dx))
     F = np.fft.fftshift(np.fft.fft(f))
-    F = shiftphase(F, u=u, xoff=xcenter - X[-1] - dx)
+    F = shiftphase(F, u=u, xoff=xcenter - X[0])
     return F, u
 
 
@@ -89,7 +89,7 @@ def fftcentering2(f: np.ndarray,
     u = np.fft.fftshift(np.fft.fftfreq(nx, d=dx))
     v = np.fft.fftshift(np.fft.fftfreq(ny, d=dy))
     F = np.fft.fftshift(np.fft.fft2(f))
-    F = shiftphase2(F, u, v, xcenter - X[-1] - dx, ycenter - Y[-1] - dy)
+    F = shiftphase2(F, u, v, xcenter - X[0], ycenter - Y[0])
     return F, u, v
 
 
@@ -116,8 +116,7 @@ def ifftcentering(F: np.ndarray, u: np.ndarray | None = None,
     x = (np.arange(nx) - (nx-1)/2.) / (u[1]-u[0]) / nx + xcenter
     if x0 is not None:
         x = x - x[0] + x0
-    dx = x[1] - x[0]
-    F = shiftphase(F, u=u, xoff=x[-1] + dx - xcenter)
+    F = shiftphase(F, u=u, xoff=x[0] - xcenter)
     f = np.fft.ifft(np.fft.ifftshift(F))
     if outreal:
         f = np.real(f)
@@ -156,8 +155,7 @@ def ifftcentering2(F: np.ndarray,
         x = x - x[0] + x0
     if y0 is not None:
         y = y - y[0] + y0
-    dx, dy = x[1] - x[0], y[1] - y[0]
-    F = shiftphase2(F, u, v, x[-1] + dx - xcenter, y[-1] + dy - ycenter)
+    F = shiftphase2(F, u, v, x[0] - xcenter, y[0] - ycenter)
     f = np.fft.ifft2(np.fft.ifftshift(F))
     if outreal:
         f = np.real(f)

{plotastrodata-1.7.6 → plotastrodata-1.7.8}/plotastrodata/fits_utils.py

@@ -314,8 +314,10 @@ class FitsData:
             yc = self.y[jc] / self.dy
             Mcd = [[cd11, cd12], [cd21, cd22]]
             xc, yc = dot2d(Mcd, [xc, yc])
-            newcenter = xy2coord(xy=[xc, yc], coordorg=self.get_center())
-            xc, yc = coord2xy(coords=newcenter, coordorg='00h00m00s 00d00m00s')
+            newcenter = xy2coord(xy=[xc, yc],
+                                 coordorg=self.get_center())
+            xc, yc = coord2xy(coords=newcenter,
+                              coordorg='00h00m00s 00d00m00s')
             self.header['CRVAL1'] = xc
             self.header['CRVAL2'] = yc
             self.x = self.x - self.x[ic]

{plotastrodata-1.7.6 → plotastrodata-1.7.8/plotastrodata.egg-info}/PKG-INFO

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