plotastrodata 1.9.0__tar.gz → 1.9.2__tar.gz

{plotastrodata-1.9.0/plotastrodata.egg-info → plotastrodata-1.9.2}/PKG-INFO

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

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

{plotastrodata-1.9.0 → plotastrodata-1.9.2}/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.9.0 → plotastrodata-1.9.2}/plotastrodata/other_utils.py

@@ -35,7 +35,7 @@ def isdeg(s: str) -> bool:
 
 
 def nearest_index(arr: np.ndarray, x: float = 0) -> int:
-    """Get the index of the (sorted) arrary that gives a value nearest to x. This is equivalent to np.argmin(np.abs(arr - x)) but optimized for the sorted array.
+    """Get the index of the input arrary that gives a value nearest to the given value x. np.searchsorted() does not work with a descending array.
 
     Args:
         arr (np.ndarray): Sorted array.
@@ -44,8 +44,7 @@ def nearest_index(arr: np.ndarray, x: float = 0) -> int:
     Returns:
         int: The index that gives a value nearest to x.
     """
-    idx = np.searchsorted(arr, x).clip(1, len(arr) - 1)
-    return idx - 1 if x - arr[idx - 1] <= arr[idx] - x else idx
+    return np.argmin(np.abs(arr - x))
 
 
 def trim(data: np.ndarray | None = None, x: np.ndarray | None = None,
@@ -72,8 +71,8 @@ def trim(data: np.ndarray | None = None, x: np.ndarray | None = None,
     def get_bounds(arr, lim):
         if arr is None or lim is None or None in lim:
             return arr, 0, None
-        lo = nearest_index(arr, max(np.min(arr), lim[0]))
-        hi = nearest_index(arr, min(np.max(arr), lim[1]))
+        lo = nearest_index(arr, max(np.min(arr), np.min(lim)))
+        hi = nearest_index(arr, min(np.max(arr), np.max(lim)))
         lo, hi = sorted((lo, hi))
         return arr[lo:hi + 1], lo, hi + 1
 

{plotastrodata-1.9.0 → plotastrodata-1.9.2}/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.45 / 15 ~ 2 grids for R.A.
-    # 10^0.45 ~ 3 grids for Dec.
-    scale = 1.45 if mode == 'ra' else 0.45
-    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)
 
 
@@ -1107,13 +1106,12 @@ class PlotAstroData(AstroFrame):
         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))
@@ -1131,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.9.0 → plotastrodata-1.9.2/plotastrodata.egg-info}/PKG-INFO

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