fixed broken tests

neutrons · Jan 16, 2025 · 1700c92 · 1700c92
1 parent aebe20e
commit 1700c92
Show file tree

Hide file tree

Showing 10 changed files with 19 additions and 17 deletions.
diff --git a/test_data/scan_to_nexus_test.h5 b/test_data/scan_to_nexus_test.h5
diff --git a/test_data/spice_to_nxdict_test_all.h5 b/test_data/spice_to_nxdict_test_all.h5
diff --git a/test_data/spice_to_nxdict_test_empty.h5 b/test_data/spice_to_nxdict_test_empty.h5
diff --git a/test_data/spice_to_nxdict_test_scan0034.h5 b/test_data/spice_to_nxdict_test_scan0034.h5
diff --git a/test_data/tavi_test_exp424.h5 b/test_data/tavi_test_exp424.h5
diff --git a/tests/test_cooper_nathans.py b/tests/test_cooper_nathans.py
@@ -10,7 +10,7 @@
 def test_copper_nathans_localQ(tas_params):
     tas, ei, ef, hkl, _, r0 = tas_params
 
-    rez = tas.cooper_nathans(hkl_list=hkl, ei=ei, ef=ef, projection=None, R0=r0)
+    rez = tas.rez(hkl_list=hkl, ei=ei, ef=ef, projection=None, R0=r0)
     mat = np.array(
         [
             [9583.2881, -4671.0614, -0.0000, 986.5610],
@@ -25,7 +25,7 @@ def test_copper_nathans_localQ(tas_params):
 def test_copper_nathans_hkl(tas_params):
     tas, ei, ef, hkl, _, r0 = tas_params
 
-    rez = tas.cooper_nathans(hkl_list=hkl, ei=ei, ef=ef, R0=r0)
+    rez = tas.rez(hkl_list=hkl, ei=ei, ef=ef, R0=r0)
     mat = np.array(
         [
             [33305.0843, 33224.4963, -2651.8290, -5152.9962],
@@ -40,7 +40,7 @@ def test_copper_nathans_hkl(tas_params):
 def test_copper_nathans_projection(tas_params):
     tas, ei, ef, hkl, projection, r0 = tas_params
 
-    rez = tas.cooper_nathans(hkl_list=hkl, ei=ei, ef=ef, projection=projection, R0=r0)
+    rez = tas.rez(hkl_list=hkl, ei=ei, ef=ef, projection=projection, R0=r0)
     mat = np.array(
         [
             [1.3306e05, -5.3037e03, -1.7660e-01, -1.0306e04],
@@ -55,7 +55,7 @@ def test_copper_nathans_projection(tas_params):
 def test_copper_nathans_list(tas_params):
     tas, ei, ef, _, _, r0 = tas_params
 
-    rez_list = tas.cooper_nathans(hkl_list=[(0, 0, 3), (0, 0, -3)], ei=[ei, ei + 1], ef=ef, projection=None, R0=r0)
+    rez_list = tas.rez(hkl_list=[(0, 0, 3), (0, 0, -3)], ei=[ei, ei + 1], ef=ef, projection=None, R0=r0)
     mat = np.array(
         [
             [9583.2881, -4671.0614, -0.0000, 986.5610],

diff --git a/tests/test_ellipse.py b/tests/test_ellipse.py
@@ -12,7 +12,7 @@
 
 def test_local_q(tas_params):
     tas, ei, ef, hkl, _, R0 = tas_params
-    rez = tas.cooper_nathans(hkl_list=hkl, ei=ei, ef=ef, projection=None, R0=R0)
+    rez = tas.rez(hkl_list=hkl, ei=ei, ef=ef, projection=None, R0=R0)
     ellipse = rez.get_ellipse(axes=(0, 3), PROJECTION=False)
 
     assert np.allclose(ellipse.angle, 90)
@@ -22,7 +22,7 @@ def test_local_q(tas_params):
 
 def test_hkl(tas_params):
     tas, ei, ef, hkl, _, R0 = tas_params
-    rez = tas.cooper_nathans(hkl_list=hkl, ei=ei, ef=ef, R0=R0)
+    rez = tas.rez(hkl_list=hkl, ei=ei, ef=ef, R0=R0)
 
     e01_co = rez.get_ellipse(axes=(0, 1), PROJECTION=False)
 
@@ -33,7 +33,7 @@ def test_hkl(tas_params):
 
 def test_plotting(tas_params):
     tas, ei, ef, hkl, _, R0 = tas_params
-    rez = tas.cooper_nathans(hkl_list=hkl, ei=ei, ef=ef, R0=R0)
+    rez = tas.rez(hkl_list=hkl, ei=ei, ef=ef, R0=R0)
 
     e01_co = rez.get_ellipse(axes=(0, 1), PROJECTION=False)
     e01_inco = rez.get_ellipse(axes=(0, 1), PROJECTION=True)

diff --git a/tests/test_ellipsoid.py b/tests/test_ellipsoid.py
@@ -10,7 +10,7 @@
 
 def test_local_q(tas_params):
     tas, ei, ef, hkl, _, R0 = tas_params
-    rez = tas.cooper_nathans(hkl_list=hkl, ei=ei, ef=ef, projection=None, R0=R0)
+    rez = tas.rez(hkl_list=hkl, ei=ei, ef=ef, projection=None, R0=R0)
 
     assert np.allclose(rez.hkl, (0, 0, 3))
     assert np.allclose(rez.q, (3 * 2 * np.pi / tas.sample.c, 0, 0))
@@ -21,7 +21,7 @@ def test_local_q(tas_params):
 
 def test_hkl(tas_params):
     tas, ei, ef, hkl, _, R0 = tas_params
-    rez = tas.cooper_nathans(hkl_list=hkl, ei=ei, ef=ef, R0=R0)
+    rez = tas.rez(hkl_list=hkl, ei=ei, ef=ef, R0=R0)
 
     assert np.allclose(rez.hkl, (0, 0, 3))
     assert np.allclose(rez.q, (0, 0, 3))
@@ -32,7 +32,7 @@ def test_hkl(tas_params):
 
 def test_projection(tas_params):
     tas, ei, ef, hkl, projection, R0 = tas_params
-    rez = tas.cooper_nathans(hkl_list=hkl, ei=ei, ef=ef, projection=projection, R0=R0)
+    rez = tas.rez(hkl_list=hkl, ei=ei, ef=ef, projection=projection, R0=R0)
 
     assert np.allclose(rez.hkl, (0, 0, 3))
     assert np.allclose(rez.q, (0, 3, 0))
@@ -43,7 +43,7 @@ def test_projection(tas_params):
 
 def test_plotting(tas_params):
     tas, ei, ef, hkl, _, R0 = tas_params
-    rez = tas.cooper_nathans(hkl_list=hkl, ei=ei, ef=ef, R0=R0)
+    rez = tas.rez(hkl_list=hkl, ei=ei, ef=ef, R0=R0)
     rez.plot_ellipses()
     plt.show()
 

diff --git a/tests/test_scan.py b/tests/test_scan.py
@@ -53,8 +53,10 @@ def test_scan_from_nexus():
 
 
 def test_get_scan_data():
-    nexus_file_name = "./test_data/IPTS32124_CG4C_exp0424/scan0042.h5"
-    scan = Scan.from_nexus(nexus_file_name)
+
+    path_to_spice_folder = "./test_data/exp424"
+    scan = Scan.from_spice(path_to_spice_folder, scan_num=42)
+
     scan_data_1d = scan.get_data()
 
     x_data = np.arange(0.1, 4.1, 0.1)

diff --git a/tests/test_scan_group.py b/tests/test_scan_group.py
@@ -7,7 +7,7 @@
 
 
 def test_scan_group_default_1d():
-    tavi = TAVI("./test_data/tavi_exp424.h5")
+    tavi = TAVI("./test_data/tavi_test_exp424.h5")
     scan_list = list(range(42, 49, 1)) + list(range(70, 76, 1))
 
     sg = tavi.combine_scans(scan_list, name="dispH")
@@ -22,7 +22,7 @@ def test_scan_group_default_1d():
 
 
 def test_scan_group_1d_rebin():
-    tavi = TAVI("./test_data/tavi_exp424.h5")
+    tavi = TAVI("./test_data/tavi_test_exp424.h5")
     scan_list = list(range(42, 49, 1)) + list(range(70, 76, 1))
 
     sg = tavi.combine_scans(scan_list, name="dispH")
@@ -39,7 +39,7 @@ def test_scan_group_1d_rebin():
 
 
 def test_scan_group_2d():
-    tavi = TAVI("./test_data/tavi_exp424.h5")
+    tavi = TAVI("./test_data/tavi_test_exp424.h5")
     scan_list = list(range(42, 49, 1)) + list(range(70, 76, 1))
 
     sg = tavi.combine_scans(scan_list, name="dispH")
@@ -56,7 +56,7 @@ def test_scan_group_2d():
 
 
 def test_scan_group_2d_rebin():
-    tavi = TAVI("./test_data/tavi_exp424.h5")
+    tavi = TAVI("./test_data/tavi_test_exp424.h5")
     scan_list = list(range(42, 49, 1)) + list(range(70, 76, 1))
 
     sg = tavi.combine_scans(scan_list, name="dispH")