Merge pull request #1055 from psavery/unpolarized-lorentz-polarization

Add unpolarized option to Lorentz polarization

Author: joelvbernier

hexrd/ui/hexrd_config.py

@@ -555,6 +555,7 @@ def intensity_corrected_images_dict(self):
         if HexrdConfig().apply_lorentz_polarization_correction:
             options = self.config['image']['lorentz_polarization']
             kwargs = {
+                'unpolarized': options['unpolarized'],
                 'f_hor': options['f_hor'],
                 'f_vert': options['f_vert'],
             }

hexrd/ui/lorentz_polarization_options_dialog.py

@@ -24,11 +24,13 @@ def exec_(self):
     def accept(self):
         # When the dialog is accepted, save the settings in HexrdConfig.
         options = HexrdConfig().config['image']['lorentz_polarization']
+        options['unpolarized'] = self.ui.unpolarized.isChecked()
         options['f_hor'] = self.ui.horizontal.value()
         options['f_vert'] = self.ui.vertical.value()
 
     def update_gui(self):
         options = HexrdConfig().config['image']['lorentz_polarization']
+        self.ui.unpolarized.setChecked(options['unpolarized'])
         self.ui.horizontal.setValue(options['f_hor'])
         self.ui.vertical.setValue(options['f_vert'])
 

hexrd/ui/resources/calibration/default_image_config.yml

@@ -21,6 +21,7 @@ show_detector_borders: true
 apply_pixel_solid_angle_correction: false
 apply_lorentz_polarization_correction: false
 lorentz_polarization:
+  unpolarized: false
   f_hor: 1.0
   f_vert: 0.0
 intensity_subtract_minimum: false

hexrd/ui/resources/ui/lorentz_polarization_options_dialog.ui

@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>302</width>
-    <height>107</height>
+    <width>318</width>
+    <height>158</height>
    </rect>
   </property>
   <property name="minimumSize">
@@ -23,21 +23,21 @@
    <string notr="true"/>
   </property>
   <layout class="QGridLayout" name="gridLayout">
-   <item row="0" column="0">
-    <widget class="QLabel" name="horizontal_label">
+   <item row="2" column="0">
+    <widget class="QLabel" name="vertical_label">
      <property name="text">
-      <string>Horizontal Fraction:</string>
+      <string>Vertical Fraction:</string>
      </property>
     </widget>
    </item>
-   <item row="1" column="0">
-    <widget class="QLabel" name="vertical_label">
-     <property name="text">
-      <string>Vertical Fraction:</string>
+   <item row="3" column="0" colspan="2">
+    <widget class="QDialogButtonBox" name="button_box">
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
      </property>
     </widget>
    </item>
-   <item row="0" column="1">
+   <item row="1" column="1">
     <widget class="ScientificDoubleSpinBox" name="horizontal">
      <property name="keyboardTracking">
       <bool>false</bool>
@@ -53,7 +53,7 @@
      </property>
     </widget>
    </item>
-   <item row="1" column="1">
+   <item row="2" column="1">
     <widget class="ScientificDoubleSpinBox" name="vertical">
      <property name="keyboardTracking">
       <bool>false</bool>
@@ -66,10 +66,17 @@
      </property>
     </widget>
    </item>
-   <item row="2" column="0" colspan="2">
-    <widget class="QDialogButtonBox" name="button_box">
-     <property name="standardButtons">
-      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+   <item row="1" column="0">
+    <widget class="QLabel" name="horizontal_label">
+     <property name="text">
+      <string>Horizontal Fraction:</string>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="0">
+    <widget class="QCheckBox" name="unpolarized">
+     <property name="text">
+      <string>Unpolarized</string>
      </property>
     </widget>
    </item>
@@ -120,5 +127,69 @@
     </hint>
    </hints>
   </connection>
+  <connection>
+   <sender>unpolarized</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>horizontal_label</receiver>
+   <slot>setDisabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>91</x>
+     <y>24</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>91</x>
+     <y>59</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>unpolarized</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>horizontal</receiver>
+   <slot>setDisabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>91</x>
+     <y>24</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>242</x>
+     <y>59</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>unpolarized</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>vertical_label</receiver>
+   <slot>setDisabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>91</x>
+     <y>24</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>91</x>
+     <y>96</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>unpolarized</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>vertical</receiver>
+   <slot>setDisabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>91</x>
+     <y>24</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>242</x>
+     <y>96</y>
+    </hint>
+   </hints>
+  </connection>
  </connections>
 </ui>