easier io on wigners

Author: ddkohler

tests/data/axis/convert_axis.py

@@ -50,24 +50,24 @@ def test_exception():
     data.close()
 
 
-def test_w1_wa():
-    p = datasets.PyCMDS.w1_wa_000
-    data = wt.data.from_PyCMDS(p)
-    assert data.wa.units == "wn"
-    data.wa.convert("eV")
-    assert data.wa.units == "eV"
-    assert np.isclose(data.wa.max(), 1.5800551001941774)
-    assert np.isclose(data.wa.min(), 0.6725528801867734)
-    assert data["wa"].units == "nm"
+def test_w1_wm():
+    p = datasets.wt5.v1p0p1_MoS2_TrEE_movie
+    data = wt.open(p).at(d2=[0, "fs"])
+    assert data.w2.units == "nm"
+    data.w2.convert("eV")
+    assert data.w2.units == "eV"
+    assert np.isclose(data.w2.max(), 2.120129779494837)
+    assert np.isclose(data.w2.min(), 1.6241930110774845)
+    assert data["w2"].units == "nm"
     data.close()
 
 
 def test_wigner():
-    p = datasets.COLORS.v2p2_WL_wigner
-    data = wt.data.from_COLORS(p)
-    data.d1.convert("ns")
-    assert data.d1.units == "ns"
-    assert data["d1"].units == "fs"
+    p = datasets.wt5.v1p0p1_MoS2_TrEE_movie
+    data = wt.open(p).at(w2=[680, "nm"])
+    data.d2.convert("ns")
+    assert data.d2.units == "ns"
+    assert data["d2"].units == "fs"
     data.close()
 
 
@@ -78,5 +78,5 @@ def test_wigner():
     test_convert_variables()
     test_units_preserved_on_copy()
     test_exception()
-    test_w1_wa()
+    test_w1_wm()
     test_wigner()

tests/data/channel/normalize.py

@@ -33,17 +33,17 @@ def test_LDS821_mag_0p5():
 
 
 def test_wigner():
-    p = datasets.COLORS.v2p2_WL_wigner
-    data = wt.data.from_COLORS(p)
+    p = datasets.wt5.v1p0p1_MoS2_TrEE_movie
+    data = wt.open(p).at(w2=[680, "nm"])
     data.ai0.normalize()
     assert np.isclose(data.ai0.null, 0.0)
     assert np.isclose(data.ai0.max(), 1.0)
     data.close()
 
 
 def test_negative_wigner():
-    p = datasets.COLORS.v2p2_WL_wigner
-    data = wt.data.from_COLORS(p)
+    p = datasets.wt5.v1p0p1_MoS2_TrEE_movie
+    data = wt.open(p).at(w2=[680, "nm"])
     data.ai0 *= -1
     data.ai0.signed = True
     data.ai0.normalize()
@@ -54,8 +54,8 @@ def test_negative_wigner():
 
 
 def test_negative_wigner_mag_1p1():
-    p = datasets.COLORS.v2p2_WL_wigner
-    data = wt.data.from_COLORS(p)
+    p = datasets.wt5.v1p0p1_MoS2_TrEE_movie
+    data = wt.open(p).at(w2=[680, "nm"])
     data.ai0 *= -1
     data.ai0.signed = True
     data.ai0.normalize(1.1)

tests/data/convert_data.py

@@ -44,8 +44,10 @@ def test_w1_wa():
 
 
 def test_wigner():
-    p = datasets.COLORS.v2p2_WL_wigner
-    data = wt.data.from_COLORS(p)
+    data = wt.Data()
+    data.create_variable("wm", values=np.linspace(100,300)[:,None], units="nm")
+    data.create_variable("d1", values=np.linspace(-100,100)[None,:], units="fs")
+    data.transform("d1", "wm")
     data.convert("ns")
     assert data.d1.units == "ns"
     assert data["d1"].units == "fs"

tests/data/map_variable.py

@@ -25,12 +25,12 @@ def test_array():
 
 def test_int():
     p = datasets.PyCMDS.wm_w2_w1_000
-    data = wt.data.from_PyCMDS(p)
-    assert data.shape == (35, 11, 11)
+    data = wt.data.from_PyCMDS(p)[::10]
+    assert data.shape == (4, 11, 11)
     mapped = data.map_variable("w2", 5)
-    assert mapped.shape == (35, 5, 11)
+    assert mapped.shape == (4, 5, 11)
     mapped = data.map_variable("w1", 25)
-    assert mapped.shape == (35, 11, 25)
+    assert mapped.shape == (4, 11, 25)
     data.close()