reverse inheritance change and comment out error source

Author: NiekWielders

autogalaxy/profiles/mass/dark/cnfw_mcr.py

@@ -1,10 +1,11 @@
 from typing import Tuple
 
-from autogalaxy.profiles.mass.dark.cnfw import (cNFW, cNFWSph)
+from autogalaxy.profiles.mass.dark.cnfw_mcr_scatter import (
+    cNFWMCRScatterLudlow,
+    cNFWMCRScatterLudlowSph,
+)
 
-from autogalaxy.profiles.mass.dark import mcr_util
-
-class cNFWMCRLudlow(cNFW):
+class cNFWMCRLudlow(cNFWMCRScatterLudlow):
     def __init__(
         self,
         centre: Tuple[float, float] = (0.0, 0.0),
@@ -14,33 +15,17 @@ def __init__(
         redshift_object: float = 0.5,
         redshift_source: float = 1.0,
     ):
-        self.mass_at_200 = mass_at_200
-        self.f_c = f_c
-        self.redshift_object = redshift_object
-        self.redshift_source = redshift_source
-
-        (
-            kappa_s,
-            scale_radius,
-            core_radius,
-            radius_at_200,
-        ) = mcr_util.kappa_s_scale_radius_and_core_radius_for_ludlow(
+        super().__init__(
+            centre=centre,
+            ell_comps=ell_comps,
             mass_at_200=mass_at_200,
-            f_c=f_c,
             scatter_sigma=0.0,
+            f_c=f_c,
             redshift_object=redshift_object,
             redshift_source=redshift_source,
         )
 
-        super().__init__(
-            centre=centre,
-            ell_comps=ell_comps,
-            kappa_s=kappa_s,
-            scale_radius=scale_radius,
-            core_radius=core_radius,
-        )
-
-class cNFWMCRLudlowSph(cNFWSph):
+class cNFWMCRLudlowSph(cNFWMCRScatterLudlowSph):
     def __init__(
         self,
         centre: Tuple[float, float] = (0.0, 0.0),
@@ -49,27 +34,11 @@ def __init__(
         redshift_object: float = 0.5,
         redshift_source: float = 1.0,
     ):
-        self.mass_at_200 = mass_at_200
-        self.f_c = f_c
-        self.redshift_object = redshift_object
-        self.redshift_source = redshift_source
-
-        (
-            kappa_s,
-            scale_radius,
-            core_radius,
-            radius_at_200,
-        ) = mcr_util.kappa_s_scale_radius_and_core_radius_for_ludlow(
+        super().__init__(
+            centre=centre,
             mass_at_200=mass_at_200,
-            f_c=f_c,
             scatter_sigma=0.0,
+            f_c=f_c,
             redshift_object=redshift_object,
             redshift_source=redshift_source,
         )
-
-        super().__init__(
-            centre=centre,
-            kappa_s=kappa_s,
-            scale_radius=scale_radius,
-            core_radius=core_radius,
-        )

autogalaxy/profiles/mass/dark/mcr_util.py

@@ -133,7 +133,7 @@ def ludlow16_cosmology_jax(
         mass_at_200,
         redshift_object,
         redshift_source,
-        vmap_method="sequential",
+        #vmap_method="sequential",
     )