update to verif module to fix sens dict bug.

JoelPhys · JoelPhys · commit 8085d8a33193 · 2025-08-07T14:07:46.000+01:00
diff --git a/src/pyvale/verif/psens.py b/src/pyvale/verif/psens.py
@@ -21,7 +21,7 @@
 
 
 def samp_times(sim_data: mh.SimData) -> dict[str, None | np.ndarray]:
-    sim_dims = sens.get_sim_dims(sim_data)
+    sim_dims = sens.SimTools.get_sim_dims(sim_data)
     sample_times = {}
 
     sample_times["sim"] = None
@@ -107,7 +107,7 @@ def check_gold_measurements(sens_dict: dict[str,sens.SensorArrayPoint]) -> list[
     for ss in sens_dict:
         measurements = sens_dict[ss].calc_measurements()
 
-        load_path = psensconst.GOLD_PATH / f"{ss}.npy"
+        load_path = psensconst.GOLD_PATH / f"{ss.lower()}.npy"
         if load_path.is_file():
             gold = np.load(load_path)
 
diff --git a/src/pyvale/verif/psensmech.py b/src/pyvale/verif/psensmech.py
@@ -8,6 +8,7 @@
 import pyvale.sensorsim as sens
 import pyvale.verif.psens as psens
 import pyvale.verif.psensconst as psensconst
+import pyvale.dataset as dataset
 
 """
 DEVELOPER VERIFICATION MODULE
@@ -21,7 +22,7 @@
 """
 
 def simdata_mech_2d() -> mh.SimData:
-    data_path = sens.DataSet.mechanical_2d_path()
+    data_path = dataset.mechanical_2d_path()
     sim_data = mh.ExodusReader(data_path).read_all_sim_data()
     sim_data = sens.scale_length_units(scale=1000.0,
                                       sim_data=sim_data,
@@ -30,7 +31,7 @@ def simdata_mech_2d() -> mh.SimData:
 
 
 def simdata_mech_3d() -> mh.SimData:
-    data_path = sens.DataSet.element_case_output_path(sens.EElemTest.HEX20)
+    data_path = dataset.element_case_output_path(dataset.EElemTest.HEX20)
     sim_data = mh.ExodusReader(data_path).read_all_sim_data()
     field_comps = ("disp_x","disp_y","disp_z")
     sim_data = sens.scale_length_units(scale=1000.0,
@@ -39,7 +40,7 @@ def simdata_mech_3d() -> mh.SimData:
     return sim_data
 
 def sens_pos_2d() -> dict[str,np.ndarray]:
-    sim_dims = sens.get_sim_dims(simdata_mech_2d())
+    sim_dims = sens.SimTools.get_sim_dims(simdata_mech_2d())
     sens_pos = {}
 
     x_lims = sim_dims["x"]
diff --git a/src/pyvale/verif/psensmultiphys.py b/src/pyvale/verif/psensmultiphys.py
@@ -13,6 +13,7 @@
 import pyvale.verif.psensvector as psensvector
 import pyvale.verif.psenstensor as psenstensor
 import pyvale.verif.psensmech as psensmech
+import pyvale.dataset as dataset
 
 
 def load_simdata_list(data_paths: list[Path],
@@ -29,23 +30,23 @@ def load_simdata_list(data_paths: list[Path],
 
 
 def simdata_list_2d() -> list[mh.SimData]:
-    data_paths = sens.DataSet.thermomechanical_2d_experiment_paths()
+    data_paths = dataset.thermomechanical_2d_experiment_paths()
     disp_comps = ("disp_x","disp_y")
     return load_simdata_list(data_paths,disp_comps)
 
 
 def simdata_list_3d() -> list[mh.SimData]:
-    data_paths = [sens.DataSet.element_case_output_path(sens.EElemTest.TET4),
-                  sens.DataSet.element_case_output_path(sens.EElemTest.TET10),
-                  sens.DataSet.element_case_output_path(sens.EElemTest.HEX8),
-                  sens.DataSet.element_case_output_path(sens.EElemTest.HEX20)]
+    data_paths = [dataset.element_case_output_path(dataset.EElemTest.TET4),
+                  dataset.element_case_output_path(dataset.EElemTest.TET10),
+                  dataset.element_case_output_path(dataset.EElemTest.HEX8),
+                  dataset.element_case_output_path(dataset.EElemTest.HEX20)]
     disp_comps = ("disp_x","disp_y","disp_z")
     return load_simdata_list(data_paths,disp_comps)
 
 
 def sens_pos_2d() -> dict[str,np.ndarray]:
     # Geometry does not change
-    sim_dims = sens.get_sim_dims(simdata_list_2d()[0])
+    sim_dims = sens.SimTools.get_sim_dims(simdata_list_2d()[0])
     sens_pos = {}
 
     x_lims = sim_dims["x"]
@@ -165,7 +166,7 @@ def exp_sim_2d() -> dict[str,sens.ExperimentSimulator]:
                 # print(f"{ee=}")
                 # print(80*"-")
                 if err_chain_dict[ff][ee] is not None:
-                    err_int_opts = sens.ErrIntOpts()
+                    err_int_opts = sens.ErrIntOpts
                     err_int = sens.ErrIntegrator(err_chain_dict[ff][ee],
                                                 sens_data_dict[ss],
                                                 this_sens.get_measurement_shape(),
diff --git a/src/pyvale/verif/psensscalar.py b/src/pyvale/verif/psensscalar.py
@@ -5,10 +5,12 @@
 #===============================================================================
 import copy
 import numpy as np
+
 import pyvale.mooseherder as mh
 import pyvale.sensorsim as sens
 import pyvale.verif.psens as psens
 import pyvale.verif.psensconst as psensconst
+import pyvale.dataset as dataset
 
 """
 DEVELOPER VERIFICATION MODULE
@@ -23,7 +25,7 @@
 # TODO: fix position locking for 3D field errors
 
 def simdata_2d() -> mh.SimData:
-    data_path = sens.DataSet.thermal_2d_path()
+    data_path = dataset.thermal_2d_path()
     sim_data = mh.ExodusReader(data_path).read_all_sim_data()
     sim_data = sens.scale_length_units(scale=1000.0,
                                       sim_data=sim_data,
@@ -32,7 +34,7 @@ def simdata_2d() -> mh.SimData:
 
 
 def simdata_3d() -> mh.SimData:
-    data_path = sens.DataSet.thermal_3d_path()
+    data_path = dataset.thermal_3d_path()
     sim_data = mh.ExodusReader(data_path).read_all_sim_data()
     sim_data = sens.scale_length_units(scale=1000.0,
                                       sim_data=sim_data,
@@ -41,7 +43,7 @@ def simdata_3d() -> mh.SimData:
 
 
 def sens_pos_2d() -> dict[str,np.ndarray]:
-    sim_dims = sens.get_sim_dims(simdata_2d())
+    sim_dims = sens.SimTools.get_sim_dims(simdata_2d())
     sens_pos = {}
 
     x_lims = sim_dims["x"]
@@ -58,7 +60,7 @@ def sens_pos_2d() -> dict[str,np.ndarray]:
 
 
 def sens_pos_3d() -> dict[str,np.ndarray]:
-    sim_dims = sens.get_sim_dims(simdata_3d())
+    sim_dims = sens.SimTools.get_sim_dims(simdata_3d())
 
     sens_pos = {}
 
@@ -254,11 +256,11 @@ def sens_noerrs(sim_data: mh.SimData,
 
 
 def sens_dict(sim_data: mh.SimData,
-              sens_data_dict: dict[str,sens.SensorData],
+              sens_data_dict: dict[str, sens.SensorData],
               tag: str
-              ) -> dict[str,sens.SensorArrayPoint]:
+              ) -> dict[str, sens.SensorArrayPoint]:
 
-    sens = {}
+    sens_dict = {}
     for ss in sens_data_dict:
         sens_array = sens_noerrs(sim_data,
                                  sens_data_dict[ss],
@@ -276,18 +278,21 @@ def sens_dict(sim_data: mh.SimData,
                                            pos_lock[pos_lock_key])
 
         for ee in err_chain_dict:
-            tag = f"{tag}_{ss}_err-{ee}"
-            sens[tag] = copy.deepcopy(sens_array)
+            full_tag = f"{tag}_{ss}_err-{ee}"
+            sens_dict[full_tag] = copy.deepcopy(sens_array)
 
             if err_chain_dict[ee] is not None:
                 err_int_opts = sens.ErrIntOpts()
-                err_int = sens.ErrIntegrator(err_chain_dict[ee],
-                                            sens_data_dict[ss],
-                                            sens[tag].get_measurement_shape(),
-                                            err_int_opts=err_int_opts)
-                sens[tag].set_error_integrator(err_int)
+                err_int = sens.ErrIntegrator(
+                    err_chain_dict[ee],
+                    sens_data_dict[ss],
+                    sens_dict[full_tag].get_measurement_shape(),
+                    err_int_opts=err_int_opts
+                )
+                sens_dict[full_tag].set_error_integrator(err_int)
+
+    return sens_dict
 
-    return sens
 
 
 def sens_2d_dict() -> dict[str,sens.SensorArrayPoint]:
diff --git a/src/pyvale/verif/psenstensor.py b/src/pyvale/verif/psenstensor.py
@@ -59,7 +59,7 @@ def sens_2d_dict() -> dict[str,sens.SensorArrayPoint]:
     sim_data = psensmech.simdata_mech_2d()
     sens_data_dict = psensmech.sens_data_2d_dict()
 
-    sens = {}
+    sens_dict = {}
     for ss in sens_data_dict:
         sens_array = sens_2d_noerrs(sim_data,sens_data_dict[ss])
 
@@ -76,24 +76,24 @@ def sens_2d_dict() -> dict[str,sens.SensorArrayPoint]:
 
         for ee in err_chain_dict:
             tag = f"tens2d_{ss}_err-{ee}"
-            sens[tag] = copy.deepcopy(sens_array)
+            sens_dict[tag] = copy.deepcopy(sens_array)
 
             if err_chain_dict[ee] is not None:
                 err_int_opts = sens.ErrIntOpts()
                 err_int = sens.ErrIntegrator(err_chain_dict[ee],
                                             sens_data_dict[ss],
-                                            sens[tag].get_measurement_shape(),
+                                            sens_dict[tag].get_measurement_shape(),
                                             err_int_opts=err_int_opts)
-                sens[tag].set_error_integrator(err_int)
+                sens_dict[tag].set_error_integrator(err_int)
 
-    return sens
+    return sens_dict
 
 
 def sens_3d_dict() -> dict[str,sens.SensorArrayPoint]:
     sim_data = psensmech.simdata_mech_3d()
     sens_data_dict = psensmech.sens_data_3d_dict()
 
-    sens = {}
+    sens_dict = {}
     for ss in sens_data_dict:
         sens_array = sens_3d_noerrs(sim_data,sens_data_dict[ss])
 
@@ -110,14 +110,14 @@ def sens_3d_dict() -> dict[str,sens.SensorArrayPoint]:
 
         for ee in err_chain_dict:
             tag = f"tens3d_{ss}_err-{ee}"
-            sens[tag] = copy.deepcopy(sens_array)
+            sens_dict[tag] = copy.deepcopy(sens_array)
 
             if err_chain_dict[ee] is not None:
                 err_int_opts = sens.ErrIntOpts()
                 err_int = sens.ErrIntegrator(err_chain_dict[ee],
                                             sens_data_dict[ss],
-                                            sens[tag].get_measurement_shape(),
+                                            sens_dict[tag].get_measurement_shape(),
                                             err_int_opts=err_int_opts)
-                sens[tag].set_error_integrator(err_int)
+                sens_dict[tag].set_error_integrator(err_int)
 
-    return sens
+    return sens_dict
diff --git a/src/pyvale/verif/psensvector.py b/src/pyvale/verif/psensvector.py
@@ -52,7 +52,7 @@ def sens_2d_dict() -> dict[str,sens.SensorArrayPoint]:
     sim_data = psensmech.simdata_mech_2d()
     sens_data_dict = psensmech.sens_data_2d_dict()
 
-    sens = {}
+    sens_dict = {}
     for ss in sens_data_dict:
         sens_array = sens_2d_noerrs(sim_data,sens_data_dict[ss])
 
@@ -69,24 +69,24 @@ def sens_2d_dict() -> dict[str,sens.SensorArrayPoint]:
 
         for ee in err_chain_dict:
             tag = f"vec2d_{ss}_err-{ee}"
-            sens[tag] = copy.deepcopy(sens_array)
+            sens_dict[tag] = copy.deepcopy(sens_array)
 
             if err_chain_dict[ee] is not None:
                 err_int_opts = sens.ErrIntOpts()
                 err_int = sens.ErrIntegrator(err_chain_dict[ee],
                                             sens_data_dict[ss],
-                                            sens[tag].get_measurement_shape(),
+                                            sens_dict[tag].get_measurement_shape(),
                                             err_int_opts=err_int_opts)
-                sens[tag].set_error_integrator(err_int)
+                sens_dict[tag].set_error_integrator(err_int)
 
-    return sens
+    return sens_dict
 
 
 def sens_3d_dict() -> dict[str,sens.SensorArrayPoint]:
     sim_data = psensmech.simdata_mech_3d()
     sens_data_dict = psensmech.sens_data_3d_dict()
 
-    sens = {}
+    sens_dict = {}
     for ss in sens_data_dict:
         sens_array = sens_3d_noerrs(sim_data,sens_data_dict[ss])
 
@@ -103,14 +103,14 @@ def sens_3d_dict() -> dict[str,sens.SensorArrayPoint]:
 
         for ee in err_chain_dict:
             tag = f"vec3d_{ss}_err-{ee}"
-            sens[tag] = copy.deepcopy(sens_array)
+            sens_dict[tag] = copy.deepcopy(sens_array)
 
             if err_chain_dict[ee] is not None:
                 err_int_opts = sens.ErrIntOpts()
                 err_int = sens.ErrIntegrator(err_chain_dict[ee],
                                             sens_data_dict[ss],
-                                            sens[tag].get_measurement_shape(),
+                                            sens_dict[tag].get_measurement_shape(),
                                             err_int_opts=err_int_opts)
-                sens[tag].set_error_integrator(err_int)
+                sens_dict[tag].set_error_integrator(err_int)
 
-    return sens
+    return sens_dict
diff --git a/tests/pointsensors/test_psens.py b/tests/pointsensors/test_psens.py
@@ -48,6 +48,7 @@
 )
 def test_gold_combined(get_sensors: Callable[[], Dict[str, Any]]) -> None:
     sensors = get_sensors()
+    print(sensors)
     fails = psens.check_gold_measurements(sensors)
     assert not fails, "\n".join(fails)
 

Original file line number	Diff line number	Diff line change
`@@ -48,6 +48,7 @@`
`48`	`48`	`)`
`49`	`49`	`def test_gold_combined(get_sensors: Callable[[], Dict[str, Any]]) -> None:`
`50`	`50`	`sensors = get_sensors()`
	`51`	`+ print(sensors)`
`51`	`52`	`fails = psens.check_gold_measurements(sensors)`
`52`	`53`	`assert not fails, "\n".join(fails)`
`53`	`54`