Update to confine the 3d vector conversions to direction and dip within th eastern hemisphere

Author: benk-mira

simpeg_drivers/utils/regularization.py

@@ -11,11 +11,11 @@
 import numpy as np
 import scipy.sparse as ssp
 from discretize import TreeMesh
+from geoapps_utils.utils.transformations import normal_to_direction_and_dip
 from geoh5py.groups import PropertyGroup
 from geoh5py.groups.property_group_type import GroupTypeEnum
 from simpeg.regularization import SparseSmoothness
 from simpeg.utils import mkvc, sdiag
-from simpeg.utils.mat_utils import cartesian2amplitude_dip_azimuth
 
 
 def cell_neighbors_along_axis(mesh: TreeMesh, axis: str) -> np.ndarray:
@@ -408,10 +408,7 @@ def ensure_dip_direction_convention(
     """
 
     if group_type == GroupTypeEnum.VECTOR:
-        orientations = orientations / np.c_[np.linalg.norm(orientations, axis=1)]
-        dip, direction = cartesian2amplitude_dip_azimuth(orientations)[:, 1:].T
-        dip += 90.0
-        orientations = np.c_[direction, dip]
+        orientations = np.rad2deg(normal_to_direction_and_dip(orientations))
 
     if group_type in [GroupTypeEnum.STRIKEDIP]:
         orientations[:, 0] = 90.0 + orientations[:, 0]

tests/utils_regularization_test.py

@@ -132,5 +132,5 @@ def test_ensure_dip_direction_convention():
         ]
     )
     dir_dip = ensure_dip_direction_convention(orientations, group_type="3D vector")
-    assert np.allclose(dir_dip[:, 0], [90, 0, 270, 180] * 2 + [254])
-    assert np.allclose(dir_dip[:, 1], [45] * 4 + [30] * 4 + [37])
+    assert np.allclose(dir_dip[:, 0], [90, 0, 90, 180] * 2 + [74])
+    assert np.allclose(dir_dip[:, 1], [45] * 4 + [30] * 4 + [-37])