Merge pull request #1811 from HEXRD/calibration-distortion-fixes

Calibration distortion fixes

Author: psavery

hexrdgui/calibration/calibration_dialog.py

@@ -1,4 +1,5 @@
 import copy
+import traceback
 
 import yaml
 
@@ -296,6 +297,7 @@ def on_run_button_clicked(self):
         try:
             self.validate_parameters()
         except Exception as e:
+            traceback.print_exc()
             msg = 'Parameter settings are invalid!\n\n' + str(e)
             print(msg)
             QMessageBox.critical(self.parent(), 'Invalid Parameters', msg)
@@ -531,12 +533,18 @@ def on_delta_boundaries_toggled(self, b):
         self.reinitialize_tree_view()
 
     def mirror_constraints_from_first_detector(self):
+        instr = self.instr
         config = self.tree_view.model().config
         detector_iterator = iter(config['detectors'])
         first_detector_name = next(detector_iterator)
         first_detector = config['detectors'][first_detector_name]
         tilts = first_detector['transform']['tilt']
         translations = first_detector['transform']['translation']
+        first_distortion = first_detector.get('distortion parameters')
+        first_distortion_obj = instr.detectors[first_detector_name].distortion
+        first_distortion_type = (
+            first_distortion_obj.maptype if first_distortion else None
+        )
 
         statuses = {
             'tilt': {k: v['_param'].vary for k, v in tilts.items()},
@@ -577,6 +585,31 @@ def mirror_constraints_from_first_detector(self):
                         param.delta = v
                         det_transform[k]['_delta'] = v
 
+            # Check if we should copy distortion parameters too
+            distortion = detector.get('distortion parameters')
+            distortion_obj = instr.detectors[det_name].distortion
+            distortion_type = (
+                distortion_obj.maptype if distortion else None
+            )
+            copy_distortion = (
+                distortion_type and
+                distortion_type == first_distortion_type
+            )
+            if copy_distortion:
+                # Copy all parameters if the distortion function matches
+                for k, v in first_distortion.items():
+                    first_param = v['_param']
+                    param = distortion[k]['_param']
+                    if param.expr is None:
+                        # Only copy "vary" for non expression parameters
+                        param.vary = first_param.vary
+                        distortion[k]['_vary'] = first_param.vary
+
+                    if self.delta_boundaries:
+                        # Copy the deltas too
+                        param.delta = v['_delta']
+                        distortion[k]['_delta'] = v['_delta']
+
         self.tree_view.reset_gui()
 
     def update_from_calibrator(self, calibrator):

hexrdgui/calibration/hedm/calibration_dialog.py

@@ -5,6 +5,7 @@
 
 from hexrd import rotations
 import hexrd.constants as cnst
+from hexrd.fitting.calibration.calibrator import Calibrator
 from hexrd.fitting.calibration.lmfit_param_handling import fix_detector_y
 from hexrd.transforms import xfcapi
 
@@ -554,13 +555,22 @@ def load_picks_from_file(self, selected_file):
         raise NotImplementedError
 
 
-def compute_xyo(calibrators) -> dict[str, list]:
+def compute_xyo(calibrators: list[Calibrator]) -> dict[str, list]:
+    instr = calibrators[0].instr
     xyo = {}
     for calibrator in calibrators:
         results = calibrator.model()
         for det_key, values in results.items():
+            panel = instr.detectors[det_key]
             xyo.setdefault(det_key, [])
-            xyo[det_key].append(values[0])
+
+            values = values[0]
+            if panel.distortion is not None:
+                # The model results are not distorted
+                # Apply the distortion for the visualization
+                values[:, :2] = panel.distortion.apply_inverse(values[:, :2])
+
+            xyo[det_key].append(values)
 
     return xyo
 

hexrdgui/instrument_form_view_widget.py

@@ -585,7 +585,7 @@ def set_beam_vector_is_finite(self, b):
         # Update the config
         v = self.beam_vector_magnitude
         beam_config = self.active_beam
-        if beam_config['source_distance'] != v:
+        if beam_config.get('source_distance', np.inf) != v:
             beam_config['source_distance'] = v
             HexrdConfig().beam_vector_changed.emit()
 
@@ -618,7 +618,7 @@ def beam_vector_magnitude_value_changed(self, v):
 
         # Update the config
         beam_config = self.active_beam
-        if beam_config['source_distance'] != v:
+        if beam_config.get('source_distance', np.inf) != v:
             beam_config['source_distance'] = v
             HexrdConfig().beam_vector_changed.emit()
 
@@ -627,7 +627,9 @@ def beam_vector_magnitude_value_changed(self, v):
 
     def update_beam_vector_magnitude_from_config(self):
         beam_config = self.active_beam
-        self.beam_vector_magnitude = beam_config['source_distance']
+        dist = beam_config.get('source_distance', np.inf)
+        if self.beam_vector_magnitude != dist:
+            self.beam_vector_magnitude = dist
 
     @property
     def cartesian_beam_vector_convention(self):

hexrdgui/resources/ui/rotation_series_overlay_editor.ui

@@ -240,6 +240,9 @@
          <property name="alignment">
           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
          </property>
+         <property name="keyboardTracking">
+          <bool>false</bool>
+         </property>
          <property name="suffix">
           <string>°</string>
          </property>