Adapt tests to the new weight scheme

ISISNeutronMuon · Feb 4, 2025 · a8779a0 · a8779a0
1 parent e9fe17f
commit a8779a0
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/MDANSE/Src/MDANSE/Mathematics/Signal.py b/MDANSE/Src/MDANSE/Mathematics/Signal.py
@@ -144,8 +144,9 @@ def normalisation_factor(x, axis=0):
     s[axis] = slice(0, 1, 1)
 
     s = tuple(s)
+    scaling_factor = x.scaling_factor
 
-    return 1 / x[s]
+    return 1 / (scaling_factor * x[s])
 
 
 def differentiate(a, dt=1.0, order=1):

diff --git a/MDANSE/Tests/UnitTests/Analysis/test_dynamics.py b/MDANSE/Tests/UnitTests/Analysis/test_dynamics.py
@@ -69,7 +69,7 @@ def test_vacf(interp_order, normalise):
     with h5py.File(temp_name + ".mda") as actual, h5py.File(result_file) as desired:
         for key in ["vacf_Cu", "vacf_S", "vacf_Sb", "vacf_total"]:
             np.testing.assert_array_almost_equal(
-                actual[f"/{key}"] * actual[f"/{key}"].attrs[f"/{key}"],
+                actual[f"/{key}"] * actual[f"/{key}"].attrs["scaling_factor"],
                 desired[f"/{key}"],
             )
 
@@ -105,7 +105,7 @@ def test_pps():
             "pps_total",
         ]:
             np.testing.assert_array_almost_equal(
-                actual[f"/{key}"] * actual[f"/{key}"].attrs[f"/{key}"],
+                actual[f"/{key}"] * actual[f"/{key}"].attrs["scaling_factor"],
                 desired[f"/{key}"],
             )
 

diff --git a/MDANSE/Tests/UnitTests/Analysis/test_mock_dynamics.py b/MDANSE/Tests/UnitTests/Analysis/test_mock_dynamics.py
@@ -51,12 +51,11 @@ def test_vacf(interp_order, normalise):
     result_file = os.path.join(result_dir, fname)
 
     with h5py.File(temp_name + ".mda") as actual, h5py.File(result_file) as desired:
-        np.testing.assert_array_almost_equal(actual["/vacf_H"], desired["/vacf_H"])
-        np.testing.assert_array_almost_equal(actual["/vacf_O"], desired["/vacf_O"])
-        np.testing.assert_array_almost_equal(actual["/vacf_Si"], desired["/vacf_Si"])
-        np.testing.assert_array_almost_equal(
-            actual["/vacf_total"], desired["/vacf_total"]
-        )
+        for key in ["vacf_H", "vacf_O", "vacf_Si", "vacf_total"]:
+            np.testing.assert_array_almost_equal(
+                actual[f"/{key}"] * actual[f"/{key}"].attrs["scaling_factor"],
+                desired[f"/{key}"],
+            )
 
     os.remove(temp_name + ".mda")
     assert path.exists(temp_name + ".log")

diff --git a/MDANSE/Tests/UnitTests/Converted/short_trajectory_after_changes.mdt b/MDANSE/Tests/UnitTests/Converted/short_trajectory_after_changes.mdt