Merge branch 'rename_skip_n_points' into 'main'

rename variable

See merge request !179

src/est/core/io.py

@@ -65,7 +65,7 @@ def read_from_url(
     I2_url: DataUrl | None = None,
     mu_ref_url: DataUrl | None = None,
     is_concatenated: bool = False,
-    skip_concatenated_n_points: int = 0,
+    trim_concatenated_n_points: int = 0,
     skip_concatenated_n_spectra: int = 0,
     timeout: float = settings.DEFAULT_READ_TIMEOUT,
 ) -> XASObject:
@@ -92,7 +92,7 @@ def read_from_url(
         I2_url=I2_url,
         mu_ref_url=mu_ref_url,
         is_concatenated=is_concatenated,
-        skip_concatenated_n_points=skip_concatenated_n_points,
+        trim_concatenated_n_points=trim_concatenated_n_points,
         skip_concatenated_n_spectra=skip_concatenated_n_spectra,
     )
     return read_from_input_information(input_information, timeout=timeout)

src/est/gui/xas_object_definition/dialog.py

@@ -196,7 +196,7 @@ class XASObjectDialog(qt.QWidget):
             I2_url=advanceHDF5Info.getI2Url(),
             mu_ref_url=advanceHDF5Info.getMuRefUrl(),
             is_concatenated=self._h5Dialog.isSpectraConcatenated(),
-            skip_concatenated_n_points=self._h5Dialog.getSkipConcatenatedNPoints(),
+            trim_concatenated_n_points=self._h5Dialog.getSkipConcatenatedNPoints(),
             skip_concatenated_n_spectra=self._h5Dialog.getSkipConcatenatedNSpectra(),
         )
 

src/est/gui/xas_object_definition/hdf5.py

@@ -127,7 +127,7 @@ class _MandatoryXASObjectInfo(qt.QWidget):
         self._concatenatedWidget.layout().addWidget(self._skipConcatenatedNSpectra)
 
         label2 = qt.QLabel(
-            "Skip N first and last points of concatenated spectra",
+            "Trim N points of concatenated spectra",
             parent=self._bufWidget,
         )
         self._skipConcatenatedNPoints = qt.QSpinBox(parent=self._bufWidget)

src/est/io/concatenated.py

@@ -44,9 +44,9 @@ def read_concatenated_xas(
     for i, ramp_slice in enumerate(ramp_slices):
         raw_energy_i = raw_energy[ramp_slice]
         raw_spectrum_i = raw_spectra[ramp_slice]
-        if information.skip_concatenated_n_points:
-            raw_spectrum_i[: information.skip_concatenated_n_points] = numpy.nan
-            raw_spectrum_i[-information.skip_concatenated_n_points :] = numpy.nan
+        if information.trim_concatenated_n_points:
+            raw_spectrum_i[: information.trim_concatenated_n_points] = numpy.nan
+            raw_spectrum_i[-information.trim_concatenated_n_points :] = numpy.nan
         interpolated_spectra[:, i, 0] = numpy.interp(
             energy,
             raw_energy_i,

src/est/io/information.py

@@ -23,7 +23,7 @@ class InputInformation:
         I2_url: DataUrl | None = None,
         mu_ref_url: DataUrl | None = None,
         is_concatenated: bool = False,
-        skip_concatenated_n_points: int = 0,
+        trim_concatenated_n_points: int = 0,
         skip_concatenated_n_spectra: int = 0,
     ):
         # main information
@@ -33,7 +33,7 @@ class InputInformation:
         self.dimensions = dimensions_mod.parse_dimensions(dimensions)
         self.energy_unit = energy_unit
         self.is_concatenated = is_concatenated
-        self.skip_concatenated_n_points = skip_concatenated_n_points
+        self.trim_concatenated_n_points = trim_concatenated_n_points
         self.skip_concatenated_n_spectra = skip_concatenated_n_spectra
 
         # "fancy information"
@@ -60,7 +60,7 @@ class InputInformation:
             "I2_url": dump_url(self.I2_url),
             "mu_ref_url": dump_url(self.mu_ref_url),
             "is_concatenated": self.is_concatenated,
-            "skip_concatenated_n_points": self.skip_concatenated_n_points,
+            "trim_concatenated_n_points": self.trim_concatenated_n_points,
             "skip_concatenated_n_spectra": self.skip_concatenated_n_spectra,
         }
 
@@ -85,6 +85,6 @@ class InputInformation:
             I2_url=load_url("I2_url"),
             mu_ref_url=load_url("mu_ref_url"),
             is_concatenated=ddict.get("is_concatenated", False),
-            skip_concatenated_n_points=ddict.get("skip_concatenated_n_points", 0),
+            trim_concatenated_n_points=ddict.get("trim_concatenated_n_points", 0),
             skip_concatenated_n_spectra=ddict.get("skip_concatenated_n_spectra", 0),
         )

src/orangecontrib/est/widgets/utils/xas_input.py

@@ -82,7 +82,7 @@ class XASInputOW(OWEwoksWidgetNoThread, ewokstaskclass=ReadXasObject):
             if input_information.mu_ref_url is not None:
                 advanceHDF5Info.setMuRefUrl(input_information.mu_ref_url)
             self._inputDialog.getMainWindow().setSkipConcatenatedNPoints(
-                input_information.skip_concatenated_n_points
+                input_information.trim_concatenated_n_points
             )
             self._inputDialog.getMainWindow().setSkipConcatenatedNSpectra(
                 input_information.skip_concatenated_n_spectra