plotastrodata 1.9.16__tar.gz → 1.9.17__tar.gz

{plotastrodata-1.9.16/plotastrodata.egg-info → plotastrodata-1.9.17}/PKG-INFO

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

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

{plotastrodata-1.9.16 → plotastrodata-1.9.17}/plotastrodata/analysis_utils.py

@@ -81,12 +81,19 @@ def _need_multipixels(method: Callable) -> Callable:
     return wrapper
 
 
+def _is_data_list(value: Any) -> bool:
+    c1 = isinstance(value, list)
+    c2 = any(a is not None for a in value)
+    c3 = all(a is None or isinstance(a, np.ndarray) for a in value)
+    return c1 and c2 and c3
+
+
 @dataclass
 class AstroData():
     """Data to be processed and parameters for processing the data.
 
     Args:
-        data (np.ndarray, optional): 2D or 3D array. Defaults to None.
+        data (np.ndarray, array-like, or list of np.ndarray, optional): A single 2D or 3D dataset, or a list of arrays for multiple datasets. Nested numeric lists are treated as one array-like dataset. Defaults to None.
         x (np.ndarray, optional): 1D array. Defaults to None.
         y (np.ndarray, optional): 1D array. Defaults to None.
         v (np.ndarray, optional): 1D array. Defaults to None.
@@ -101,7 +108,7 @@ class AstroData():
         pv (bool, optional): True means the data array is a position-velocity diagram. Defaults to False.
         bunit (str, optional): The unit of the data array. Defaults to ''.
     """
-    data: np.ndarray | None = None
+    data: np.ndarray | list[Any] | None = None
     x: np.ndarray | None = None
     y: np.ndarray | None = None
     v: np.ndarray | None = None
@@ -128,12 +135,14 @@ class AstroData():
             if n > 0:
                 self.data = None
         if self.data is not None:
-            if not isinstance(self.data, list):
-                n = 1
-            elif any(a is not None for a in self.data):
+            if _is_data_list(self.data):
                 n = len(self.data)
-            else:
+            elif (isinstance(self.data, list)
+                  and not any(a is not None for a in self.data)):
                 n = 0
+            else:
+                self.data = np.asarray(self.data)
+                n = 1
         if n == 0:
             print('Either data or fitsimage must be given.')
         self.n = n
@@ -319,7 +328,7 @@ class AstroData():
             pixelperbeam = Omega / np.abs(self.dx * self.dy)
         else:
             pixelperbeam = 1.
-        s = 'sigma is multiplied by sqrt(pixel-per-beam)' \
+        s = 'In the fitting, sigma is multiplied by sqrt(pixel-per-beam)' \
             + ' to consider the noise correlation in a beam.' \
             + ' This correction is relatively conservative.'
         warnings.warn(s, UserWarning)
@@ -360,7 +369,7 @@ class AstroData():
         z = self.data if chan is None else self.data[chan]
         Omega = np.pi * self.beam[0] * self.beam[1] / 4 / np.log(2)
         pixelperbeam = Omega / np.abs(self.dx * self.dy)
-        s = 'sigma is multiplied by sqrt(pixel-per-beam)' \
+        s = 'In the fitting, sigma is multiplied by sqrt(pixel-per-beam)' \
             + ' to consider the noise correlation in a beam.' \
             + ' This correction is relatively conservative.'
         warnings.warn(s, UserWarning)

{plotastrodata-1.9.16 → plotastrodata-1.9.17/plotastrodata.egg-info}/PKG-INFO

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