Fix AoI name for indexing

PyEllips · Oct 1, 2024 · a3af4ef · a3af4ef
1 parent c95a417
commit a3af4ef
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 14 deletions.
diff --git a/src/elli/importer/nexus.py b/src/elli/importer/nexus.py
@@ -74,7 +74,7 @@ def read_data(
             {},
             columns=["Ψ", "Δ"],
             index=pd.MultiIndex.from_product(
-                [aois, wavelength], names=["Angle of Incidence", "Wavelength"]
+                [aois, wavelength], names=["Angle_of_Incidence", "Wavelength"]
             ),
             dtype=float,
         )

diff --git a/src/elli/importer/spectraray.py b/src/elli/importer/spectraray.py
@@ -46,7 +46,7 @@ def read_spectraray_psi_delta(
 
     aois = list(map(float, re.split(sep, header)[3::2]))
     index = pd.MultiIndex.from_product(
-        [aois, ["Ψ", "Δ"]], names=["Angle of Incidence", ""]
+        [aois, ["Ψ", "Δ"]], names=["Angle_of_Incidence", ""]
     )
     psi_delta_df.columns = index
 
@@ -55,7 +55,7 @@ def read_spectraray_psi_delta(
         psi_delta_df = psi_delta_df.stack(0, future_stack=True)
     else:
         psi_delta_df = psi_delta_df.stack(0)
-    psi_delta_df = psi_delta_df.reorder_levels(["Angle of Incidence", "Wavelength"])
+    psi_delta_df = psi_delta_df.reorder_levels(["Angle_of_Incidence", "Wavelength"])
     psi_delta_df.sort_index(axis=0, inplace=True)
     psi_delta_df.sort_index(axis=1, ascending=False, inplace=True)
 

diff --git a/src/elli/importer/woollam.py b/src/elli/importer/woollam.py
@@ -124,12 +124,12 @@ def _read_wvase_dataframe(file_object: TextIO) -> pd.DataFrame:
         file_object,
         sep="\t",
         header=None,
-        names=["Wavelength", "Angle of Incidence", "Ψ", "Δ", "Ψ_err", "Δ_err"],
+        names=["Wavelength", "Angle_of_Incidence", "Ψ", "Δ", "Ψ_err", "Δ_err"],
     )
     print(dframe)
     dframe = (
         dframe[dframe.apply(lambda x: is_float(x.iloc[0]), axis=1)]
-        .set_index(["Wavelength", "Angle of Incidence"])
+        .set_index(["Wavelength", "Angle_of_Incidence"])
         .swaplevel(0, 1)
     )
     return dframe
@@ -152,7 +152,7 @@ def _read_complete_ease_dataframe(file_object: TextIO) -> pd.DataFrame:
     dframe = pd.read_csv(file_object, sep="\t", header=None, index_col=(2, 1))
     dframe = dframe[dframe[0] == "E"]
     dframe = dframe.iloc[:, 1:]
-    dframe.index.names = ("Angle of Incidence", "Wavelength")
+    dframe.index.names = ("Angle_of_Incidence", "Wavelength")
     dframe.columns = ["Ψ", "Δ", "Ψ_err", "Δ_err"]
     return dframe
 

diff --git a/tests/test_TiO2.py b/tests/test_TiO2.py
@@ -32,10 +32,8 @@ def datadir(tmpdir, request):
 @fixture
 def meas_data(datadir):
     """Fixture for getting the reference measurement data from the file."""
-    return (
-        elli.read_spectraray_rho(datadir.join("TiO2_400cycles.txt"))
-        .loc[70.06]
-        .loc[400:800]
+    return elli.read_spectraray_rho(datadir.join("TiO2_400cycles.txt")).sel(
+        Angle_of_Incidence=70.06, Wavelength=slice(400, 800)
     )
 
 

diff --git a/tests/test_wollam.py b/tests/test_wollam.py
@@ -20,8 +20,8 @@ def test_reading_of_psi_delta_woollam(datadir):
     assert len(data_wvase.Wavelength) == 181
     assert len(data_cease.Wavelength) == 1088
 
-    np.testing.assert_array_equal(data_wvase["Angle of Incidence"], [65, 70, 75])
-    np.testing.assert_array_equal(data_cease["Angle of Incidence"], [50, 60, 70])
+    np.testing.assert_array_equal(data_wvase.Angle_of_Incidence, [65, 70, 75])
+    np.testing.assert_array_equal(data_cease.Angle_of_Incidence, [50, 60, 70])
 
 
 # pylint: disable=redefined-outer-name
@@ -36,8 +36,8 @@ def test_reading_and_conv_to_woollam(datadir):
     assert len(data_wvase.Wavelength) == 181
     assert len(data_cease.Wavelength) == 1088
 
-    np.testing.assert_array_equal(data_wvase["Angle of Incidence"], [65, 70, 75])
-    np.testing.assert_array_equal(data_cease["Angle of Incidence"], [50, 60, 70])
+    np.testing.assert_array_equal(data_wvase.Angle_of_Incidence, [65, 70, 75])
+    np.testing.assert_array_equal(data_cease.Angle_of_Incidence, [50, 60, 70])
 
 
 # pylint: disable=redefined-outer-name