Changeset 3186 for trunk/GSASIIimgGUI.py

Timestamp:

Dec 9, 2017 8:54:59 AM (5 years ago)

Author:

vondreele

Message:

revisions to integrate images so that masks are reused if not changed in integrate all & auto integrate

File:

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

trunk/GSASIIimgGUI.py

@@ -19 +19 @@
 import copy
 import glob
+import time
 import re
 import math
@@ -144 +145 @@
 ################################################################################                    
 blkSize = 1024   #this seems to be optimal; will break in polymask if >1024
-def UpdateImageControls(G2frame,data,masks,useTA=None,IntegrateOnly=False):
+def UpdateImageControls(G2frame,data,masks,useTA=None,useMask=None,IntegrateOnly=False):
     '''Shows and handles the controls on the "Image Controls"
     data tree entry
@@ -238 +239 @@
         G2frame.slideSizer.GetChildren()[4].Window.SetValue(Imin)   #tricky
          
-    def OnIntegrate(event,useTA=None):
+    def OnIntegrate(event,useTA=None,useMask=None):
         '''Integrate image in response to a menu event or from the AutoIntegrate
         dialog. In the latter case, event=None. 
@@ -247 +248 @@
         wx.BeginBusyCursor()
         try:
-            G2frame.Integrate = G2img.ImageIntegrate(sumImg,data,masks,blkSize,useTA=useTA)            
+            G2frame.Integrate = G2img.ImageIntegrate(sumImg,data,masks,blkSize,useTA=useTA,useMask=useMask)            
         finally:
             wx.EndBusyCursor()    
@@ -270 +271 @@
                     pId = 0
                     oldData = {'tilt':0.,'distance':0.,'rotation':0.,'center':[0.,0.],'DetDepth':0.,'azmthOff':0.}
+                    oldMhash = 0
                     for icnt,item in enumerate(items):
                         GoOn = dlgp.Update(icnt)
@@ -283 +285 @@
                                 same = False
                         if not same:
-                            print('Use new image controls')
+                            t0 = time.time()
                             useTA = G2img.MakeUseTA(Data,blkSize)
+                            print(' Use new image controls; new xy -> th,azm time %.3f'%(time.time()-t0))
                         Masks = G2frame.GPXtree.GetItemPyData(
                             G2gd.GetGPXtreeItemId(G2frame,G2frame.Image,'Masks'))
+                        Mhash = hash(str(Masks))
+                        if  Mhash != oldMhash:
+                            t0 = time.time()
+                            useMask = G2img.MakeUseMask(Data,Masks,blkSize)
+                            print(' Use new mask; make mask time: %.3f'%(time.time()-t0))
+                            oldMhash = Mhash
                         image = GetImageZ(G2frame,Data)
-                        G2frame.Integrate = G2img.ImageIntegrate(image,Data,Masks,blkSize,useTA=useTA)
+                        G2frame.Integrate = G2img.ImageIntegrate(image,Data,Masks,blkSize,useTA=useTA,useMask=useMask)
                         del image   #force cleanup
                         pId = G2IO.SaveIntegration(G2frame,CId,Data)
@@ -1193 +1202 @@
     
     if IntegrateOnly:
-        OnIntegrate(None,useTA=useTA)
+        OnIntegrate(None,useTA=useTA,useMask=useMask)
         return
     
@@ -2771 +2780 @@
         self.Pause = True
             
-    def IntegrateImage(self,img,useTA=None):
+    def IntegrateImage(self,img,useTA=None,useMask=None):
         '''Integrates a single image. Ids for created PWDR entries (more than one is possible)
         are placed in G2frame.IntgOutList
@@ -2797 +2806 @@
         # simulate a Image Controls press, since that is where the
         # integration is hidden
-        UpdateImageControls(G2frame,data,masks,useTA=useTA,IntegrateOnly=True)
+        UpdateImageControls(G2frame,data,masks,useTA=useTA,useMask=useMask,IntegrateOnly=True)
         G2frame.IntegratedList.append(img) # note this as integrated
         # split name and control number
@@ -2974 +2983 @@
         This is called only after the "Start" button is pressed (then its label reads "Pause").
         '''
-        def AutoIntegrateImage(imgId,useTA=None):
+        def AutoIntegrateImage(imgId,useTA=None,useMask=None):
             '''Integrates an image that has been read into the data tree and updates the
             AutoInt window. 
@@ -2992 +3001 @@
             self.EnableButtons(False)
             try:
-                self.IntegrateImage(img,useTA=useTA)
+                self.IntegrateImage(img,useTA=useTA,useMask=useMask)
             finally:
                 self.EnableButtons(True)
@@ -3079 +3088 @@
         # have not yet been processed            
         oldData = {'tilt':0.,'distance':0.,'rotation':0.,'center':[0.,0.],'DetDepth':0.,'azmthOff':0.}
-        self.useTA = None
+        oldMhash = 0
+        if 'useTA' not in dir(self):    #initial definition; reuse if after Resume
+            self.useTA = None
+            self.useMask = None
         for img in G2gd.GetGPXtreeDataNames(G2frame,['IMG ']):
             imgId = G2gd.GetGPXtreeItemId(G2frame,G2frame.root,img)
@@ -3089 +3101 @@
             Data = G2frame.GPXtree.GetItemPyData(
                 G2gd.GetGPXtreeItemId(G2frame,imgId, 'Image Controls'))
-            same = True
+            sameTA = True
             for item in ['tilt','distance','rotation','center','DetDepth','azmthOff']:
                 if Data[item] != oldData[item]:
-                    same = False
-            if not same:
-                print('Use new image controls')
+                    sameTA = False
+            if not sameTA:
+                t0 = time.time()
                 self.useTA = G2img.MakeUseTA(Data,blkSize)
-            AutoIntegrateImage(imgId,self.useTA)
+                print(' Use new image controls; xy->th,azm mtime: %.3f'%(time.time()-t0))
+            Mask = G2frame.GPXtree.GetItemPyData(
+                G2gd.GetGPXtreeItemId(G2frame,imgId, 'Masks'))
+            Mhash = hash(str(Mask))
+            if  Mhash != oldMhash:
+                t0 = time.time()
+                self.useMask = G2img.MakeUseMask(Data,Mask,blkSize)
+                print(' Use new mask; make mask time: %.3f'%(time.time()-t0))
+                oldMhash = Mhash
+            AutoIntegrateImage(imgId,self.useTA,self.useMask)
             oldData = Data
             if self.pdfControls: AutoComputePDF(imgId)
@@ -3107 +3128 @@
 
         # loop over image files matching glob, reading in any new ones
+        if self.useTA is None or self.useMask is None:
+            print('Integration will not be fast; there is no beginning image controls')     #TODO: work this out??
         for newImage in self.currImageList:
             if newImage in imageFileList or self.Pause: continue # already read?
             for imgId in G2IO.ReadImages(G2frame,newImage):
-                AutoIntegrateImage(imgId,self.useTA)
+                AutoIntegrateImage(imgId,self.useTA,self.useMask)
                 if self.pdfControls: AutoComputePDF(imgId)
                 self.Pause |= G2frame.PauseIntegration