plotastrodata 1.8.4__tar.gz → 1.8.6__tar.gz

{plotastrodata-1.8.4/plotastrodata.egg-info → plotastrodata-1.8.6}/PKG-INFO

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

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

{plotastrodata-1.8.4 → plotastrodata-1.8.6}/plotastrodata/analysis_utils.py

@@ -155,6 +155,12 @@ class AstroData():
             ws = ', '.join([f'{s:d}' for s in w[1:]])
             print(f'width was changed to [{ws}].')
         newsize = size // w
+        if w[1] > 1:
+            print(f'sigma has been divided by sqrt({w[1]:d})'
+                  + ' because of binning in the v-axis.')
+            self.sigma = self.sigma / np.sqrt(w[1])
+        if w[2] > 1 or w[3] > 1:
+            print('Binning in the x- or y-axis does not update sigma.')
         grid = [None, self.v, self.y, self.x]
         dgrid = [None, self.dv, self.dy, self.dx]
         for n in range(1, 4):
@@ -181,8 +187,6 @@ 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,

{plotastrodata-1.8.4 → plotastrodata-1.8.6}/plotastrodata/noise_utils.py

@@ -142,6 +142,9 @@ class Noise:
         """
         _kw = {'nwalkersperdim': 4, 'nsteps': 200, 'nburnin': 0}
         _kw.update(kwargs)
+        if not hasattr(self, 'hist'):
+            self.gen_histogram()
+            print('Noise.gen_histogram() was done with default arguments.')
         f = gauss_pbcor if 'pbcor' in self.sigma else gauss
         model = normalize(range=self.range, bins=self.bins)(f)
         bounds = [[0.1, 2], [-2, 2]]
@@ -167,6 +170,9 @@ class Noise:
             savefig (dict or str, optional): For plt.figure().savefig(). Defaults to None.
             show (bool, optional): True means doing plt.show(). Defaults to False.
         """
+        if not hasattr(self, 'model'):
+            self.fit_histogram()
+            print('Noise.fit_histogram() was done with default arguments.')
         fig, ax = plt.subplots()
         ax.plot(self.hbin, self.hist, drawstyle='steps-mid')
         ax.plot(self.hbin, self.model, '-')

{plotastrodata-1.8.4 → plotastrodata-1.8.6}/plotastrodata/plot_utils.py

@@ -65,6 +65,36 @@ def logticks(ticks: list[float], lim: list[float, float]
     return newticks, newlabels
 
 
+def logcbticks(vmin: float = -3.01, vmax: float = 3.01
+               ) -> tuple[np.ndarray, np.ndarray]:
+    """Make nice ticks for a log color bar.
+
+    Args:
+        vmin (float, optional): Minimum value. Defaults to -3.01.
+        vmax (float, optional): Maximum value. Defaults to 3.01.
+
+    Returns:
+        tuple: (ticks, ticklabels).
+    """
+    ticks = np.outer(np.logspace(-3, 3, 7), np.arange(1, 10))
+    ticklabels = []
+    for i in range(-3, 4):
+        ii = np.abs(min(i, 0))
+        ii = f'{ii:d}'
+        for j in range(1, 10):
+            jj = j * 10**i
+            if j in [1, 2, 5]:
+                s = f'{jj:.{ii}f}'
+            else:
+                s = ''
+            ticklabels.append(s)
+    ticks = np.log10(np.ravel(ticks))
+    ticklabels = np.ravel(ticklabels)
+    ticklabels = ticklabels[((vmin < ticks) * (ticks < vmax))]
+    ticks = ticks[((vmin < ticks) * (ticks < vmax))]
+    return ticks, ticklabels
+
+
 @dataclass
 class PlotAxes2D():
     """Use Axes.set_* to adjust x and y axes.
@@ -771,6 +801,7 @@ class PlotAstroData(AstroFrame):
             stretchscale = sigma
         cmin_org = _kw['vmin'] if 'vmin' in _kw else sigma
         c = set_minmax(c, stretch, stretchscale, stretchpower, sigma, _kw)
+        cmin, cmax = np.nanmin(c), np.nanmax(c)
         c = self.vskipfill(c, v)
         if type(self.channelnumber) is int:
             c = [c[self.channelnumber]]
@@ -810,13 +841,15 @@ class PlotAstroData(AstroFrame):
                         p = 1 - stretchpower
                         cbticks = (cbticks / cmin_org)**p - 1
                         cbticks = cbticks / p / np.log(10)
+            if stretch == 'log' and cbticks is None:
+                cbticks, cbticklabels = logcbticks(cmin, cmax)
             if cbticks is not None:
                 cb.set_ticks(cbticks)
             if cbticklabels is not None:
                 cb.set_ticklabels(cbticklabels)
             elif stretch in ['log', 'asinh', 'power']:
                 t = cb.get_ticks()
-                t = t[(_kw['vmin'] < t) * (t < _kw['vmax'])]
+                t = t[(cmin < t) * (t < cmax)]
                 cb.set_ticks(t)
                 if stretch == 'log':
                     ticklin = 10**t

{plotastrodata-1.8.4 → plotastrodata-1.8.6/plotastrodata.egg-info}/PKG-INFO

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