isgri 0.2.0__py3-none-any.whl → 0.3.0__py3-none-any.whl

isgri/utils/quality.py

@@ -62,7 +62,7 @@ class QualityMetrics:
         time, counts = self.lightcurve.rebin_by_modules(
             binsize=self.binsize, emin=self.emin, emax=self.emax, local_time=self.local_time
         )
-        module_data = {"time": time, "counts": counts}
+        module_data = {"time": time, "counts": np.asarray(counts)}
         self.module_data = module_data
         return module_data
 
@@ -71,20 +71,36 @@ class QualityMetrics:
         Compute reduced chi-squared for count data.
 
         Args:
-            counts (ndarray): Count array(s) to analyze.
-            return_all (bool, optional): If True, returns chi-squared for each array. If False, returns mean. Defaults to False.
+            counts (ndarray): Count array(s) to analyze. Shape: (n_modules, n_bins) or (n_bins,)
+            return_all (bool, optional): If True, returns detailed results. If False, returns weighted mean. Defaults to False.
 
         Returns:
-            float or ndarray: Reduced chi-squared value(s).
+            If return_all=False:
+                float: Weighted mean chi-squared (weighted by total counts per module)
+            If return_all=True:
+                tuple: (chi_squared, dof, no_counts) where:
+                    - chi_squared: Raw chi-squared values per module
+                    - dof: Degrees of freedom per module (n_bins - 1 excluding NaN)
+                    - no_counts: Total counts per module
         """
         counts = np.asarray(counts)
         counts = np.where(counts == 0, np.nan, counts)
         mean_counts = np.nanmean(counts, axis=-1, keepdims=True)
         chi_squared = np.nansum((counts - mean_counts) ** 2 / mean_counts, axis=-1)
-        dof = counts.shape[-1] - 1
+
+        # DOF = number of non-empty bins minus 1
+        nan_mask = ~np.isnan(counts)
+        dof = np.sum(nan_mask, axis=-1) - 1
+        no_counts = np.nansum(counts, axis=-1)
+
         if return_all:
-            return chi_squared / dof
-        return np.nanmean(chi_squared / dof)
+            return chi_squared, dof, no_counts
+
+        if np.sum(no_counts) == 0 or np.all(dof <= 0):
+            return np.nan
+        
+        # Weight by total counts per module
+        return np.average(chi_squared / dof, weights=no_counts)
 
     def raw_chi_squared(self, counts=None, return_all=False):
         """

{isgri-0.2.0.dist-info → isgri-0.3.0.dist-info}/METADATA

@@ -1,13 +1,13 @@
 Metadata-Version: 2.4
 Name: isgri
-Version: 0.2.0
+Version: 0.3.0
 Summary: Python package for INTEGRAL IBIS/ISGRI lightcurve analysis
 Author: Dominik Patryk Pacholski
 License: MIT
 License-File: LICENSE
 Requires-Python: >=3.10
-Requires-Dist: astropy>=7.2.0
-Requires-Dist: numpy>=2.3.5
+Requires-Dist: astropy
+Requires-Dist: numpy
 Description-Content-Type: text/markdown
 
 # isgri

{isgri-0.2.0.dist-info → isgri-0.3.0.dist-info}/RECORD

@@ -3,9 +3,9 @@ isgri/utils/__init__.py,sha256=H83Al7urc6LNW5KUzUBRdtRBUTahiZmkehKFiK90RrU,183
 isgri/utils/file_loaders.py,sha256=HBQ-n-jFhcP1cxykemBFYTZ72ydJNQrZMUQTeZ2dSnw,5509
 isgri/utils/lightcurve.py,sha256=VGRWcpOMnh8Rrbo-EETKAevhYYBZe55IuRQOw_cIfvY,10243
 isgri/utils/pif.py,sha256=oxndfoZp-y9FO_TXcCP3dmesvh-sC7hAy2u_1YwGitw,1317
-isgri/utils/quality.py,sha256=vNOkIFOkOTP1FAy_1-t5Xvi38gp6UNgXJN3T-DtM8es,7209
+isgri/utils/quality.py,sha256=TZGXnao6hQ2STlI8S8JIfaldPAfdMORQJ0IH_rilFu4,7930
 isgri/utils/time_conversion.py,sha256=47aTXn6cvi-LjOptDY2W-rjeF_PjthZer61VIsJqsro,908
-isgri-0.2.0.dist-info/METADATA,sha256=n3Wxho_x45DSjVi1QQs3eTVmU9_HP1sLsuXFttTMns0,1781
-isgri-0.2.0.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-isgri-0.2.0.dist-info/licenses/LICENSE,sha256=Q8oxmHR1cSnEXSHCjY3qeXMtupZI_1ZQZ1MBt4oeANE,1102
-isgri-0.2.0.dist-info/RECORD,,
+isgri-0.3.0.dist-info/METADATA,sha256=MofiJhRbXTPhMNOQAtOSc4QmsYEIm8ckXayvr2LTIMQ,1767
+isgri-0.3.0.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+isgri-0.3.0.dist-info/licenses/LICENSE,sha256=Q8oxmHR1cSnEXSHCjY3qeXMtupZI_1ZQZ1MBt4oeANE,1102
+isgri-0.3.0.dist-info/RECORD,,