Merge pull request #378 from Jammy2211/feature/pure_callback_nfw

feature/pure_callback_nfw

Author: Jammy2211

autolens/analysis/analysis/dataset.py

@@ -85,6 +85,7 @@ def __init__(
             self=self,
             positions_likelihood_list=positions_likelihood_list,
             cosmology=cosmology,
+            use_jax=use_jax
         )
 
         self.raise_inversion_positions_likelihood_exception = (

autolens/analysis/analysis/lens.py

@@ -23,6 +23,7 @@ def __init__(
         self,
         positions_likelihood_list: Optional[List[PositionsLH]] = None,
         cosmology: ag.cosmo.LensingCosmology = None,
+        use_jax: bool = True,
     ):
         """
         Analysis classes are used by PyAutoFit to fit a model to a dataset via a non-linear search.
@@ -44,6 +45,15 @@ def __init__(
         self.cosmology = cosmology or Planck15()
         self.positions_likelihood_list = positions_likelihood_list
 
+        self._use_jax = use_jax
+
+    @property
+    def _xp(self):
+        if self._use_jax:
+            import jax.numpy as jnp
+            return jnp
+        return np
+
     def tracer_via_instance_from(
         self,
         instance: af.ModelInstance,
@@ -72,8 +82,9 @@ def tracer_via_instance_from(
             subhalo_centre = tracer_util.grid_2d_at_redshift_from(
                 galaxies=instance.galaxies,
                 redshift=instance.galaxies.subhalo.redshift,
-                grid=aa.Grid2DIrregular(values=[instance.galaxies.subhalo.mass.centre]),
+                grid=aa.Grid2DIrregular(values=[instance.galaxies.subhalo.mass.centre], xp=self._xp),
                 cosmology=self.cosmology,
+                xp=self._xp
             )
 
             instance.galaxies.subhalo.mass.centre = tuple(subhalo_centre.in_list[0])
@@ -95,7 +106,7 @@ def tracer_via_instance_from(
         )
 
     def log_likelihood_penalty_from(
-        self, instance: af.ModelInstance, xp=np
+        self, instance: af.ModelInstance,
     ) -> Optional[float]:
         """
         Call the positions overwrite log likelihood function, which add a penalty term to the likelihood if the
@@ -116,7 +127,7 @@ def log_likelihood_penalty_from(
         The penalty value of the positions log likelihood, if the positions do not trace close in the source plane,
         else a None is returned to indicate there is no penalty.
         """
-        log_likelihood_penalty = xp.array(0.0)
+        log_likelihood_penalty = self._xp.array(0.0)
 
         if self.positions_likelihood_list is not None:
 
@@ -126,7 +137,7 @@ def log_likelihood_penalty_from(
 
                     log_likelihood_penalty = (
                         positions_likelihood.log_likelihood_penalty_from(
-                            instance=instance, analysis=self, xp=xp
+                            instance=instance, analysis=self, xp=self._xp
                         )
                     )
 

autolens/imaging/model/analysis.py

@@ -59,7 +59,6 @@ def log_likelihood_function(self, instance: af.ModelInstance) -> float:
 
         log_likelihood_penalty = self.log_likelihood_penalty_from(
             instance=instance,
-            xp=self._xp
         )
 
         if self._use_jax:

autolens/interferometer/model/analysis.py

@@ -130,7 +130,7 @@ def log_likelihood_function(self, instance):
         """
 
         log_likelihood_penalty = self.log_likelihood_penalty_from(
-            instance=instance, xp=self._xp
+            instance=instance,
         )
 
         return self.fit_from(instance=instance).figure_of_merit - log_likelihood_penalty

autolens/lens/tracer_util.py

@@ -179,6 +179,7 @@ def grid_2d_at_redshift_from(
     galaxies: List[ag.Galaxy],
     grid: aa.type.Grid2DLike,
     cosmology: ag.cosmo.LensingCosmology = None,
+    xp=np,
 ) -> aa.type.Grid2DLike:
     """
     Returns a ray-traced grid of 2D Cartesian (y,x) coordinates, which accounts for multi-plane ray-tracing, at a
@@ -237,7 +238,7 @@ def grid_2d_at_redshift_from(
 
     if plane_index_with_redshift:
         traced_grid_list = traced_grid_2d_list_from(
-            planes=planes, grid=grid, cosmology=cosmology
+            planes=planes, grid=grid, cosmology=cosmology, xp=xp
         )
 
         return traced_grid_list[plane_index_with_redshift[0]]
@@ -249,7 +250,7 @@ def grid_2d_at_redshift_from(
     planes.insert(plane_index_insert, [ag.Galaxy(redshift=redshift)])
 
     traced_grid_list = traced_grid_2d_list_from(
-        planes=planes, grid=grid, cosmology=cosmology
+        planes=planes, grid=grid, cosmology=cosmology, xp=xp
     )
 
     return traced_grid_list[plane_index_insert]