secret codee moved over

Author: Jammy2211

autoarray/dataset/interferometer/dataset.py

@@ -13,6 +13,7 @@
 from autoarray.structures.visibilities import VisibilitiesNoiseMap
 
 from autoarray.structures.arrays import array_2d_util
+from autoarray.inversion.inversion import inversion_util
 
 logger = logging.getLogger(__name__)
 
@@ -152,10 +153,8 @@ def w_tilde(self):
 
         logger.info("INTERFEROMETER - Computing W-Tilde... May take a moment.")
 
-        from autoarray.inversion.inversion import inversion_util_secret
-
         curvature_preload = (
-            inversion_util_secret.w_tilde_curvature_preload_interferometer_from(
+            inversion_util.w_tilde_curvature_preload_interferometer_from(
                 noise_map_real=np.array(self.noise_map.real),
                 uv_wavelengths=np.array(self.uv_wavelengths),
                 shape_masked_pixels_2d=np.array(
@@ -167,7 +166,7 @@ def w_tilde(self):
             )
         )
 
-        w_matrix = inversion_util_secret.w_tilde_via_preload_from(
+        w_matrix = inversion_util.w_tilde_via_preload_from(
             w_tilde_preload=curvature_preload,
             native_index_for_slim_index=self.real_space_mask.derive_indexes.native_for_slim,
         )

autoarray/inversion/inversion/factory.py

@@ -207,11 +207,6 @@ def inversion_interferometer_from(
     -------
     An `Inversion` whose type is determined by the input `dataset` and `settings`.
     """
-    try:
-        from autoarray.inversion.inversion import inversion_util_secret
-    except ImportError:
-        settings.use_w_tilde = False
-
     if any(
         isinstance(linear_obj, AbstractLinearObjFuncList)
         for linear_obj in linear_obj_list

autoarray/inversion/inversion/interferometer/w_tilde.py

@@ -125,12 +125,10 @@ def curvature_matrix_diag(self) -> np.ndarray:
                 w_tilde=self.w_tilde.w_matrix, mapping_matrix=self.mapping_matrix
             )
 
-        from autoarray.inversion.inversion import inversion_util_secret
-
         mapper = self.cls_list_from(cls=AbstractMapper)[0]
 
         if not self.settings.use_source_loop:
-            return inversion_util_secret.curvature_matrix_via_w_tilde_curvature_preload_interferometer_from(
+            return inversion_util.curvature_matrix_via_w_tilde_curvature_preload_interferometer_from(
                 curvature_preload=self.w_tilde.curvature_preload,
                 pix_indexes_for_sub_slim_index=mapper.pix_indexes_for_sub_slim_index,
                 pix_size_for_sub_slim_index=mapper.pix_sizes_for_sub_slim_index,
@@ -145,7 +143,7 @@ def curvature_matrix_diag(self) -> np.ndarray:
             sub_slim_weights_for_pix_index,
         ) = mapper.sub_slim_indexes_for_pix_index_arr
 
-        return inversion_util_secret.curvature_matrix_via_w_tilde_curvature_preload_interferometer_from_2(
+        return inversion_util.curvature_matrix_via_w_tilde_curvature_preload_interferometer_from_2(
             curvature_preload=self.w_tilde.curvature_preload,
             native_index_for_slim_index=self.transformer.real_space_mask.derive_indexes.native_for_slim,
             pix_pixels=self.linear_obj_list[0].params,