plotastrodata 1.2.9__tar.gz → 1.3.0__tar.gz

{plotastrodata-1.2.9 → plotastrodata-1.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: plotastrodata
-Version: 1.2.9
+Version: 1.3.0
 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.2.9 → plotastrodata-1.3.0}/plotastrodata/__init__.py

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

{plotastrodata-1.2.9 → plotastrodata-1.3.0}/plotastrodata/analysis_utils.py

@@ -5,7 +5,7 @@ from scipy.optimize import curve_fit
 from scipy.signal import convolve
 
 from plotastrodata.other_utils import (coord2xy, rel2abs, estimate_rms, trim,
-                                       Mfac, Mrot, dot2d, gaussian2d)
+                                       isdeg, Mfac, Mrot, dot2d, gaussian2d)
 from plotastrodata.fits_utils import FitsData, data2fits, Jy2K
 from plotastrodata import const_utils as cu
 from plotastrodata.fitting_utils import EmceeCorner
@@ -553,29 +553,36 @@ class AstroData():
             fitsimage (str, optional): Output FITS file name. Defaults to 'out.fits'.
             header (dict, optional): Header dictionary. Defaults to {}.
         """
-        if self.pv:
-            print('writetofits does not support PV diagram yet.')
-            return
-
+        fhd = self.fitsheader
         h = {}
-        cx, cy = (0, 0) if self.center is None else coord2xy(self.center)
+        cx, cy = (0, 0) if self.pv or self.center is None else coord2xy(self.center)
         h['NAXIS1'] = len(self.x)
         h['CRPIX1'] = np.argmin(np.abs(self.x)) + 1
         h['CRVAL1'] = cx
-        h['CDELT1'] = (self.x[1] - self.x[0]) / 3600
-        h['NAXIS2'] = len(self.y)
-        h['CRPIX2'] = np.argmin(np.abs(self.y)) + 1
-        h['CRVAL2'] = cy
-        h['CDELT2'] = (self.y[1] - self.y[0]) / 3600
-        if self.v is not None:
-            h['NAXIS3'] = len(self.v)
-            h['CRPIX3'] = i = np.argmin(np.abs(self.v)) + 1
-            h['CRVAL3'] = (1 - self.v[i]/cu.c_kms) * self.restfreq
-            h['CDELT3'] = (self.v[0]-self.v[1]) / cu.c_kms * self.restfreq
+        h['CDELT1'] = self.x[1] - self.x[0]
+        if fhd is not None and isdeg(fhd['CUNIT1']):
+            h['CDELT1'] = h['CDELT1'] / 3600
+        vaxis = '2' if self.pv else '3'
+        h[f'NAXIS{vaxis}'] = len(self.v)
+        h[f'CRPIX{vaxis}'] = i = np.argmin(np.abs(self.v)) + 1
+        h[f'CRVAL{vaxis}'] = (1 - self.v[i]/cu.c_kms) * self.restfreq
+        h[f'CDELT{vaxis}'] = (self.v[0]-self.v[1]) / cu.c_kms * self.restfreq
+        if not self.pv:
+            h['NAXIS2'] = len(self.y)
+            h['CRPIX2'] = np.argmin(np.abs(self.y)) + 1
+            h['CRVAL2'] = cy
+            h['CDELT2'] = self.y[1] - self.y[0]
+            if fhd is not None and isdeg(fhd['CUNIT2']):
+                h['CDELT2'] = h['CDELT2'] / 3600
         if None not in self.beam:
-            h['BMAJ'] = self.beam[0] / 3600
-            h['BMIN'] = self.beam[1] / 3600
-            h['BPA'] = self.beam[2]
+            if self.pv:
+                h['BMAJ'] = self.beam_org[0] / 3600
+                h['BMIN'] = self.beam_org[1] / 3600
+                h['BPA'] = self.beam_org[2]
+            else:    
+                h['BMAJ'] = self.beam[0] / 3600
+                h['BMIN'] = self.beam[1] / 3600
+                h['BPA'] = self.beam[2]
         h0 = header
         for k in h:
             if k not in h0:

{plotastrodata-1.2.9 → plotastrodata-1.3.0}/plotastrodata/fits_utils.py

@@ -2,7 +2,8 @@ import numpy as np
 from astropy.io import fits
 from astropy import units, wcs
 
-from plotastrodata.other_utils import coord2xy, xy2coord, estimate_rms, trim
+from plotastrodata.other_utils import (coord2xy, xy2coord,
+                                       estimate_rms, trim, isdeg)
 from plotastrodata import const_utils as cu
 
 
@@ -128,11 +129,9 @@ class FitsData:
         Returns:
             str: The central coordinates.
         """
-        cunit1 = self.get_header('CUNIT1').strip()
-        cunit2 = self.get_header('CUNIT2').strip()
-        good = (cunit1 in ['deg', 'DEG', 'degree', 'DEGREE']
-                and cunit2 in ['deg', 'DEG', 'degree', 'DEGREE'])
-        if not good:
+        cunit1 = self.get_header('CUNIT1')
+        cunit2 = self.get_header('CUNIT2')
+        if not (isdeg(cunit1) and isdeg(cunit2)):
             print(f'CUNIT1=\'{cunit1}\' and CUNIT2=\'{cunit2}\'. \'center\' is ignored.')
             return None
         ra_deg = self.get_header('CRVAL1')
@@ -215,13 +214,13 @@ class FitsData:
 
         def gen_x(s: np.ndarray) -> None:
             s = (s - cx) * dist
-            if h['CUNIT1'].strip() in ['deg', 'DEG', 'degree', 'DEGREE']:
+            if isdeg(h['CUNIT1']):
                 s *= 3600.
             self.x, self.dx = s, s[1] - s[0]
 
         def gen_y(s: np.ndarray) -> None:
             s = (s - cy) * dist
-            if h['CUNIT2'].strip() in ['deg', 'DEG', 'degree', 'DEGREE']:
+            if isdeg(h['CUNIT2']):
                 s *= 3600.
             self.y, self.dy = s, s[1] - s[0]
 

{plotastrodata-1.2.9 → plotastrodata-1.3.0}/plotastrodata/other_utils.py

@@ -42,6 +42,21 @@ def listing(*args) -> list:
     return b
 
 
+def isdeg(s: str) -> bool:
+    """Whether the given string means degree.
+
+    Args:
+        s (str): The string to be checked.
+
+    Returns:
+        bool: Whether the given string means degree.
+    """
+    if type(s) is str:
+        return s.strip() in ['deg', 'DEG', 'degree', 'DEGREE']
+    else:
+        return False
+
+
 def _getframe(coord: str, s: str = '') -> tuple:
     """Internal function to pick up the frame name from the coordinates.
 

{plotastrodata-1.2.9 → plotastrodata-1.3.0}/plotastrodata/plot_utils.py

@@ -610,7 +610,7 @@ class PlotAstroData(AstroFrame):
 
     def add_scalebar(self, length: float = 0, label: str = '',
                      color: str = 'gray', barpos: tuple[float, float] = (0.8, 0.12),
-                     fontsize: float = None, linewidth: float = 3,
+                     fontsize: float | None = None, linewidth: float = 3,
                      bbox: dict = {'alpha': 0}) -> None:
         """Use Axes.text and Axes.plot of matplotlib.
 
@@ -622,8 +622,8 @@ class PlotAstroData(AstroFrame):
             fontsize (float, optional): None means 15 if one channel else 20. Defaults to None.
             linewidth (float, optional): Width of the bar. Defaults to 3.
         """
-        if length == 0 or label == '':
-            print('Please input length and label.')
+        if length == 0:
+            print('Please input length to add_scalebar().')
             return
         if fontsize is None:
             fontsize = 20 if len(self.ax) == 1 else 15
@@ -857,16 +857,16 @@ class PlotAstroData(AstroFrame):
             print('RGB shapes mismatch. Skip add_rgb.')
             return
 
-        for i in range(3):
-            c[i] = (c[i] - _kw['vmin'][i]) \
-                   / (_kw['vmax'][i] - _kw['vmin'][i]) * 255
+        for i, (cmin, cmax) in enumerate(zip(_kw['vmin'], _kw['vmax'])):
+            if cmax > cmin:
+                c[i] = (c[i] - cmin) / (cmax - cmin) * 255
             c[i] = self.vskipfill(c[i], v)
-        size = np.shape(c[0][0])
-        for axnow, red, green, blue in zip(self.ax, *c):
-            im = Image.new('RGB', size[::-1], (128, 128, 128))
-            rgb = [red[::-1, :], green[::-1, :], blue[::-1, :]]
-            for j in range(size[0]):
-                for i in range(size[1]):
+        size = np.shape(c[0][0])[::-1]
+        c = np.moveaxis(c, 1, 0)[:, :, ::-self.ydir, ::-self.xdir]
+        for axnow, rgb in zip(self.ax, c):
+            im = Image.new('RGB', size, (128, 128, 128))
+            for j in range(size[1]):
+                for i in range(size[0]):
                     value = tuple(int(a[j, i]) for a in rgb)
                     im.putpixel((i, j), value)
             axnow.imshow(im, extent=[x[0], x[-1], y[0], y[-1]])

{plotastrodata-1.2.9 → plotastrodata-1.3.0}/plotastrodata.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: plotastrodata
-Version: 1.2.9
+Version: 1.3.0
 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