plotastrodata 1.2.7.post3__tar.gz → 1.2.9__tar.gz

{plotastrodata-1.2.7.post3 → plotastrodata-1.2.9}/PKG-INFO

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

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

{plotastrodata-1.2.7.post3 → plotastrodata-1.2.9}/plotastrodata/analysis_utils.py

@@ -59,8 +59,6 @@ def quadrantmean(data: np.ndarray, x: np.ndarray, y: np.ndarray,
     else:
         print('quadrants must be \'13\' or \'24\'.')
     datanew = (datanew + datanew[::-1, ::-1]) / 2.
-    print(np.shape(datanew), np.shape(xnew), np.shape(ynew))
-    print(np.shape(datanew[ny:, nx:]), np.shape(xnew[nx:]), np.shape(ynew[ny:]))
     return datanew[ny:, nx:], xnew[nx:], ynew[ny:]
 
 
@@ -759,7 +757,7 @@ class AstroFrame():
                                        vlim=self.vlim, pv=self.pv)
                 if grid[2] is not None and len(grid[2]) > 1 and grid[2][1] < grid[2][0]:
                     d.data[i], grid[2] = d.data[i][::-1], grid[2][::-1]
-                    print('Inverted velocity.')
+                    print('Velocity has been inverted.')
                 d.v = grid[2]
                 grid = grid[:3:2] if self.pv else grid[:2]
                 if self.swapxy:

{plotastrodata-1.2.7.post3 → plotastrodata-1.2.9}/plotastrodata/plot_utils.py

@@ -57,7 +57,7 @@ def logticks(ticks: list[float], lim: list[float, float]
     order = int(np.floor((np.log10(lim[1]))))
     b = (lim[1] // 10**order) * 10**order
     b = np.round(b, max(-order, 0))
-    newticks = np.sort(np.r_[a, ticks, b])
+    newticks = np.sort(np.unique(np.r_[a, ticks, b]))
     newlabels = [str(t if t < 1 else int(t)) for t in newticks]
     return newticks, newlabels
 
@@ -874,11 +874,42 @@ class PlotAstroData(AstroFrame):
         if show_beam:
             self.add_beam(beam=beam, beamcolor=beamcolor, beampos=beampos)
 
+    def _set_axis_shared(self, pa2: PlotAxes2D, title: dict | str | None):
+        """Internal method used in set_axis() and set_axis_radec().
+
+        Args:
+            pa2 (PlotAxes2D): This is instantiated in set_axis() or set_axis_radec().
+            title (dict | str | None): str means set_title(str) for 2D or fig.suptitle(str) for 3D. Defaults to None.
+        """
+        for ch, axnow in enumerate(self.ax):
+            pa2.set_xyaxes(axnow)
+            self.Xlim = pa2.xlim
+            self.Ylim = pa2.ylim
+            if not (ch in self.bottomleft):
+                plt.setp(axnow.get_xticklabels(), visible=False)
+                plt.setp(axnow.get_yticklabels(), visible=False)
+                axnow.set_xlabel('')
+                axnow.set_ylabel('')
+            if len(self.ax) == 1:
+                if self.fig is None:
+                    plt.figure(0).tight_layout()
+        if title is not None:
+            if len(self.ax) > 1:
+                t = {'y': 0.9}
+                t_in = {'t': title} if type(title) is str else title
+                t.update(t_in)
+                for i in range(self.npages):
+                    fig = plt.figure(i)
+                    fig.suptitle(**t)
+            else:
+                t = {'label': title} if type(title) is str else title
+                axnow.set_title(**t)
+
     def set_axis(self, title: dict | str | None = None, **kwargs) -> None:
         """Use Axes.set_* of matplotlib. kwargs can include the arguments of PlotAxes2D to adjust x and y axis.
 
         Args:
-            title (dict, optional): str means set_title(str) for 2D or fig.suptitle(str) for 3D. Defaults to None.
+            title (dict | str | None): str means set_title(str) for 2D or fig.suptitle(str) for 3D. Defaults to None.
         """
         _kw = {}
         _kw.update(kwargs)
@@ -902,34 +933,14 @@ class PlotAstroData(AstroFrame):
         if 'ylim' not in _kw:
             _kw['ylim'] = self.Ylim
         pa2 = kwargs2PlotAxes2D(_kw)
-        for ch, axnow in enumerate(self.ax):
-            pa2.set_xyaxes(axnow)
-            if not (ch in self.bottomleft):
-                plt.setp(axnow.get_xticklabels(), visible=False)
-                plt.setp(axnow.get_yticklabels(), visible=False)
-                axnow.set_xlabel('')
-                axnow.set_ylabel('')
-            if len(self.ax) == 1:
-                if self.fig is None:
-                    plt.figure(0).tight_layout()
-        if title is not None:
-            if len(self.ax) > 1:
-                t = {'y': 0.9}
-                t_in = {'t': title} if type(title) is str else title
-                t.update(t_in)
-                for i in range(self.npages):
-                    fig = plt.figure(i)
-                    fig.suptitle(**t)
-            else:
-                t = {'label': title} if type(title) is str else title
-                axnow.set_title(**t)
+        self._set_axis_shared(pa2=pa2, title=title)
 
     def set_axis_radec(self, center: str | None = None,
                        xlabel: str = 'R.A. (ICRS)',
                        ylabel: str = 'Dec. (ICRS)',
                        nticksminor: int = 2,
                        grid: dict | None = None, title: dict | None = None) -> None:
-        """Use ax.set_* of matplotlib.
+        """Use Axes.set_* of matplotlib. kwargs can include the arguments of PlotAxes2D to adjust x and y axis.
 
         Args:
             center (str, optional): Defaults to None, initial one.
@@ -937,7 +948,7 @@ class PlotAstroData(AstroFrame):
             ylabel (str, optional): Defaults to 'Dec. (ICRS)'.
             nticksminor (int, optional): Interval ratio of major and minor ticks. Defaults to 2.
             grid (dict, optional): True means merely grid(). Defaults to None.
-            title (dict, optional): str means set_title(str) for 2D or fig.suptitle(str) for 3D. Defaults to None.
+            title (dict | str | None): str means set_title(str) for 2D or fig.suptitle(str) for 3D. Defaults to None.
         """
         if self.rmax > 50.:
             print('WARNING: set_axis_radec() is not supported '
@@ -964,9 +975,9 @@ class PlotAstroData(AstroFrame):
         def makegrid(second, mode):
             second = float(second)
             if mode == 'ra':
-                scale, factor, sec = 1.5, 15 * np.cos(dec), r'$^{\rm s}$'
+                scale, factor, sec = 1.5, 15 * np.cos(dec), r'$^\mathrm{s}$'
             else:
-                scale, factor, sec = 0.5, 1, r'$^{\rm \prime\prime}$'
+                scale, factor, sec = 0.5, 1, r'$^{\prime\prime}$'
             sec = r'.$\hspace{-0.4}$' + sec
             dorder = log2r - scale - (order := np.floor(log2r - scale))
             if 0.00 < dorder <= 0.33:
@@ -998,34 +1009,14 @@ class PlotAstroData(AstroFrame):
         yticks, yticksminor, yticklabels = makegrid(dec_s, 'dec')
         ra_hm = get_hmdm(xy2coord([xticks[3] / 3600., 0], center), 0)
         dec_dm = get_hmdm(xy2coord([0, yticks[3] / 3600.], center), 1)
-        ra_hm = ra_hm.replace('h', r'$^{\rm h}$') + r'$^{\rm m}$'
+        ra_hm = ra_hm.replace('h', r'$^\mathrm{h}$') + r'$^\mathrm{m}$'
         dec_dm = dec_dm.replace('d', r'$^{\circ}$') + r'$^{\prime}$'
         xticklabels[3] = ra_hm + xticklabels[3]
         yticklabels[3] = dec_dm + '\n' + yticklabels[3]
         pa2 = PlotAxes2D(True, None, 'linear', 'linear', self.Xlim, self.Ylim,
                          xlabel, ylabel, xticks, yticks, xticklabels,
                          yticklabels, xticksminor, yticksminor, grid)
-        for ch, axnow in enumerate(self.ax):
-            pa2.set_xyaxes(axnow)
-            if not (ch in self.bottomleft):
-                plt.setp(axnow.get_xticklabels(), visible=False)
-                plt.setp(axnow.get_yticklabels(), visible=False)
-                axnow.set_xlabel('')
-                axnow.set_ylabel('')
-            if len(self.ax) == 1:
-                if self.fig is None:
-                    plt.figure(0).tight_layout()
-        if title is not None:
-            if len(self.ax) > 1:
-                t = {'y': 0.9}
-                t_in = {'t': title} if type(title) is str else title
-                t.update(t_in)
-                for i in range(self.npages):
-                    fig = plt.figure(i)
-                    fig.suptitle(**t)
-            else:
-                t = {'label': title} if type(title) is str else title
-                axnow.set_title(**t)
+        self._set_axis_shared(pa2=pa2, title=title)
 
     def savefig(self, filename: str | None = None,
                 show: bool = False, **kwargs) -> None:

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

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