lisaanalysistools 1.0.11__cp312-cp312-macosx_10_9_x86_64.whl → 1.0.12__cp312-cp312-macosx_10_9_x86_64.whl

{lisaanalysistools-1.0.11.dist-info → lisaanalysistools-1.0.12.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lisaanalysistools
-Version: 1.0.11
+Version: 1.0.12
 Home-page: https://github.com/mikekatz04/LISAanalysistools
 Author: Michael Katz
 Author-email: mikekatz04@gmail.com
@@ -66,7 +66,7 @@ Please read [CONTRIBUTING.md](CONTRIBUTING.md) for details on our code of conduc
 
 We use [SemVer](http://semver.org/) for versioning. For the versions available, see the [tags on this repository](https://github.com/mikekatz04/LISAanalysistools/tags).
 
-Current Version: 1.0.11
+Current Version: 1.0.12
 
 ## Authors/Developers
 

{lisaanalysistools-1.0.11.dist-info → lisaanalysistools-1.0.12.dist-info}/RECORD

@@ -1,13 +1,13 @@
 lisatools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-lisatools/_version.py,sha256=kORDw-aHXqe534RIAm9NvG4SSRug8egjhH2hTnHhut0,124
+lisatools/_version.py,sha256=1Lp_ETV00qR2o-39OIKWoOpdUW6gApuQthdWT5LgYeg,124
 lisatools/analysiscontainer.py,sha256=UQft6SvyDueDtuL1H1auiEzG5IEsFwRiiXf_0DHtu5U,16289
-lisatools/datacontainer.py,sha256=QVz0twD46Fl_J-ueGQUCXOJkkXUEum7yrwp9LaVeohU,9853
+lisatools/datacontainer.py,sha256=oCvSbGFYWKUpAPfCHdXut-5-VEzoBs560ZtxFSUOPes,9927
 lisatools/detector.py,sha256=1ATZToFoy14U3ACTyver2x9DKavJ3l6ToU6nUSGSTmo,21161
-lisatools/diagnostic.py,sha256=o9vtfXbY3yMDk4cGNeOsTrlP7gYG_BRROw7gyuThDaM,34192
-lisatools/sensitivity.py,sha256=3BEVnRjFsQ7HZX6PRjd6B7K2FyIJRL3lpQpGaHjNgMA,27393
+lisatools/diagnostic.py,sha256=gJcMSmK_JCBTT9SEl3SCTBObp8tRUql-yXomEd31KyY,34422
+lisatools/sensitivity.py,sha256=jNksSpJzdeHXaH2R4seHzzjpyW-VPJIB9JdVI0elzrE,27453
 lisatools/stochastic.py,sha256=CysAQ5BIVD349fLjAMpZAXaT0X0dFjrd4QFi0vfqops,9458
 lisatools/cutils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-lisatools/cutils/detector_cpu.cpython-312-darwin.so,sha256=xhTNwTCXaSHLmHFOWOVAl3sP4tDy2o7TMExj_G5MORE,154720
+lisatools/cutils/detector_cpu.cpython-312-darwin.so,sha256=hcl6VzYfGP8SORIyY_Xn4BuIVQkj7UOaYWcjw7Dg810,154720
 lisatools/cutils/include/Detector.hpp,sha256=Ic37OgP-gvEg8qouhv9aFYf7vQP98tJ_i6PGu8RI1YQ,2050
 lisatools/cutils/include/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 lisatools/cutils/include/global.hpp,sha256=3VPiqglTMRrIBXlEvDUJO2-CjKy_SLUXZt-9A1fH6lQ,572
@@ -36,8 +36,8 @@ lisatools/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 lisatools/utils/constants.py,sha256=r1kVwkpbZS13JTOxj2iRxT5sMgTYX30y-S0JdVmD5Oo,1354
 lisatools/utils/pointeradjust.py,sha256=2sT-7qeYWr1pd_sHk9leVHUTSJ7jJgYIRoWQOtYqguE,2995
 lisatools/utils/utility.py,sha256=MKqRsG8qRI1xCsj51mt6QRa80-deUUgedxibyMV3KD4,6776
-lisaanalysistools-1.0.11.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-lisaanalysistools-1.0.11.dist-info/METADATA,sha256=xjT_alb_5mDWKzhKyK9KldcQjlndzlQ8-eyrZ9Fp8fk,4202
-lisaanalysistools-1.0.11.dist-info/WHEEL,sha256=zL8OKpwMaCM_hEdCwF-bHbg5JyuZtrW4vMYNMNxkj9k,110
-lisaanalysistools-1.0.11.dist-info/top_level.txt,sha256=qXUn8Xi8yvK0vr3QH0vvT5cmoccjSj-UPeKGLAxdYGo,10
-lisaanalysistools-1.0.11.dist-info/RECORD,,
+lisaanalysistools-1.0.12.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+lisaanalysistools-1.0.12.dist-info/METADATA,sha256=2u6VUXb26VH1LhWt8i3LBbZVEQsiezeCV9MSWSia8Xw,4202
+lisaanalysistools-1.0.12.dist-info/WHEEL,sha256=zL8OKpwMaCM_hEdCwF-bHbg5JyuZtrW4vMYNMNxkj9k,110
+lisaanalysistools-1.0.12.dist-info/top_level.txt,sha256=qXUn8Xi8yvK0vr3QH0vvT5cmoccjSj-UPeKGLAxdYGo,10
+lisaanalysistools-1.0.12.dist-info/RECORD,,

lisatools/_version.py

@@ -1,4 +1,4 @@
-__version__ = '1.0.11'
+__version__ = '1.0.12'
 __copyright__ = "Michael L. Katz 2024"
 __name__ = "lisaanalysistools"
 __author__ = "Michael L. Katz"

lisatools/datacontainer.py

@@ -104,11 +104,12 @@ class DataResidualArray:
             self._Tobs = self.data_length * dt
             self._df = 1 / self._Tobs
             self._fmax = 1 / (2 * dt)
-            self._f_arr = np.fft.rfftfreq(self.data_length, dt)
+            xp = get_array_module(self.data_res_arr)
+            self._f_arr = xp.asarray(np.fft.rfftfreq(self.data_length, dt))
 
             # transform data
             tmp = (
-                get_array_module(self.data_res_arr).fft.rfft(self.data_res_arr, axis=-1)
+                xp.fft.rfft(self.data_res_arr, axis=-1)
                 * self._dt
             )
             del self._data_res_arr
@@ -225,7 +226,8 @@ class DataResidualArray:
                 raise ValueError
 
         self.nchannels = len(new_out)
-        self._data_res_arr = np.asarray(list(new_out), dtype=new_out[0].dtype)
+        xp = get_array_module(new_out[0])
+        self._data_res_arr = xp.asarray(list(new_out), dtype=new_out[0].dtype)
 
     def __getitem__(self, index: tuple) -> np.ndarray:
         """Index this class directly in ``self.data_res_arr``."""

lisatools/diagnostic.py

@@ -95,7 +95,7 @@ def inner_product(
             "The two signals are two different lengths. Must be the same length."
         )
 
-    freqs = sig1.f_arr
+    freqs = xp.asarray(sig1.f_arr)
 
     # get psd weighting
     if not isinstance(psd, SensitivityMatrix):
@@ -192,6 +192,17 @@ def inner_product(
         raise ValueError("Normalize must be True, False, 'sig1', or 'sig2'.")
 
     out /= normalization_value
+
+    # remove from cupy if needed
+    try:
+        out = out.item()
+    except AttributeError:
+        pass
+
+    # add copy function to complex value for compatibility
+    if complex:
+        out = np.complex128(out)
+
     return out
 
 

lisatools/sensitivity.py

@@ -17,7 +17,7 @@ except (ModuleNotFoundError, ImportError):
     import numpy as cp
 
 from . import detector as lisa_models
-from .utils.utility import AET
+from .utils.utility import AET, get_array_module
 from .utils.constants import *
 from .stochastic import (
     StochasticContribution,
@@ -638,8 +638,9 @@ class SensitivityMatrix:
             else:
                 raise ValueError
 
+        xp = get_array_module(new_out[0])
         # setup in array form
-        self._sens_mat = np.asarray(list(new_out), dtype=float).reshape(
+        self._sens_mat = xp.asarray(list(new_out), dtype=float).reshape(
             self.return_shape + (-1,)
         )