lisaanalysistools 1.0.9__tar.gz → 1.0.11__tar.gz

{lisaanalysistools-1.0.9 → lisaanalysistools-1.0.11/LISAanalysistools.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lisaanalysistools
-Version: 1.0.9
+Version: 1.0.11
 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.9
+Current Version: 1.0.11
 
 ## Authors/Developers
 

{lisaanalysistools-1.0.9/LISAanalysistools.egg-info → lisaanalysistools-1.0.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lisaanalysistools
-Version: 1.0.9
+Version: 1.0.11
 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.9
+Current Version: 1.0.11
 
 ## Authors/Developers
 

{lisaanalysistools-1.0.9 → lisaanalysistools-1.0.11}/README.md

@@ -49,7 +49,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.9
+Current Version: 1.0.11
 
 ## Authors/Developers
 

{lisaanalysistools-1.0.9 → lisaanalysistools-1.0.11}/lisatools/_version.py

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

{lisaanalysistools-1.0.9 → lisaanalysistools-1.0.11}/lisatools/analysiscontainer.py

@@ -11,6 +11,8 @@ import numpy as np
 from scipy import interpolate
 import matplotlib.pyplot as plt
 
+from eryn.utils import TransformContainer
+
 
 try:
     import cupy as cp
@@ -286,6 +288,7 @@ class AnalysisContainer:
         source_only: bool = False,
         waveform_kwargs: Optional[dict] = {},
         data_res_arr_kwargs: Optional[dict] = {},
+        transform_fn: Optional[TransformContainer] = None,
         **kwargs: dict,
     ) -> float | complex:
         """Return the likelihood of a generated signal with the data.
@@ -308,8 +311,14 @@ class AnalysisContainer:
         if data_res_arr_kwargs == {}:
             data_res_arr_kwargs = self.data_res_arr.init_kwargs
 
+        if transform_fn is not None:
+            args_tmp = np.asarray(args)
+            args_in = tuple(transform_fn.both_transforms(args_tmp))
+        else:
+            args_in = args
+
         template = DataResidualArray(
-            self.signal_gen(*args, **waveform_kwargs), **data_res_arr_kwargs
+            self.signal_gen(*args_in, **waveform_kwargs), **data_res_arr_kwargs
         )
 
         args_2 = (template,)
@@ -426,7 +435,30 @@ class AnalysisContainer:
             **kwargs,
         )
 
-    def eryn_likelihood_function(self, x, *args, **kwargs):
+    def eryn_likelihood_function(
+        self, x: np.ndarray | list | tuple, *args: Any, **kwargs: Any
+    ) -> np.ndarray | float:
+        """Likelihood function for Eryn sampler.
+
+        This function is not vectorized.
+
+        ``signal_gen`` must be set to use this function.
+
+        Args:
+            x: Parameters. Can be 1D list, tuple, array or 2D array.
+                If a 2D array is input, the computation is done serially.
+            *args: Likelihood args.
+            **kwargs: Likelihood kwargs.
+
+        Returns:
+            Likelihood value(s).
+
+        """
+        assert self.signal_gen is not None
+
+        if isinstance(x, list) or isinstance(x, tuple):
+            x = np.asarray(x)
+
         if x.ndim == 1:
             input_vals = tuple(x) + tuple(args)
             return self.calculate_signal_likelihood(*input_vals, **kwargs)