diff --git a/hexrdgui/overlays/powder_overlay.py b/hexrdgui/overlays/powder_overlay.py index 663ef698c..5bd6b9183 100644 --- a/hexrdgui/overlays/powder_overlay.py +++ b/hexrdgui/overlays/powder_overlay.py @@ -654,7 +654,8 @@ def pinhole_distortion_kwargs(self): kwargs = self.tth_distortion_kwargs.copy() if self.pinhole_distortion_type == 'RyggPinholeDistortion': # Add our absorption length - kwargs['absorption_length'] = HexrdConfig().absorption_length() + kwargs['absorption_length'] = HexrdConfig( + ).absorption_length() * 1e-3 return kwargs # END PolarDistortionObject mixin reroutes diff --git a/hexrdgui/physics_package_manager_dialog.py b/hexrdgui/physics_package_manager_dialog.py index 4fbcdf791..0e7fde09c 100644 --- a/hexrdgui/physics_package_manager_dialog.py +++ b/hexrdgui/physics_package_manager_dialog.py @@ -142,7 +142,7 @@ def setup_form(self): self.ui.pinhole_density.setValue(physics.pinhole_density) if self.instrument_type == 'PXRDIP': self.ui.pinhole_thickness.setValue(70) - self.ui.pinhole_diameter.setValue(130) + self.ui.pinhole_diameter.setValue(300) else: self.ui.pinhole_thickness.setValue(physics.pinhole_thickness) self.ui.pinhole_diameter.setValue(physics.pinhole_diameter) diff --git a/hexrdgui/pinhole_correction_editor.py b/hexrdgui/pinhole_correction_editor.py index b555197bd..af0cd85b6 100644 --- a/hexrdgui/pinhole_correction_editor.py +++ b/hexrdgui/pinhole_correction_editor.py @@ -154,6 +154,7 @@ def correction_kwargs(self, v): if v is None: return + vp = v.copy() # These units are in mm, but we display in micrometers for key, value in v.items(): if key in ('num_phi_elements', 'absorption_length'): @@ -161,7 +162,7 @@ def correction_kwargs(self, v): else: multiplier = 1e3 - v[key] = value * multiplier + vp[key] = value * multiplier physics = HexrdConfig().physics_package if physics is None: @@ -201,7 +202,7 @@ def correction_kwargs(self, v): for w_name, (key, value) in values.items(): if w_name.startswith(widget_prefix): # Extract the value from the dict - value = v.get(key, value) + value = vp.get(key, value) w = getattr(self.ui, w_name) w.setValue(value)