darfix 4.3.1__py3-none-any.whl → 4.3.2__py3-none-any.whl

darfix/gui/dimensions_widget.py

@@ -83,8 +83,6 @@ class DimensionTable(qt.QTableWidget):
             assert isinstance(dim, Dimension)
             self._addDim(axis, dim, decimals)
 
-        self.sigUpdateDims.emit()
-
     def onRemoveDim(self, iRow: int):
         """
         Remove dimension.
@@ -298,11 +296,13 @@ class DimensionItem(qt.QWidget):
         # start
         self._startWidget = qt.QDoubleSpinBox(self)
         self._startWidget.setMinimum(float("-inf"))
+        self._startWidget.setMaximum(float("+inf"))
         self._startWidget.setDecimals(5)
         self._startWidget.valueChanged.connect(self.sigDimChanged)
         # end
         self._stopWidget = qt.QDoubleSpinBox(self)
         self._stopWidget.setMinimum(float("-inf"))
+        self._stopWidget.setMaximum(float("+inf"))
         self._stopWidget.setDecimals(5)
         self._stopWidget.valueChanged.connect(self.sigDimChanged)
         # rm button

darfix/gui/noise_removal/noise_removal_widget.py

@@ -138,7 +138,7 @@ class NoiseRemovalWidget(qt.QWidget):
         self._dataset = dataset
 
         if self._imgDataset.title != "":
-            self._plot.setTitleCallback(lambda idx: self._imgDataset.title)
+            self._plot.setGraphTitle(self._imgDataset.title)
 
         self._initPlot()
 

darfix/gui/rocking_curves/rocking_curves_plot.py

@@ -245,7 +245,7 @@ class RockingCurvesPlot(qt.QWidget):
             y_gauss = bivariate_gaussian(x_values, *pars)
 
         except (TypeError, RuntimeError):
-            _logger.warning("Cannot fit", exc_info=True)
+            _logger.error("Cannot fit", exc_info=True)
             y_gauss = numpy.full_like(rocking_curve, numpy.nan)
         else:
             self._lastFitParamsLabel.setText(

darfix/processing/rocking_curves.py

@@ -17,9 +17,6 @@ from ..math import trivariate_gaussian
 
 FitMethod = Literal["trf", "lm", "dogbox"]
 
-_ZERO_SUM_RELATIVE_TOLERANCE = 1e-3
-""" Relative tolerance used to check if the sum of values equals 0. Skips fit if it is the case."""
-
 _BOUNDS_TOLERANCE = 1e-3
 """ Absolute tolerance for to set bounds of fit parameters. The bounds will be set to (min - tol, max + tol) whenever possible."""
 
@@ -246,6 +243,24 @@ def _gaussian_p0(com: list[float], fwhm: list[float], ptp_y: float):
     ]
 
 
+def _filter_contiguous_zeros(arr) -> numpy.ndarray:
+    """
+    Mask is FALSE if value == 0 AND its left neighbor == 0 AND its right neighbor == 0.
+
+    :param arr: 1D array
+
+    :return: 1D mask
+    """
+    is_zero = arr == 0
+
+    left_neighbor_zero = numpy.concatenate(([True], is_zero[:-1]))
+
+    right_neighbor_zero = numpy.concatenate((is_zero[1:], [True]))
+
+    mask = is_zero & left_neighbor_zero & right_neighbor_zero
+    return ~mask
+
+
 def _fit_xd_rocking_curve(
     len_maps: int,
     gaussian_function: Callable,
@@ -273,38 +288,42 @@ def _fit_xd_rocking_curve(
     if thresh is None:
         thresh = 15.0
 
-    com, fwhm = compute_com_fwhm(x_values, y_values)
-
     ptp_y = numpy.ptp(y_values)
 
+    y_not_zero_mask = _filter_contiguous_zeros(y_values)
+    x_not_zero_values = x_values[:, y_not_zero_mask]
+    y_not_zero_values = y_values[y_not_zero_mask]
     y_zeros = numpy.zeros_like(y_values)
 
+    com, fwhm = compute_com_fwhm(x_not_zero_values, y_not_zero_values)
+
     if ptp_y <= thresh:
         # Ptp under threshold
         return y_zeros, numpy.full(len_maps, numpy.nan)
 
-    if len(y_values) < len_maps:
-        return y_zeros, numpy.full(len_maps, numpy.nan)
-
     p0 = p0_function(com, fwhm, ptp_y)
 
+    if x_not_zero_values.shape[1] < len_maps:
+        # Cannot fit if there is less points than the number of parameters.
+        # Return `p0` for gaussian parameters is enough when there only a few points.
+        y_fitted = y_zeros
+        y_fitted[y_not_zero_mask] = gaussian_function(x_not_zero_values, *p0)
+        return y_fitted, p0
+
     vmax = max(y_values.max(), ptp_y)
 
     bounds = bounds_function(
         method,
-        x_values,
+        x_not_zero_values,
         min_y=thresh,
         max_y=vmax,
     )
 
-    y_not_zero_mask = y_values > 0
-    x_values_masked = x_values[:, y_not_zero_mask]
-
     try:
         fit_params, cov = curve_fit(
             f=gaussian_function,
-            xdata=x_values_masked,
-            ydata=y_values[y_not_zero_mask],
+            xdata=x_not_zero_values,
+            ydata=y_not_zero_values,
             p0=p0,
             method=method,
             bounds=bounds,
@@ -317,7 +336,7 @@ def _fit_xd_rocking_curve(
         return y_zeros, numpy.full(len_maps, numpy.nan)
 
     y_fitted = y_zeros
-    y_fitted[y_not_zero_mask] = gaussian_function(x_values_masked, *fit_params)
+    y_fitted[y_not_zero_mask] = gaussian_function(x_not_zero_values, *fit_params)
 
     return y_fitted, fit_params
 

darfix/tasks/rocking_curves.py

@@ -25,6 +25,8 @@ class Inputs(BaseInputModel):
     """Method to use for the rocking curves fit"""
     output_filename: str | Path | None = None
     """Output filename to save the rocking curves results. Results are not saved if not provided"""
+    save_maps: bool = True
+    """Whether to save the maps to file. Default is True."""
 
 
 class RockingCurves(Task, input_model=Inputs, output_names=["dataset", "maps"]):
@@ -38,13 +40,6 @@ class RockingCurves(Task, input_model=Inputs, output_names=["dataset", "maps"]):
 
         inputs = Inputs(**self.get_input_values())
 
-        output_filename = inputs.output_filename
-        if output_filename and os.path.isfile(output_filename):
-            raise FileExistsError(
-                f"""Cannot launch rocking curves fit: saving destination {output_filename} already exists.
-                Change the `output_filename` input or set it to None to disable saving."""
-            )
-
         dataset = inputs.dataset.dataset
         new_image_dataset, maps = dataset.apply_fit(
             int_thresh=inputs.int_thresh,
@@ -52,13 +47,14 @@ class RockingCurves(Task, input_model=Inputs, output_names=["dataset", "maps"]):
             abort_event=self.cancelEvent,
         )
 
-        if output_filename is not None:
+        if inputs.save_maps:
+
             nxdict = generate_rocking_curves_nxdict(
                 new_image_dataset,
                 maps,
                 residuals=compute_residuals(new_image_dataset, dataset),
             )
-            dicttonx(nxdict, output_filename)
+            dicttonx(nxdict, _get_output_path(inputs.output_filename, dataset.dir))
 
         self.outputs.dataset = Dataset(
             dataset=new_image_dataset,
@@ -68,3 +64,17 @@ class RockingCurves(Task, input_model=Inputs, output_names=["dataset", "maps"]):
 
     def cancel(self):
         self.cancelEvent.set()
+
+
+def _get_output_path(output_path: str | None, output_directory: str) -> str:
+    """
+    :return: Default output path or output path specified by user.
+    """
+    if output_path is None:
+        output_path = str(Path(output_directory) / "rocking_curve_maps.h5")
+    if os.path.isfile(output_path):
+        raise FileExistsError(
+            f"""Cannot launch rocking curves fit: saving destination {output_path} already exists.
+                Change the `output_filename` input or set `save_maps` input to False to disable saving."""
+        )
+    return output_path

darfix/tests/tasks/test_rocking_curves.py

@@ -2,7 +2,9 @@ import warnings
 from pathlib import Path
 
 import h5py
+import hdf5plugin  # noqa: F401
 import numpy
+import pytest
 from scipy.optimize import OptimizeWarning
 
 from darfix.core.rocking_curves_map import Maps_2D
@@ -10,8 +12,16 @@ from darfix.dtypes import Dataset
 from darfix.tasks.rocking_curves import RockingCurves
 
 
-def test_rocking_curves(input_dataset, tmp_path):
-    output_filename = tmp_path / "rocking_curves.h5"
+@pytest.mark.parametrize("test_default_value", (True, False))
+def test_rocking_curves(input_dataset, tmp_path, test_default_value):
+
+    if test_default_value:
+        output_filename = None
+        expected_output_filename = tmp_path / "rocking_curve_maps.h5"
+    else:
+        output_filename = tmp_path / "file_name_defined_by_user.h5"
+        expected_output_filename = output_filename
+
     input_dataset.find_dimensions()
     input_dataset.reshape_data()
     task = RockingCurves(
@@ -22,6 +32,7 @@ def test_rocking_curves(input_dataset, tmp_path):
             "int_thresh": 15,
         }
     )
+
     with warnings.catch_warnings():
         warnings.simplefilter("always", RuntimeWarning)
         warnings.simplefilter("always", OptimizeWarning)
@@ -29,8 +40,8 @@ def test_rocking_curves(input_dataset, tmp_path):
 
     assert isinstance(task.get_output_value("maps"), numpy.ndarray)
     assert isinstance(task.get_output_value("dataset"), Dataset)
-    assert output_filename.is_file()
-    with h5py.File(output_filename, "r") as output_file:
+    assert expected_output_filename.is_file()
+    with h5py.File(expected_output_filename, "r") as output_file:
         output_entry = output_file["entry"]
         for map_type in Maps_2D:
             assert map_type.value in output_entry

{darfix-4.3.1.dist-info → darfix-4.3.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: darfix
-Version: 4.3.1
+Version: 4.3.2
 Summary: Computer vision software for the interpretation of diffraction images
 Author-email: ESRF <dau-pydev@esrf.fr>
 License: The MIT license follows:

{darfix-4.3.1.dist-info → darfix-4.3.2.dist-info}/RECORD

@@ -42,7 +42,7 @@ darfix/gui/binning_widget.py,sha256=dYg9RT6VFaKdM6nB7P6O0f5KecRQuE--YVbv6F4BHjU,
 darfix/gui/blind_source_separation_widget.py,sha256=tPGLwfwBf5epS2-F-DtcnXlfoX1w2dyna-P8ej38fdY,6217
 darfix/gui/choose_dimensions.py,sha256=mZUW_6XNICu5Bu3cKd4A4XOszcRTXeWi4BTaBudZxJ0,8591
 darfix/gui/concatenate_scans.py,sha256=aGGC2zQySESmLtP9-wLn1d2Q7Hyl9B8uYoH2fcPcKEk,13140
-darfix/gui/dimensions_widget.py,sha256=DUUeZF7zyLBIkapaTT8PceKlnj6zLehdy_A7DFTTsT4,12349
+darfix/gui/dimensions_widget.py,sha256=-uPM9YLe-gqr1pcW_RF18SBsj1WLBXdp2t0sEo5zzRw,12417
 darfix/gui/display_components_widget.py,sha256=ToA0M-h8djzDpIy-eC4CGqjcMYxO36iOjU3AmCZtJzg,12916
 darfix/gui/filter_by_dimension.py,sha256=RWK1YVvwGLPkSR3qTDOzyrzTjZCa3xGwW9q3wmyGOuM,3050
 darfix/gui/magnification_widget.py,sha256=DwVf6qvjbZI_wFQ7iTfF8EYcgF0MzTfe6H4jO_yOxV4,5052
@@ -73,13 +73,13 @@ darfix/gui/grain_plot/grain_plot_widget.py,sha256=nUbd1rSnTUsAAiLJ5kQ7BlMJ46uBPW
 darfix/gui/grain_plot/mosaicity_widget.py,sha256=N4-M2k8xGftO8m4-xg7wFIbBJaDW1lwIpReJLWh6IZc,13639
 darfix/gui/grain_plot/oridist_toolbar.py,sha256=WGw1mekpDMNsuTOvj3TBoVOfJRyhB0aqGBgO_9NXrQ4,2925
 darfix/gui/grain_plot/utils.py,sha256=pwMrxdeyWqDiukCJPZW3__5lXxX5yLQz19UBPCo32bQ,1014
-darfix/gui/noise_removal/noise_removal_widget.py,sha256=7BulhlF_iLvXvK8e5S0jzIgF07G_qfOPej1WzEldbPk,12141
+darfix/gui/noise_removal/noise_removal_widget.py,sha256=6Ag_OQaT3gAU2DeocB4zpw6_jjdweYTYNjvHnnxutfM,12126
 darfix/gui/noise_removal/operation_list_widget.py,sha256=7jZDqoVPdLEXTwo7AUD5cT2CpmRHCvH6niDg5xLtvIE,2432
 darfix/gui/noise_removal/parameters_widget.py,sha256=Cz909i-TxV9tcqAxr5tXM_BHkIl5-XXx0R8khlZlwmM,5072
 darfix/gui/parallel/operation_process.py,sha256=2twAOVhPZfLFgQVNo65fl5e5bmyFtpOWm-4cu6GL1Kk,1535
 darfix/gui/parallel/operation_thread.py,sha256=_munmXiu7m2KF7x2N0PtOLEag2KzSHvis60vanRub0U,716
 darfix/gui/rocking_curves/fit_combobox.py,sha256=6omySgaBJvLbMzfGIfmQdlSk8zWp6NeMU5aCeMJG9v8,954
-darfix/gui/rocking_curves/rocking_curves_plot.py,sha256=mB7ktQCe4H1nw-miRnyLuj3Ztud091XrIYsxlClFXEY,11025
+darfix/gui/rocking_curves/rocking_curves_plot.py,sha256=_xxMlatrw3AARJymnNiI1OYINN7bjeXoKThy-auJFco,11023
 darfix/gui/rocking_curves/rocking_curves_widget.py,sha256=EDljD8tjKWRLhUQ5_maGP3qKmihsV39p3oP5cg826es,7728
 darfix/gui/rocking_curves/utils.py,sha256=piLRGF3UhtqSFKY5vs2N2YuhECroKxGo_6r7qwcq52g,328
 darfix/gui/shift_correction/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -104,7 +104,7 @@ darfix/io/utils.py,sha256=dskeyn0sUGVQNkESFzBOP5yB7oiMpuZHAQnJZZz7kdc,10912
 darfix/processing/__init__.py,sha256=b4W05nIjqNXNRPf8ZeDVK23CnTKkDtl0WRE71pnbKdw,78
 darfix/processing/dimension_detection.py,sha256=Z_ifqd7Nrcde4Qj-YOxwN3wjoIoI_U_s2WwOnkygNa8,1520
 darfix/processing/image_operations.py,sha256=AFSNwipyTNzH03ILm9K8KNLoIQKFTeVpwuIGGuXMvXM,3424
-darfix/processing/rocking_curves.py,sha256=I0tlAUdj2legChZMaW6TXb1EOXLbLj4p00zCAFBSVGA,10742
+darfix/processing/rocking_curves.py,sha256=KGdDMt6-zpPjmBfoqwsPyxSkivRat1ca0pgtcVRSPD8,11398
 darfix/resources/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 darfix/resources/gui/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 darfix/resources/gui/icons/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -148,7 +148,7 @@ darfix/tasks/noise_removal.py,sha256=JYqk5wyzQFOSQmIE9uSpVLl2JzPF9QSIQionOp8EWIw
 darfix/tasks/noiseremoval.py,sha256=L_rGkpuL1efn7UT9oc9V0uNvPoNG2O6Zx_cB-VypizA,286
 darfix/tasks/pca.py,sha256=9AuDvTB41LJl49xUlRagQeRLzccVfjg0-mPb-0APsPY,1504
 darfix/tasks/projection.py,sha256=QXfiwRfqi51pwYLuQs9CCa8KCL8DViuSVGdfG9L3GcI,1170
-darfix/tasks/rocking_curves.py,sha256=xVre-FioD0VVyRj2sBC9VezNbuWs80HnPceCHfg3pP4,2537
+darfix/tasks/rocking_curves.py,sha256=gI5yGHVs36xfm-CRlkUpNsw1VQ3owNHE_oIJ1Dtzga8,2864
 darfix/tasks/roi.py,sha256=LpqRL7Bay9YyVKU5RtV3w_Y6H11hpSSWtxFr3ugRnfk,2185
 darfix/tasks/rsm_histogram.py,sha256=tB_8w_oW-SYYq5w39MUPEjru4AN9DyKX0r6tGl41Dco,2443
 darfix/tasks/shift_correction.py,sha256=8YNpq93Pcnl94rWPWLqwuH83lMdr4VG5ehDy3SdXlhY,1477
@@ -208,9 +208,9 @@ darfix/tests/tasks/test_data_copy.py,sha256=9-35CFsugV4LAPmjY9w14iH5UUrzWa77MQrF
 darfix/tests/tasks/test_dimension_definition.py,sha256=RarT4IAOHi0p_LxrUeqKN4Tm21FqTCpPwa6ZKT5JqhM,1427
 darfix/tests/tasks/test_hdf5_data_selection.py,sha256=NYlp0dwAIidR9XZc3zCKfEPSPw1UoFS2u4_Z1muc05g,2436
 darfix/tests/tasks/test_hdf5_scans_concatenation.py,sha256=tiyMrcnOqrSp5ZwWSprIdb0MnBviOEAcRqs2ENAfKl8,6720
-darfix/tests/tasks/test_rocking_curves.py,sha256=pghKNqpg8VViJHtvTcc02UjayAV9i_7tg_LqOqLH0bo,1936
+darfix/tests/tasks/test_rocking_curves.py,sha256=Vsvbg629sEqyYffwWSDDEbLK03pCKo3cEHHUKyrRqSQ,2289
 darfix/tests/tasks/test_weak_beam.py,sha256=9kBIY0Ak6Y9h7SsdOhaCZtYvN6uEWDG4218bWut7108,289
-darfix-4.3.1.dist-info/licenses/LICENSE,sha256=ls2LRs5fu3tWZ-jmhAP4_BAGP2jgVX58-UzQwJuLiT4,1214
+darfix-4.3.2.dist-info/licenses/LICENSE,sha256=ls2LRs5fu3tWZ-jmhAP4_BAGP2jgVX58-UzQwJuLiT4,1214
 orangecontrib/darfix/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 orangecontrib/darfix/tutorials/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 orangecontrib/darfix/tutorials/darfix_example1.ows,sha256=QwTYzaRrDMvyd1Qdg5J10kaYqVymRYtkQubwnedulDc,3323
@@ -226,7 +226,7 @@ orangecontrib/darfix/widgets/concatenateHDF5.py,sha256=mLqhhrjoS_glOZyvpz_gh-fzb
 orangecontrib/darfix/widgets/datacopy.py,sha256=GR1V3zIjZVYnXOjoGc5_E4uFYpLpRv9MV1vvs5LIC4c,357
 orangecontrib/darfix/widgets/datapartition.py,sha256=F9ODpTHF_Hdk30V1rc43S_W5zXbmW1NYIBVHIwwzUgA,1125
 orangecontrib/darfix/widgets/dataset_widget_base.py,sha256=UxGKwpmMvseL6z-UNuAMM0_2d4OIWzliXlYLzV5uzLs,2969
-orangecontrib/darfix/widgets/dimensions.py,sha256=pamBx-SGRT5dds7DZ85SDCf2LryUAfLaUgeq00kuDGE,8960
+orangecontrib/darfix/widgets/dimensions.py,sha256=2tAKdZJ_n42oGRrc4uCKnLu_7Y8fqkpVlSG8G9cvSug,8983
 orangecontrib/darfix/widgets/grainplot.py,sha256=VJZWMYHiGgaydRXDbytr5MNCDvJ6tOdOyHe6oDx9-4Y,2059
 orangecontrib/darfix/widgets/hdf5dataselection.py,sha256=R6YYkyE0BhE9Dc0d5Fy4OltKO2MLYxMvIFijO2jqQOw,6773
 orangecontrib/darfix/widgets/metadata.py,sha256=7sVyFGV9ASEdooYXctopqjh6wlAKukeAMceTNI2uReU,1073
@@ -234,7 +234,7 @@ orangecontrib/darfix/widgets/noiseremoval.py,sha256=7378oWN4OeS7GBZZAQ6rnwYID_Fo
 orangecontrib/darfix/widgets/operation_widget_base.py,sha256=ktMlgy5I1ycfOCxjg4EQFTYFPFziK3oO7dLADyzdoO8,5541
 orangecontrib/darfix/widgets/pca.py,sha256=clsyEHmMAInVrxbk2vwxpABrcbYQVE4QrBMVWBKz6Jk,1181
 orangecontrib/darfix/widgets/projection.py,sha256=csyaGHI3ORfUQn0O-d3MWEdRlBb7sM4GlwAzmXThDtQ,2013
-orangecontrib/darfix/widgets/rockingcurves.py,sha256=5Dp75SEsElLNmnn8rxrOFVN5uhyRx10l-nuLXl6AZmo,2194
+orangecontrib/darfix/widgets/rockingcurves.py,sha256=J4dzImg_T-rqQJA2undX87uZ10NN8n-zqZ8-pMOa1m8,2245
 orangecontrib/darfix/widgets/roiselection.py,sha256=I1hnxUSHBnEi9PwcvZuBbGT_0lP87ONdL-EVmj2lKfk,2244
 orangecontrib/darfix/widgets/rsmhistogram.py,sha256=6wjhmIRKV8T7FgqR1ydvYl9NTOKFWq86ZwpNX4j-plg,3137
 orangecontrib/darfix/widgets/shiftcorrection.py,sha256=SYN37b_gN8hVKniLVs06FB-1B_5P9WryTgLwhBVOUVY,1629
@@ -280,8 +280,8 @@ orangecontrib/darfix/widgets/icons/shift_correction.svg,sha256=Li6T-znhmuVRUgWxv
 orangecontrib/darfix/widgets/icons/upload_edf.svg,sha256=qQM5ih6BMcxjwuIkifOkUPfccCPPCXYjfpm1jJWXTpk,6074
 orangecontrib/darfix/widgets/icons/upload_hdf5.svg,sha256=P0DZcI2UhKyZbvMdSDbs0eQPZ5GfMmLq-wTmNe3l2Vk,6775
 orangecontrib/darfix/widgets/icons/zsum.svg,sha256=GvpoosUjuYBX2hmPlzshWuV6M99qPCsy6Z39bT_HMCE,2853
-darfix-4.3.1.dist-info/METADATA,sha256=JlJsMxPyMxwSu3sM_rvctIhL807kSRxrZRiywbsv00I,4568
-darfix-4.3.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-darfix-4.3.1.dist-info/entry_points.txt,sha256=AhLc89kdVbo4CrOAF4_BqNHQG4QIl9SwrWeTZK-EnQA,348
-darfix-4.3.1.dist-info/top_level.txt,sha256=-WsaAwUn9nIZn0GI71dBy6866rRgdJIs06crtWlPcH8,21
-darfix-4.3.1.dist-info/RECORD,,
+darfix-4.3.2.dist-info/METADATA,sha256=rj7SxcXqBduUcQdEfQZdv546JqHvKk-jN3_wchrhsLk,4568
+darfix-4.3.2.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+darfix-4.3.2.dist-info/entry_points.txt,sha256=AhLc89kdVbo4CrOAF4_BqNHQG4QIl9SwrWeTZK-EnQA,348
+darfix-4.3.2.dist-info/top_level.txt,sha256=-WsaAwUn9nIZn0GI71dBy6866rRgdJIs06crtWlPcH8,21
+darfix-4.3.2.dist-info/RECORD,,

{darfix-4.3.1.dist-info → darfix-4.3.2.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.9.0)
+Generator: setuptools (80.10.2)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

orangecontrib/darfix/widgets/dimensions.py

@@ -108,6 +108,7 @@ class DimensionWidgetOW(DatasetWidgetBase, ewokstaskclass=DimensionDefinition):
                 )
                 # Disable inputs only when the dim rows are added
                 self._widget.setEnableInputs(False)
+                self.buttons.button(qt.QDialogButtonBox.Ok).setEnabled(True)
             else:
                 self._widget.setEnableInputs(True)
                 _logger.error(
@@ -142,8 +143,7 @@ class DimensionWidgetOW(DatasetWidgetBase, ewokstaskclass=DimensionDefinition):
             raw_dims = self.get_task_input_value("dims")
             if not is_missing_data(raw_dims):
                 dims = convert_dim_from_dict_to_Dimension(raw_dims)
-                with block_signals(self._widget):
-                    self._widget.setDims(dims)
+                self._widget.setDims(dims)
             self._widget.setZigzagMode(self.get_task_input_value("is_zigzag", False))
             self._widget.setEnableInputs(False)
         except ValueError as e:

orangecontrib/darfix/widgets/rockingcurves.py

@@ -52,6 +52,7 @@ class RockingCurvesWidgetOW(DatasetWidgetBase, ewokstaskclass=RockingCurves):
             self._widget.updateDataset(dataset.dataset, maps)
 
     def _launch_fit(self):
+        self.set_dynamic_input("save_maps", False)
         self.set_default_input("int_thresh", self._widget.getIntensityThreshold())
         self.set_default_input("method", self._widget.getFitMethod())
         self.execute_ewoks_task()