plotastrodata 1.8.8__tar.gz → 1.8.9__tar.gz

{plotastrodata-1.8.8/plotastrodata.egg-info → plotastrodata-1.8.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: plotastrodata
-Version: 1.8.8
+Version: 1.8.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.8.8 → plotastrodata-1.8.9}/plotastrodata/__init__.py

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

{plotastrodata-1.8.8 → plotastrodata-1.8.9}/plotastrodata/plot_utils.py

@@ -308,8 +308,10 @@ def set_minmax(data: np.ndarray, stretch: str, stretchscale: float,
     for k in ['vmin', 'vmax']:
         if k not in kw:
             kw[k] = [None] * n
-    stretch = np.where(np.equal(stretch, None), sigma, stretch)
-    cmin = np.where(np.equal(kw['vmin'], None), sigma, kw['vmin'])
+    isnan = np.equal(stretchscale, None)
+    stretchscale = np.where(isnan, sigma, stretchscale)
+    isnan = np.equal(kw['vmin'], None)
+    cmin = np.where(isnan, sigma, kw['vmin'])
 
     argslist = (stretch, stretchscale, stretchpower)
     for i, stretch_args in enumerate(zip(*argslist)):
@@ -861,20 +863,21 @@ class PlotAstroData(AstroFrame):
             cbticks = do_stretch(cbticks, *stretch_args)
         if cbticks is None and stretch == 'log':
             cbticks, cbticklabels = logcbticks()
-        if cbticks is not None:
-            cond = (vmin < cbticks) * (cbticks < vmax)
-            cb.set_ticks(cbticks[cond])
-            if cbticklabels is not None:
-                tl = np.array(cbticklabels)[cond]
-            else:
-                t = undo_stretch(cb.get_ticks(), *stretch_args)
-                tl = [f'{d:{cbformat[1:]}}' for d in t]
-            cb.set_ticklabels(tl)
+        if cbticks is None:
+            cbticks = cb.get_ticks()
+        cond = (vmin < cbticks) * (cbticks < vmax)
+        cb.set_ticks(cbticks[cond])
+        if cbticklabels is not None:
+            tl = np.array(cbticklabels)[cond]
+        else:
+            t = undo_stretch(cb.get_ticks(), *stretch_args)
+            tl = [f'{d:{cbformat[1:]}}' for d in t]
+        cb.set_ticklabels(tl)
 
     def add_color(self,
                   stretch: str = 'linear',
                   stretchscale: float | None = None,
-                  stretchpower: float = 1,
+                  stretchpower: float = 0.5,
                   show_cbar: bool = True,
                   cblabel: str | None = None,
                   cbformat: float = '%.1e',
@@ -887,7 +890,7 @@ class PlotAstroData(AstroFrame):
         Args:
             stretch (str, optional): 'log', 'asinh', 'power', or 'linear'. Any other means 'linear'. 'log' means the mapped data are logarithmic. 'asinh' means the mapped data are arc sin hyperbolic. 'power' means the mapped data are power-law (see also stretchpower). Defaults to 'linear'.
             stretchscale (float, optional): Color scale is asinh(data / stretchscale). Defaults to None.
-            stretchpower (float, optional): Color scale is ((data / stretchscale)**stretchpower - 1) / stretchpower / ln(10). 1 means the linear scale, while 0 means the logarithmic scale. Defaults to 1.
+            stretchpower (float, optional): Color scale is ((data / stretchscale)**stretchpower - 1) / stretchpower / ln(10). 1 means the linear scale, while 0 means the logarithmic scale. Defaults to 0.5.
             show_cbar (bool, optional): Show color bar. Defaults to True.
             cblabel (str, optional): Colorbar label. Defaults to None.
             cbformat (float, optional): Format for ticklabels of colorbar. Defaults to '%.1e'.
@@ -905,7 +908,9 @@ class PlotAstroData(AstroFrame):
 
         if cblabel is None:
             cblabel = bunit
-        
+        if stretchscale is None:
+            stretchscale = sigma
+
         stretch_args = (stretch, stretchscale, stretchpower)
         c = set_minmax(c, *stretch_args, sigma, _kw)
         c = self.vskipfill(c, v)

{plotastrodata-1.8.8 → plotastrodata-1.8.9/plotastrodata.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: plotastrodata
-Version: 1.8.8
+Version: 1.8.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