Merge pull request #1812 from HEXRD/minor-fixes

Check for masked array when exporting polar plots

Author: psavery

hexrdgui/calibration/polar_plot.py

@@ -130,8 +130,13 @@ def write_image(self, filename='polar_image.npz'):
             np.savetxt(filename, azimuthal_integration, delimiter=delimiter)
             return
 
-        intensities = self.img.filled(np.nan)
-        raw_intensities = self.raw_img.filled(np.nan)
+        intensities = self.img
+        if np.ma.is_masked(intensities):
+            intensities = intensities.filled(np.nan)
+
+        raw_intensities = self.raw_img
+        if np.ma.is_masked(raw_intensities):
+            raw_intensities = raw_intensities.filled(np.nan)
 
         eta, tth = np.degrees(self.angular_grid)
 

hexrdgui/masking/mask_regions_dialog.py

@@ -206,7 +206,10 @@ def button_pressed(self, event):
             print('Masking must be done in raw or polar view')
             return
 
-        if HexrdConfig().stitch_raw_roi_images:
+        if (
+            self.image_mode == ViewType.raw and
+            HexrdConfig().stitch_raw_roi_images
+        ):
             print('Ellipse/rectangle masks do not yet support drawing on a '
                   'stitched raw view. Please switch to an unstitched view to '
                   'draw the masks.')