plotastrodata 1.6.3.post1__tar.gz → 1.6.5__tar.gz

{plotastrodata-1.6.3.post1 → plotastrodata-1.6.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: plotastrodata
-Version: 1.6.3.post1
+Version: 1.6.5
 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
@@ -11,7 +11,7 @@ Classifier: Programming Language :: Python :: 3
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: astropy
+Requires-Dist: astropy>=7.2
 Requires-Dist: corner
 Requires-Dist: dynesty
 Requires-Dist: emcee

plotastrodata-1.6.5/plotastrodata/__init__.py

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

{plotastrodata-1.6.3.post1 → plotastrodata-1.6.5}/plotastrodata/analysis_utils.py

@@ -634,7 +634,8 @@ class AstroFrame():
         if self.fitsimage is not None and self.center is None:
             self.center = FitsData(self.fitsimage).get_center()
 
-    def pos2xy(self, poslist: list[str | list[float, float]] = []) -> np.ndarray:
+    def pos2xy(self, poslist: list[str | list[float, float]] = []
+               ) -> np.ndarray:
         """Text or relative to absolute coordinates.
 
          Args:

{plotastrodata-1.6.3.post1 → plotastrodata-1.6.5}/plotastrodata/coord_utils.py

@@ -80,12 +80,13 @@ def coord2xy(coords: str | list, coordorg: str = '00h00m00s 00d00m00s',
         c0 = c0.transform_to(frame=frame)
     clist = SkyCoord(coords, frame=frame)  # frame=None means ICRS.
     xy = c0.spherical_offsets_to(clist)
-    return np.array([xy[0].degree, xy[1].degree])
+    xy = np.array([xy[0].degree, xy[1].degree])
+    return xy
 
 
 def xy2coord(xy: list, coordorg: str = '00h00m00s 00d00m00s',
              frame: str | None = None, frameorg: str | None = None,
-             ) -> str:
+             ) -> str | np.ndarray:
     """Transform relative (deg, deg) to R.A.-Dec.
 
     Args:
@@ -105,10 +106,13 @@ def xy2coord(xy: list, coordorg: str = '00h00m00s 00d00m00s',
     coords = c0.spherical_offsets_by(*xy * units.degree)
     if frame is not None:
         coords = coords.transform_to(frame=frame)
-    s = coords.to_string('hmsdms')
+    coords = coords.to_string('hmsdms')
     if framename is not None:
-        s = f'{framename} {s}'
-    return s
+        if type(coords) is str:
+            coords = f'{framename} {coords}'
+        else:
+            coords = np.array([f'{framename} {s}' for s in coords])
+    return coords
 
 
 def rel2abs(xrel: float, yrel: float,

{plotastrodata-1.6.3.post1 → plotastrodata-1.6.5}/plotastrodata/plot_utils.py

@@ -408,7 +408,7 @@ class PlotAstroData(AstroFrame):
                 figsize = (ncols * 2 / sqrt_a, max(nrows*2, 3) * sqrt_a)
         for ch in range(nchan):
             n, i, j = ch2nij(ch)
-            if internalfig:
+            if internalfig and n not in plt.get_fignums():
                 fig = plt.figure(n, figsize=figsize)
             sharex = ax[nij2ch(n, i - 1, j)] if i > 0 else None
             sharey = ax[nij2ch(n, i, j - 1)] if j > 0 else None
@@ -431,8 +431,10 @@ class PlotAstroData(AstroFrame):
         self.allchan = np.arange(nv)
         self.bottomleft = nij2ch(np.arange(npages), nrows - 1, 0)
         self.channelnumber = channelnumber
+        self.v = v
 
-        def vskipfill(c: np.ndarray, v_in: np.ndarray = None) -> np.ndarray:
+        def vskipfill(c: np.ndarray, v_in: np.ndarray = None
+                      ) -> np.ndarray:
             """Skip and fill channels with nan.
 
             Args:
@@ -444,7 +446,14 @@ class PlotAstroData(AstroFrame):
             """
             if np.ndim(c) == 3:
                 if v_in is not None:
-                    if (k0 := np.argmin(np.abs(v - v_in[0]))) > 0:
+                    dv_org = self.v[1] - self.v[0]
+                    dv_in = v_in[1] - v_in[0]
+                    if np.abs(dv_in - dv_org) / dv_org > 0.01:
+                        print('Velocity resolution mismatch (>1%).',
+                              'The cube needs to be regridded',
+                              'outside plotastrodata.')
+                    k0 = np.argmin(np.abs(self.v - v_in[0]))
+                    if k0 > 0:
                         prenan = np.full((k0, *np.shape(c)[1:]), np.nan)
                         d = np.append(prenan, c, axis=0)
                     else:
@@ -454,8 +463,9 @@ class PlotAstroData(AstroFrame):
                 d = np.full((nv, *np.shape(c)), c)
             n = nchan if channelnumber is None else nv
             shape = (n - len(d), len(d[0]), len(d[0, 0]))
-            dnan = np.full(shape, d[0] * np.nan)
-            return np.concatenate((d, dnan), axis=0)
+            postnan = np.full(shape, d[0] * np.nan)
+            d = np.append(d, postnan, axis=0)
+            return d
         self.vskipfill = vskipfill
 
     def _map_init(self, kw: dict) -> tuple:
@@ -767,15 +777,18 @@ class PlotAstroData(AstroFrame):
             cb.ax.tick_params(labelsize=14)
             font = mpl.font_manager.FontProperties(size=16)
             cb.ax.yaxis.label.set_font_properties(font)
+            if cbticks is not None and ch // self.rowcol == 0:
+                cbticks = np.array(cbticks)
+                match stretch:
+                    case 'log':
+                        cbticks = np.log10(cbticks)
+                    case 'asinh':
+                        cbticks = np.arcsinh(cbticks / stretchscale)
+                    case 'power':
+                        p = 1 - stretchpower
+                        cbticks = (cbticks / cmin_org)**p - 1
+                        cbticks = cbticks / p / np.log(10)
             if cbticks is not None:
-                if stretch == 'log':
-                    cbticks = np.log10(cbticks)
-                elif stretch == 'asinh':
-                    cbticks = np.arcsinh(np.array(cbticks) / stretchscale)
-                elif stretch == 'power':
-                    cbticks = np.array(cbticks)
-                    p = 1 - stretchpower
-                    cbticks = ((cbticks / cmin_org)**p - 1) / p / np.log(10)
                 cb.set_ticks(cbticks)
             if cbticklabels is not None:
                 cb.set_ticklabels(cbticklabels)
@@ -1112,7 +1125,7 @@ class PlotAstroData(AstroFrame):
                 fig.savefig(fname, **_kw)
         if show:
             plt.show()
-        plt.close()
+        plt.close('all')
 
     def get_figax(self) -> tuple[object, object]:
         """Output the external fig and ax after plotting.

{plotastrodata-1.6.3.post1 → plotastrodata-1.6.5}/plotastrodata.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: plotastrodata
-Version: 1.6.3.post1
+Version: 1.6.5
 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
@@ -11,7 +11,7 @@ Classifier: Programming Language :: Python :: 3
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: astropy
+Requires-Dist: astropy>=7.2
 Requires-Dist: corner
 Requires-Dist: dynesty
 Requires-Dist: emcee

{plotastrodata-1.6.3.post1 → plotastrodata-1.6.5}/plotastrodata.egg-info/requires.txt

@@ -1,4 +1,4 @@
-astropy
+astropy>=7.2
 corner
 dynesty
 emcee

{plotastrodata-1.6.3.post1 → plotastrodata-1.6.5}/setup.cfg

@@ -16,7 +16,7 @@ packages = find:
 zip_safe = False
 python_requires = >=3.10
 install_requires = 
-	astropy
+	astropy >= 7.2
 	corner
 	dynesty
 	emcee

plotastrodata-1.6.3.post1/plotastrodata/__init__.py

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