plotastrodata 1.8.18__tar.gz → 1.9.1__tar.gz

{plotastrodata-1.8.18/plotastrodata.egg-info → plotastrodata-1.9.1}/PKG-INFO

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

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

{plotastrodata-1.8.18 → plotastrodata-1.9.1}/plotastrodata/fitting_utils.py

@@ -34,6 +34,18 @@ def logp(x: np.ndarray) -> float:
         return -np.inf
 
 
+def _get_GR(samples: np.ndarray, nwalkers: int, ndata: int, dim: int
+            ) -> np.ndarray:
+    # Gelman-Rubin statistics #
+    B = np.std(np.mean(samples, axis=1), axis=0)
+    W = np.mean(np.std(samples, axis=1), axis=0)
+    V = (len(samples[0]) - 1) / len(samples[0]) * W \
+        + (nwalkers + 1) / (nwalkers - 1) * B
+    d = ndata - dim - 1
+    GR = np.sqrt((d + 3) / (d + 1) * V / W)
+    return GR
+
+
 class EmceeCorner():
     warnings.simplefilter('ignore', RuntimeWarning)
 
@@ -130,7 +142,8 @@ class EmceeCorner():
                 samples = sampler.chain[0, :, nburnin:, :]  # temperatures, walkers, steps, dim
             else:
                 if ncores > 1:
-                    print('Use logl as log_prob_fn to avoid function-in-function.')
+                    print('Use logl as log_prob_fn to avoid'
+                          + ' function-in-function.')
                     log_prob_fn = self.logl
                 else:
                     def log_prob_fn(x):
@@ -147,14 +160,8 @@ class EmceeCorner():
                     sampler.run_mcmc(pos0, nsteps)
                 samples = sampler.chain[:, nburnin:, :]  # walkers, steps, dim
             if grcheck:
-                # Gelman-Rubin statistics #
-                B = np.std(np.mean(samples, axis=1), axis=0)
-                W = np.mean(np.std(samples, axis=1), axis=0)
-                V = (len(samples[0]) - 1) / len(samples[0]) * W \
-                    + (nwalkers + 1) / (nwalkers - 1) * B
-                d = self.ndata - self.dim - 1
-                GR = np.sqrt((d + 3) / (d + 1) * V / W)
-                ###########################
+                GR = _get_GR(samples=samples, nwalkers=nwalkers,
+                             ndata=self.ndata, dim=self.dim)
             else:
                 GR = np.zeros(self.dim)
             if i == ntry - 1 and np.max(GR) > 1.25:
@@ -162,7 +169,7 @@ class EmceeCorner():
 
         self.samples = samples
         if savechain is not None:
-            np.save(savechain.replace('.npy', '') + '.npy', samples)
+            np.save(savechain.removesuffix('.npy') + '.npy', samples)
         if pt:
             lnps = sampler.logprobability[0]  # [0] is in the temperature axis.
             idx_best = np.unravel_index(np.argmax(lnps), lnps.shape)

{plotastrodata-1.8.18 → plotastrodata-1.9.1}/plotastrodata/plot_utils.py

@@ -131,19 +131,18 @@ def get_figsize(xmin: float, xmax: float, ymin: float, ymax: float,
     return figsize
 
 
-def _get_gridwidth(mode: str, rmax: float) -> tuple[float, int]:
-    # 10^1.5 / 15 ~ 2 grids for R.A.
-    # 10^0.5 ~ 3 grids for Dec.
-    scale = 1.5 if mode == 'ra' else 0.5
-    x = np.log10(2. * rmax) - scale
-    order = np.floor(x)
-    frac = x - order
-    if frac <= 0.33:
-        base = 1
-    elif frac <= 0.68:
-        base = 2
+def _get_gridwidth(mode: str, rmax: float, cos_dec: float
+                   ) -> tuple[float, int]:
+    # Length in the units of s for R.A. and " for Dec., respectively.
+    length = 2 * rmax / (15 * cos_dec if mode == 'ra' else 1)
+    p = np.floor(np.log10(length))
+    b = length / 10**p
+    if b <= 2:
+        base, order = 5, p - 1
+    elif b <= 4:
+        base, order = 1, p
     else:
-        base = 5
+        base, order = 2, p
     return base * 10**order, int(order)
 
 
@@ -222,43 +221,51 @@ class Stretcher():
             getsigma = (islog + ispower) * novmin
             self.vmin = np.where(getsigma, sigma, vmin)
 
-    def do(self, x: list | np.ndarray) -> np.ndarray:
+    def do(self, x: list | np.ndarray, i: int = 0) -> np.ndarray:
         """Get the stretched values.
 
         Args:
             x (list | np.ndarray): Input array in the linear scale.
+            i (int): Which element is used in the case where the stretch parameters are lists.
 
         Returns:
             np.ndarray: Output stretched array.
         """
+        st = self.stretch[i] if self.n > 1 else self.stretch
+        stsc = self.stretchscale[i] if self.n > 1 else self.stretchscale
+        stpw = self.stretchpower[i] if self.n > 1 else self.stretchpower
         t = np.array(x)
-        match self.stretch:
+        match st:
             case 'log':
                 t = np.log10(t)  # To be consistent with logcbticks().
             case 'asinh':
-                t = np.arcsinh(t / self.stretchscale)
+                t = np.arcsinh(t / stsc)
             case 'power':
-                p = 1e-6 if self.stretchpower == 0 else self.stretchpower
+                p = 1e-6 if stpw == 0 else stpw
                 t = t**p / p
         return t
 
-    def undo(self, x: list | np.ndarray) -> np.ndarray:
+    def undo(self, x: list | np.ndarray, i: int = 0) -> np.ndarray:
         """Get the linear values from the stretched values.
 
         Args:
             x (list | np.ndarray): Input stretched array.
+            i (int): Which element is used in the case where the stretch parameters are lists.
 
         Returns:
             np.ndarray: Output array in the linear scale.
         """
+        st = self.stretch[i] if self.n > 1 else self.stretch
+        stsc = self.stretchscale[i] if self.n > 1 else self.stretchscale
+        stpw = self.stretchpower[i] if self.n > 1 else self.stretchpower
         t = np.array(x)
-        match self.stretch:
+        match st:
             case 'log':
                 t = 10**t  # To be consistent with logcbticks().
             case 'asinh':
-                t = np.sinh(t) * self.stretchscale
+                t = np.sinh(t) * stsc
             case 'power':
-                p = 1e-6 if self.stretchpower == 0 else self.stretchpower
+                p = 1e-6 if stpw == 0 else stpw
                 t = (t * p)**(1 / p)
         return t
 
@@ -277,7 +284,7 @@ class Stretcher():
         vmaxout = [self.vmax] if single else self.vmax
         dataout = [data] if single else data
         for i, (c, v0, v1) in enumerate(zip(dataout, vminout, vmaxout)):
-            dataout[i] = cout = self.do(c.clip(v0, v1))
+            dataout[i] = cout = self.do(c.clip(v0, v1), i)
             vminout[i] = np.nanmin(cout)
             vmaxout[i] = np.nanmax(cout)
         if single:
@@ -428,7 +435,7 @@ def kwargs2instance(cls: type[T], kw: dict) -> T:
 
     Args:
         cls (class): Class to make the instance.
-        kw (dict): Parameters to make Stretcher.
+        kw (dict): Parameters to make the instance.
 
     Returns:
         instance: an instance of cls made from the parameters in kwargs.
@@ -787,7 +794,9 @@ class PlotAstroData(AstroFrame):
     def _set_colorbar(self, mappable, ch: int, show_cbar: bool,
                       cblabel: str, cbformat: str,
                       cbticks: list | None, cbticklabels: list | None,
-                      cblocation: str, st: Stretcher):
+                      cblocation: str,
+                      cblabelfontsize: int, cbtickfontsize: int,
+                      st: Stretcher):
         if not show_cbar:
             return
 
@@ -803,8 +812,8 @@ class PlotAstroData(AstroFrame):
             cax = plt.axes([0.88, 0.105, 0.015, 0.77])
             cb = fig.colorbar(mappable[ch], cax=cax, label=cblabel,
                               format=cbformat)
-        cb.ax.tick_params(labelsize=14)
-        font = mpl.font_manager.FontProperties(size=16)
+        cb.ax.tick_params(labelsize=cbtickfontsize)
+        font = mpl.font_manager.FontProperties(size=cblabelfontsize)
         cb.ax.yaxis.label.set_font_properties(font)
         if cbticks is None and st.stretch == 'log':
             cbticks, cbticklabels = logcbticks(10**st.vmin, 10**st.vmax)
@@ -825,6 +834,8 @@ class PlotAstroData(AstroFrame):
                   cbticks: list[float] | None = None,
                   cbticklabels: list[str] | None = None,
                   cblocation: str = 'right',
+                  cblabelfontsize: int = 16,
+                  cbtickfontsize: int = 14,
                   **kwargs) -> None:
         """Use Axes.pcolormesh of matplotlib. kwargs must include the arguments of AstroData to specify the data to be plotted. kwargs may include the arguments for Stretcher (stretch, stretchscale, and stretchpower) to specify the stretch parameters. kwargs may include arguments of Beam; a dict of beam_kwargs specifies the beam patch in more detail. kwargs may include xskiip and yskip.
 
@@ -835,6 +846,8 @@ class PlotAstroData(AstroFrame):
             cbticks (list, optional): Ticks of colorbar. Defaults to None.
             cbticklabels (list, optional): Ticklabels of colorbar. Defaults to None.
             cblocation (str, optional): 'left', 'top', 'left', 'right'. Only for 2D images. Defaults to 'right'.
+            cblabelfontsize (int, optional): Fontsize for the colorbar label. This is independent of set_rcparams().
+            cbtickfontsize (int, optional): Fontsize for the colorbar ticks. This is independent of set_rcparams().
         """
         self._kw = {'cmap': 'cubehelix', 'alpha': 1,
                     'edgecolors': 'none', 'zorder': 1,
@@ -861,7 +874,8 @@ class PlotAstroData(AstroFrame):
                 p[ch] = pnow
         for ch in self.bottomleft:
             self._set_colorbar(p, ch, show_cbar, cblabel, cbformat,
-                               cbticks, cbticklabels, cblocation, st)
+                               cbticks, cbticklabels, cblocation,
+                               cblabelfontsize, cbtickfontsize, st)
 
     def add_contour(self,
                     levels: list[float] = [-12, -6, -3, 3, 6, 12, 24, 48, 96, 192, 384],
@@ -1088,21 +1102,22 @@ class PlotAstroData(AstroFrame):
                  'dec': {'d': r'$^{\circ}$',
                          'm': r'$^{\prime}$',
                          's': r'.$\hspace{-0.4}^{\prime\prime}$'}}
-        cos_dec = np.cos(np.radians(coord2xy(center)[1]))
+        dec_center = coord2xy(center)[1]
+        sign_dec = np.sign(dec_center)
+        cos_dec = np.cos(np.radians(dec_center))
         intgrid = np.array([-3, -2, -1, 0, 1, 2, 3])
-        i_mid = (len(intgrid) - 1) // 2
 
         def makegrid(mode: str):
             second = float(get_sec(center, mode))
             no_sec = on_min_scale and (mode == 'dec')
             # gridwidth is a float like 2 x 10^order (arcsec).
-            gridwidth, order = _get_gridwidth(mode, self.rmax)
+            gridwidth, order = _get_gridwidth(mode, self.rmax, cos_dec)
             # ndigits = -1 is the largest case for 10", 20", ...
             decimals = str(max(-order, 0))
             rounded = round(second, ndigits=max(-order, -1))
             # Get a grid point closest to the input second.
             rounded = round(rounded / gridwidth) * gridwidth
-            factor = 15 * cos_dec if mode == 'ra' else 1
+            factor = 15 * cos_dec if mode == 'ra' else sign_dec
             ticks = (intgrid * gridwidth - second + rounded) * factor
             ticksminor = np.linspace(ticks[0], ticks[-1], 6*nticksminor + 1)
             tickvalues = get_tickvalues(ticks, mode, no_sec)
@@ -1114,14 +1129,18 @@ class PlotAstroData(AstroFrame):
 
         xticks, xticksminor, xticklabels = makegrid('ra')
         yticks, yticksminor, yticklabels = makegrid('dec')
-        ra_hm = get_hmdm(xy2coord([xticks[i_mid] / 3600., 0], center), 'ra')
-        dec_dm = get_hmdm(xy2coord([0, yticks[i_mid] / 3600.], center), 'dec')
+        i_ref = np.where(np.abs(xticks) < self.rmax)[0][-1]
+        idx_top = -1 if sign_dec > 0 else 0
+        j_ref = np.where(np.abs(yticks) < self.rmax)[0][idx_top]
+        ra_hm = get_hmdm(xy2coord([xticks[i_ref] / 3600., 0], center), 'ra')
+        dec_dm = get_hmdm(xy2coord([0, yticks[j_ref] / 3600.], center), 'dec')
         if on_min_scale:
             dec_dm = dec_dm.split('d')[0] + 'd'
         ra_hm = ra_hm.translate(str.maketrans(units['ra']))
         dec_dm = dec_dm.translate(str.maketrans(units['dec']))
-        xticklabels[i_mid] = ra_hm + xticklabels[i_mid]
-        yticklabels[i_mid] = dec_dm + '\n' + yticklabels[i_mid]
+        textpad = ' ' * 12  # To shift the tick label to left.
+        xticklabels[i_ref] = ra_hm + xticklabels[i_ref] + textpad
+        yticklabels[j_ref] = dec_dm + '\n' + yticklabels[j_ref]
         pa2 = PlotAxes2D(True, None, 'linear', 'linear',
                          self.Xlim, self.Ylim, xlabel, ylabel,
                          xticks, yticks, xticklabels, yticklabels,

{plotastrodata-1.8.18 → plotastrodata-1.9.1/plotastrodata.egg-info}/PKG-INFO

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