plotastrodata 1.7.8__tar.gz → 1.7.10__tar.gz

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

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

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

{plotastrodata-1.7.8 → plotastrodata-1.7.10}/plotastrodata/analysis_utils.py

@@ -379,7 +379,8 @@ class AstroData():
         Returns:
             tuple: (bins, histogram)
         """
-        hist, hbin = np.histogram(self.data, **kwargs)
+        hist, hbin = np.histogram(self.data[~np.isnan(self.data)],
+                                  **kwargs)
         hbin = (hbin[:-1] + hbin[1:]) / 2
         return hbin, hist
 

{plotastrodata-1.7.8 → plotastrodata-1.7.10}/plotastrodata/fits_utils.py

@@ -267,7 +267,7 @@ class FitsData:
             vaxis = '2' if pv else '3'
             key = f'CUNIT{vaxis}'
             cunitv = h[key]
-            match cunitv:
+            match cunitv.strip():
                 case 'Hz':
                     if freq == 0:
                         print('v is frequency because restfreq=0.')

{plotastrodata-1.7.8 → plotastrodata-1.7.10}/plotastrodata/other_utils.py

@@ -1,7 +1,7 @@
 import warnings
 import numpy as np
 from scipy.optimize import curve_fit, OptimizeWarning
-from scipy.special import erf
+from scipy.special import exp1
 from scipy.interpolate import RegularGridInterpolator as RGI
 
 from plotastrodata.matrix_utils import Mrot, dot2d
@@ -104,21 +104,30 @@ def estimate_rms(data: np.ndarray, sigma: float | str | None = 'hist'
         m0, s0 = np.nanmean(data), np.nanstd(data)
         hist, hbin = np.histogram(data[~np.isnan(data)],
                                   bins=100, density=True,
-                                  range=(m0 - s0 * 5, m0 + s0 * 5))
+                                  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, c, R):
-                xn = (x - c) / np.sqrt(2) / s
-                return (erf(xn) - erf(xn * np.exp(-R**2))) / (2 * (x-c) * R**2)
+            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
+                return p
+            popt, _ = curve_fit(g, hbin, hist, p0=[1, 1],
+                                bounds=[[0.001, 0.001], [2, 2]])
+            ave = 0
+            noise = popt[0]
         else:
-            def g(x, s, c, _):
+            def g(x, s, c):
                 xn = (x - c) / np.sqrt(2) / s
                 return np.exp(-xn**2) / np.sqrt(2 * np.pi) / s
-        with warnings.catch_warnings():
-            warnings.simplefilter('ignore', OptimizeWarning)
-            popt, _ = curve_fit(g, hbin, hist, p0=[1, 0, 1])
-        ave = popt[1]
-        noise = popt[0]
+            popt, _ = curve_fit(g, hbin, hist, p0=[1, 0],
+                                bounds=[[0.001, -2], [2, 2]])
+            ave = popt[1]
+            noise = popt[0]
         warning_offset(ave, noise)
         noise = noise * s0
     return noise

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

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