diff --git a/orix/io/plugins/ang.py b/orix/io/plugins/ang.py index a88868af..1d941015 100644 --- a/orix/io/plugins/ang.py +++ b/orix/io/plugins/ang.py @@ -35,11 +35,6 @@ __all__ = ["file_reader", "file_writer"] -# MTEX has this format sorted out, check out their readers when fixing -# issues and adapting to other versions of this file format in the future: -# https://github.com/mtex-toolbox/mtex/blob/develop/interfaces/loadEBSD_ang.m -# https://github.com/mtex-toolbox/mtex/blob/develop/interfaces/loadEBSD_ACOM.m - # Plugin description format_name = "ang" file_extensions = ["ang"] @@ -174,7 +169,8 @@ def _get_vendor_columns(header: List[str], n_cols_file: int) -> Tuple[str, List[ Returns ------- vendor - Determined vendor (``"tsl"``, ``"astar"``, or ``"emsoft"``). + Determined vendor (``"tsl"``, ``"astar"``, ``"emsoft"`` or + ``"orix"``). column_names List of column names. """ @@ -207,12 +203,12 @@ def _get_vendor_columns(header: List[str], n_cols_file: int) -> Tuple[str, List[ "iq", # Image quality from Hough transform "ci", # Confidence index "phase_id", - "unknown1", + "detector_signal", "fit", # Pattern fit + "unknown1", "unknown2", "unknown3", "unknown4", - "unknown5", ], 1: [ "euler1", @@ -223,7 +219,7 @@ def _get_vendor_columns(header: List[str], n_cols_file: int) -> Tuple[str, List[ "iq", "ci", "phase_id", - "unknown1", + "detector_signal", "fit", ], }, diff --git a/orix/tests/io/test_ang.py b/orix/tests/io/test_ang.py index 442c879d..56658764 100644 --- a/orix/tests/io/test_ang.py +++ b/orix/tests/io/test_ang.py @@ -138,8 +138,8 @@ def test_load_ang_tsl( assert non_indexed_fraction == np.sum(~xmap.is_indexed) # Properties - prop_names = ["iq", "ci", "unknown1", "fit"] - prop_names += [f"unknown{i + 2}" for i in range(n_unknown_cols - 1)] + prop_names = ["iq", "ci", "detector_signal", "fit"] + prop_names += [f"unknown{i + 1}" for i in range(n_unknown_cols - 1)] assert list(xmap.prop.keys()) == prop_names # Coordinates @@ -399,12 +399,12 @@ def test_get_header(self, temp_ang_file): "iq", "ci", "phase_id", - "unknown1", + "detector_signal", "fit", + "unknown1", "unknown2", "unknown3", "unknown4", - "unknown5", ], ANGFILE_TSL_HEADER, ),