maintain input_xtype, while make it non-settable

Author: bobleesj

src/diffpy/utils/diffraction_objects.py

@@ -198,12 +198,12 @@ def all_arrays(self, _):
         raise AttributeError(_setter_wmsg("all_arrays"))
 
     @property
-    def xtype(self):
-        return self._xtype
+    def input_xtype(self):
+        return self._input_xtype
 
-    @xtype.setter
-    def xtype(self, _):
-        raise AttributeError(_setter_wmsg("xtype"))
+    @input_xtype.setter
+    def input_xtype(self, _):
+        raise AttributeError(_setter_wmsg("input_xtype"))
 
     def set_angles_from_list(self, angles_list):
         self.angles = angles_list
@@ -289,7 +289,7 @@ def get_array_index(self, value, xtype=None):
         """
 
         if xtype is None:
-            xtype = self._xtype
+            xtype = self._input_xtype
         array = self.on_xtype(xtype)[0]
         if len(array) == 0:
             raise ValueError(f"The '{xtype}' array is empty. Please ensure it is initialized.")
@@ -348,7 +348,7 @@ def insert_scattering_quantity(
         """
         self._set_xarrays(xarray, xtype)
         self._all_arrays[:, 0] = yarray
-        self._xtype = xtype
+        self._input_xtype = xtype
         # only update these optional values if non-empty quantities are passed to avoid overwriting
         # valid data inadvertently
         if metadata:

tests/test_diffraction_objects.py

@@ -286,7 +286,7 @@ def test_dump(tmp_path, mocker):
         {
             "_all_arrays": np.empty(shape=(0, 4)),  # instantiate empty
             "metadata": {},
-            "_xtype": "",
+            "_input_xtype": "",
             "name": "",
             "scat_quantity": None,
             "qmin": np.float64(np.inf),
@@ -303,7 +303,7 @@ def test_dump(tmp_path, mocker):
         {
             "_all_arrays": np.empty(shape=(0, 4)),
             "metadata": {"thing": "1", "another": "2"},
-            "_xtype": "",
+            "_input_xtype": "",
             "name": "test",
             "scat_quantity": "x-ray",
             "qmin": np.float64(np.inf),
@@ -331,7 +331,7 @@ def test_dump(tmp_path, mocker):
                 ]
             ),
             "metadata": {},
-            "_xtype": "tth",
+            "_input_xtype": "tth",
             "name": "",
             "scat_quantity": None,
             "qmin": np.float64(0.0),
@@ -360,7 +360,7 @@ def test_dump(tmp_path, mocker):
                 ]
             ),
             "metadata": {},
-            "_xtype": "d",
+            "_input_xtype": "d",
             "name": "",
             "scat_quantity": "x-ray",
             "qmin": np.float64(0.0),
@@ -411,21 +411,21 @@ def test_all_array_setter():
         actual_do.all_arrays = np.empty((4, 4))
 
 
-def test_xtype_getter():
+def test_input_xtype_getter():
     do = DiffractionObject(xtype="tth")
-    assert do.xtype == "tth"
+    assert do.input_xtype == "tth"
 
 
-def test_xtype_setter():
+def test_input_xtype_setter():
     do = DiffractionObject(xtype="tth")
 
     # Attempt to directly modify the property
     with pytest.raises(
         AttributeError,
-        match="Direct modification of attribute 'xtype' is not allowed."
-        "Please use 'insert_scattering_quantity' to modify 'xtype'.",
+        match="Direct modification of attribute 'input_xtype' is not allowed."
+        "Please use 'insert_scattering_quantity' to modify 'input_xtype'.",
     ):
-        do.xtype = "q"
+        do.input_xtype = "q"
 
 
 def test_copy_object():