Changeset 442 for trunk/GSASIIimgGUI.py

Timestamp:

Dec 12, 2011 9:54:18 AM (11 years ago)

Author:

vondreele

Message:

fix to mask bug in image integration with background subtraction

File:

• trunk/GSASIIimgGUI.py (modified) (3 diffs)

trunk/GSASIIimgGUI.py

@@ -11 +11 @@
 import math
 import time
+import copy
 import cPickle
 import GSASIIpath
@@ -241 +242 @@
         
         if data['background image'][0]:
+            maskCopy = copy.deepcopy(masks)
             backImg = data['background image'][0]
             backScale = data['background image'][1]
@@ -247 +249 @@
             backImage = G2IO.GetImageData(self,imagefile,True)*backScale
             sumImage = self.ImageZ+backImage
-            print sumImage.shape,np.min(sumImage),np.max(sumImage)
-            self.Integrate = G2img.ImageIntegrate(sumImage,data,masks)
+            sumMin = np.min(sumImage)
+            sumMax = np.max(sumImage)
+            maskCopy['Thresholds'] = [(sumMin,sumMax),[sumMin,sumMax]]
+            self.Integrate = G2img.ImageIntegrate(sumImage,data,maskCopy)
         else:
             self.Integrate = G2img.ImageIntegrate(self.ImageZ,data,masks)