Update tem uijson. Update tests

Author: domfournier

simpeg_drivers-assets/uijson/tdem_forward.ui.json

@@ -58,21 +58,21 @@
         ],
         "value": "dB/dt (T/s)"
     },
-    "z_channel_bool": {
+    "vertical_channel_bool": {
         "group": "Survey",
         "main": true,
         "label": "Vertical",
         "tooltip": "Vertical (w) component of the magnetic data.\nPositive up along the z-axis if no receiver orientation provided",
         "value": true
     },
-    "y_channel_bool": {
+    "inline_channel_bool": {
         "group": "Survey",
         "main": true,
         "label": "In-line",
         "tooltip": "In-line (u) component of the magnetic data.\nPositive towards North if no receiver orientation provided",
         "value": true
     },
-    "x_channel_bool": {
+    "crossline_channel_bool": {
         "group": "Survey",
         "main": true,
         "label": "Cross-line",

simpeg_drivers-assets/uijson/tdem_inversion.ui.json

@@ -58,7 +58,7 @@
         ],
         "value": "dB/dt (T/s)"
     },
-    "z_channel": {
+    "vertical_channel": {
         "association": [
             "Cell",
             "Vertex"
@@ -74,7 +74,7 @@
         "enabled": true,
         "value": ""
     },
-    "z_uncertainty": {
+    "vertical_uncertainty": {
         "association": [
             "Cell",
             "Vertex"
@@ -85,11 +85,11 @@
         "main": true,
         "label": "Uncertainty",
         "parent": "data_object",
-        "dependency": "z_channel",
+        "dependency": "vertical_channel",
         "dependencyType": "enabled",
         "value": ""
     },
-    "y_channel": {
+    "inline_channel": {
         "association": [
             "Cell",
             "Vertex"
@@ -105,7 +105,7 @@
         "enabled": false,
         "value": ""
     },
-    "y_uncertainty": {
+    "inline_uncertainty": {
         "association": [
             "Cell",
             "Vertex"
@@ -116,11 +116,11 @@
         "main": true,
         "label": "Uncertainty",
         "parent": "data_object",
-        "dependency": "y_channel",
+        "dependency": "inline_channel",
         "dependencyType": "enabled",
         "value": ""
     },
-    "x_channel": {
+    "crossline_channel": {
         "association": [
             "Cell",
             "Vertex"
@@ -136,7 +136,7 @@
         "enabled": false,
         "value": ""
     },
-    "x_uncertainty": {
+    "crossline_uncertainty": {
         "association": [
             "Cell",
             "Vertex"
@@ -147,7 +147,7 @@
         "main": true,
         "label": "Uncertainty",
         "parent": "data_object",
-        "dependency": "x_channel",
+        "dependency": "crossline_channel",
         "dependencyType": "enabled",
         "value": ""
     },

simpeg_drivers/plate_simulation/match/driver.py

@@ -485,7 +485,13 @@ def batch_files_score(
                 logger.warning("No survey found in %s, skipping.", sim_file)
                 continue
 
-            simulated = get_data_array(survey.get_entity("Iteration_0_z")[0])
+            data_entity = survey.get_entity("Iteration_0_vertical")[0]
+
+            if data_entity is None:
+                data_entity = survey.get_entity("Iteration_0_z")[0]
+
+            simulated = get_data_array(data_entity)
+
             pred = time_projection @ (spatial_projection @ simulated.T).T
             scale = max_late_val / np.max(np.abs(pred[-1, :]))
             pred = normalized_data(pred, scale=scale, threshold=max_late_val)

tests/plate_simulation/runtest/match_test.py

@@ -159,7 +159,7 @@ def test_matching_driver(tmp_path: Path):
         # Modify the data slightly
         with Workspace(new_file) as sim_geoh5:
             survey = fetch_survey(sim_geoh5)
-            prop_group = survey.get_entity("Iteration_0_z")[0]
+            prop_group = survey.get_entity("Iteration_0_vertical")[0]
 
             # Alter the signal to simulate different plate models
             scale = signal.windows.gaussian(survey.n_vertices, 2**ii)
@@ -183,7 +183,7 @@ def test_matching_driver(tmp_path: Path):
         survey.vertices = rotate_xyz(survey.vertices, [0, 0, 0], 215.0)
 
         # Flip the data to simulate up-dip measurements
-        prop_group = survey.get_entity("Iteration_0_z")[0]
+        prop_group = survey.get_entity("Iteration_0_vertical")[0]
         for uid in prop_group.properties:
             child = survey.get_entity(uid)[0]
             child.values = child.values[::-1]

tests/run_tests/driver_ground_tem_test.py

@@ -180,7 +180,7 @@ def test_ground_tem_run(tmp_path: Path, max_iterations=1, pytest=True):
         data = {}
         uncertainties = {}
         channels = {
-            "z": "dBzdt",
+            "vertical": "vertical",
         }
 
         for chan, cname in channels.items():
@@ -209,13 +209,13 @@ def test_ground_tem_run(tmp_path: Path, max_iterations=1, pytest=True):
         data_kwargs = {}
         for chan in channels:
             data_kwargs[f"{chan}_channel"] = components.survey.fetch_property_group(
-                name=f"dB{chan}dt"
+                name="vertical"
             )
             data_kwargs[f"{chan}_uncertainty"] = components.survey.fetch_property_group(
-                name=f"dB{chan}dt uncertainties"
+                name="vertical uncertainties"
             )
 
-        orig_dBzdt = geoh5.get_entity("Iteration_0_z_[0]")[0].values
+        orig_dBzdt = geoh5.get_entity("Iteration_0_vertical_[0]")[0].values
 
         # Run the inverse
         params = TDEMInversionOptions.build(

tests/run_tests/driver_joint_surveys_test.py

@@ -364,7 +364,7 @@ def test_joint_surveys_tem_run(
         data = {}
         uncertainties = {}
         channels = {
-            "z": "dBzdt",
+            "vertical": "vertical",
         }
         survey = components.survey
         for cname in channels.values():
@@ -390,10 +390,10 @@ def test_joint_surveys_tem_run(
         data_kwargs = {}
         for chan in channels:
             data_kwargs[f"{chan}_channel"] = components.survey.fetch_property_group(
-                name=f"dB{chan}dt"
+                name="vertical"
             )
             data_kwargs[f"{chan}_uncertainty"] = components.survey.fetch_property_group(
-                name=f"dB{chan}dt uncertainties"
+                name="vertical uncertainties"
             )
 
         # Run the inverse