plotastrodata 1.7.10.post1__tar.gz → 1.7.12__tar.gz

{plotastrodata-1.7.10.post1/plotastrodata.egg-info → plotastrodata-1.7.12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: plotastrodata
-Version: 1.7.10.post1
+Version: 1.7.12
 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.7.10.post1 → plotastrodata-1.7.12}/plotastrodata/__init__.py

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

{plotastrodata-1.7.10.post1 → plotastrodata-1.7.12}/plotastrodata/other_utils.py

@@ -1,7 +1,7 @@
 import warnings
 import numpy as np
 from scipy.optimize import curve_fit
-from scipy.special import exp1
+from scipy.special import erf
 from scipy.interpolate import RegularGridInterpolator as RGI
 
 from plotastrodata.matrix_utils import Mrot, dot2d
@@ -47,15 +47,15 @@ def estimate_rms(data: np.ndarray, sigma: float | str | None = 'hist'
        'med': use the median of data^2 assuming Gaussian.
        'iter': exclude outliers.
        'out': exclude inner 60% about axes=-2 and -1.
-       'hist': fit histgram with Gaussian.
-       'hist-pbcor': fit histgram with PB-corrected Gaussian.
+       'hist': fit histgram with Gaussian. This option can be combined with 'edge' and/or 'neg'.
+       'hist-pbcor': fit histgram with PB-corrected Gaussian. This option can be combined with 'edge' and/or 'neg'.
 
     Args:
         data (np.ndarray): N-D array.
         sigma (float or str): One of the methods above. Defaults to 'hist'.
 
     Returns:
-        float: the estimated root mean square of noise.
+        float: the estimated standard deviation of noise.
     """
     if sigma is None:
         return None
@@ -89,7 +89,7 @@ def estimate_rms(data: np.ndarray, sigma: float | str | None = 'hist'
         noise = np.nanstd(n)
         warning_offset(ave, noise)
     elif sigma == 'out':
-        n, n0, n1 = data.copy(), len(data), len(data[0])
+        n, n0, n1 = data * 1, len(data), len(data[0])
         n = np.moveaxis(n, [-2, -1], [0, 1])
         n[n0//5: n0*4//5, n1//5: n1*4//5] = np.nan
         if np.all(np.isnan(n)):
@@ -100,34 +100,37 @@ def estimate_rms(data: np.ndarray, sigma: float | str | None = 'hist'
             ave = np.nanmean(n)
             noise = np.nanstd(n)
             warning_offset(ave, noise)
-    elif sigma[:4] == 'hist':
-        m0, s0 = np.nanmean(data), np.nanstd(data)
-        hist, hbin = np.histogram(data[~np.isnan(data)],
-                                  bins=100, density=True,
+    elif 'hist' in sigma:
+        n = data * 1
+        if 'edge' in sigma:
+            n = n[::len(n) - 1]
+        if 'neg' in sigma:
+            n = n[n < 0]
+            n = np.r_[n, -n]
+        n = n[~np.isnan(n)]
+        m0, s0 = np.mean(n), np.std(n)
+        hist, hbin = np.histogram(n, bins=100, density=True,
                                   range=(m0 - s0 * 3.5,
                                          m0 + s0 * 3.5))
         hist, hbin = hist * s0, (hbin[:-1] + hbin[1:]) / 2 / s0
-        if sigma[4:] == '-pbcor':
-            def g(x, s, R):
-                xn = x / np.sqrt(2) / s
-                pbcor = np.exp2(R**2)
-                y1 = xn**2
-                y2 = y1 / pbcor**2
-                area = 2 * np.sqrt(2 * np.pi) * s * (pbcor - 1)
-                p = (exp1(y2) - exp1(y1)) / area
+        if 'pbcor' in sigma:
+            def g(x, s, c, R):
+                y2 = (x - c) / np.sqrt(2) / s
+                y1 = (x * 2**(-R**2) - c) / np.sqrt(2) / s
+                p = erf(y2) - erf(y1)
+                p = p / (2 * np.log(2) * x * R**2)
                 return p
-            popt, _ = curve_fit(g, hbin, hist, p0=[1, 1],
-                                bounds=[[0.001, 0.001], [2, 2]])
-            ave = 0
-            noise = popt[0]
+            popt, _ = curve_fit(g, hbin, hist, p0=[1, 0, 1],
+                                bounds=[[0.001, -2, 0.001], [2, 2, 2]])
         else:
             def g(x, s, c):
                 xn = (x - c) / np.sqrt(2) / s
-                return np.exp(-xn**2) / np.sqrt(2 * np.pi) / s
+                p = np.exp(-xn**2) / np.sqrt(2 * np.pi) / s
+                return p
             popt, _ = curve_fit(g, hbin, hist, p0=[1, 0],
                                 bounds=[[0.001, -2], [2, 2]])
-            ave = popt[1]
-            noise = popt[0]
+        ave = popt[1]
+        noise = popt[0]
         warning_offset(ave, noise)
         noise = noise * s0
     return noise

{plotastrodata-1.7.10.post1 → plotastrodata-1.7.12/plotastrodata.egg-info}/PKG-INFO

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