Changeset 3173 for trunk/GSASIIimgGUI.py

Timestamp:

Dec 5, 2017 3:23:50 PM (5 years ago)

Author:

vondreele

Message:

ensure limits on multiple powder patterns from integration are independent
Integrate All & Auto integrate now reuse x,y --> 2th,azm maps if image controls unchanged - much faster multiple integrations

File:

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

trunk/GSASIIimgGUI.py

@@ -143 +143 @@
 ##### Image Controls
 ################################################################################                    
-def UpdateImageControls(G2frame,data,masks,IntegrateOnly=False):
+blkSize = 1024   #this seems to be optimal; will break in polymask if >1024
+def UpdateImageControls(G2frame,data,masks,useTA=None,IntegrateOnly=False):
     '''Shows and handles the controls on the "Image Controls"
     data tree entry
@@ -237 +238 @@
         MaxSizer.GetChildren()[5].Window.SetValue(Imin)   #tricky
          
-    def OnIntegrate(event):
+    def OnIntegrate(event,useTA=None):
         '''Integrate image in response to a menu event or from the AutoIntegrate
         dialog. In the latter case, event=None. 
@@ -243 +244 @@
         '''
         CleanupMasks(masks)
-        blkSize = 1024   #this seems to be optimal; will break in polymask if >1024
-#        blkSize = 128   #this seems to be optimal; will break in polymask if >1024
         sumImg = GetImageZ(G2frame,data)
         wx.BeginBusyCursor()
         try:
-            G2frame.Integrate = G2img.ImageIntegrate(sumImg,data,masks,blkSize)            
+            G2frame.Integrate = G2img.ImageIntegrate(sumImg,data,masks,blkSize,useTA=useTA)            
         finally:
             wx.EndBusyCursor()    
@@ -269 +268 @@
                     style = wx.PD_ELAPSED_TIME|wx.PD_CAN_ABORT)
                 try:
+                    pId = 0
+                    oldData = {'tilt':0.,'distance':0.,'rotation':0.,'center':[0.,0.],'DetDepth':0.,'azmthOff':0.}
                     for icnt,item in enumerate(items):
                         GoOn = dlgp.Update(icnt)
@@ -277 +278 @@
                         CId = G2gd.GetGPXtreeItemId(G2frame,G2frame.Image,'Image Controls')
                         Data = G2frame.GPXtree.GetItemPyData(CId)
+                        same = 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')
+                            useTA = G2img.MakeUseTA(Data,blkSize)
                         Masks = G2frame.GPXtree.GetItemPyData(
                             G2gd.GetGPXtreeItemId(G2frame,G2frame.Image,'Masks'))
                         image = GetImageZ(G2frame,Data)
-                        blkSize = 128   #this seems to be optimal; will break in polymask if >1024
-                        G2frame.Integrate = G2img.ImageIntegrate(image,Data,Masks,blkSize)
+                        G2frame.Integrate = G2img.ImageIntegrate(image,Data,Masks,blkSize,useTA=useTA)
                         del image   #force cleanup
                         pId = G2IO.SaveIntegration(G2frame,CId,Data)
+                        oldData = Data
                 finally:    
                     dlgp.Destroy()
                     G2frame.EnablePlot = True
-                    G2frame.GPXtree.SelectItem(pId)
-                    G2frame.GPXtree.Expand(pId)
-                    G2frame.PatternId = pId
+                    if pId:
+                        G2frame.GPXtree.SelectItem(pId)
+                        G2frame.GPXtree.Expand(pId)
+                        G2frame.PatternId = pId
         finally:
             dlg.Destroy()
@@ -1184 +1193 @@
     
     if IntegrateOnly:
-        OnIntegrate(None)
+        OnIntegrate(None,useTA=useTA)
         return
     
@@ -2715 +2724 @@
         self.Pause = True
             
-    def IntegrateImage(self,img):
+    def IntegrateImage(self,img,useTA=None):
         '''Integrates a single image. Ids for created PWDR entries (more than one is possible)
         are placed in G2frame.IntgOutList
@@ -2741 +2750 @@
         # simulate a Image Controls press, since that is where the
         # integration is hidden
-        UpdateImageControls(G2frame,data,masks,IntegrateOnly=True)
+        UpdateImageControls(G2frame,data,masks,useTA=useTA,IntegrateOnly=True)
         G2frame.IntegratedList.append(img) # note this as integrated
         # split name and control number
@@ -2919 +2928 @@
         This is called only after the "Start" button is pressed (then its label reads "Pause").
         '''
-        def AutoIntegrateImage(imgId):
+        def AutoIntegrateImage(imgId,useTA=None):
             '''Integrates an image that has been read into the data tree and updates the
             AutoInt window. 
@@ -2936 +2945 @@
             self.EnableButtons(False)
             try:
-                self.IntegrateImage(img)
+                self.IntegrateImage(img,useTA=useTA)
             finally:
                 self.EnableButtons(True)
@@ -3022 +3031 @@
         # integrate the images that have already been read in, but
         # have not yet been processed            
+        oldData = {'tilt':0.,'distance':0.,'rotation':0.,'center':[0.,0.],'DetDepth':0.,'azmthOff':0.}
         for img in G2gd.GetGPXtreeDataNames(G2frame,['IMG ']):
             imgId = G2gd.GetGPXtreeItemId(G2frame,G2frame.root,img)
@@ -3029 +3039 @@
             # skip if already integrated
             if img in G2frame.IntegratedList: continue
-            AutoIntegrateImage(imgId)
-            #self.Pause |= G2frame.PauseIntegration
-            #if self.Pause:
-            #    self.OnPause()
-            #    self.PreventReEntryTimer = False
-            #    return
+            Data = G2frame.GPXtree.GetItemPyData(
+                G2gd.GetGPXtreeItemId(G2frame,imgId, 'Image Controls'))
+            same = 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')
+                self.useTA = G2img.MakeUseTA(Data,blkSize)
+            AutoIntegrateImage(imgId,self.useTA)
+            oldData = Data
             if self.pdfControls: AutoComputePDF(imgId)
             self.Pause |= G2frame.PauseIntegration
@@ -3046 +3061 @@
             if newImage in imageFileList or self.Pause: continue # already read?
             for imgId in G2IO.ReadImages(G2frame,newImage):
-                AutoIntegrateImage(imgId)           
-                #self.Pause |= G2frame.PauseIntegration
-                #if self.Pause:
-                #    self.OnPause()
-                #    self.PreventReEntryTimer = False
-                #    return
+                AutoIntegrateImage(imgId,self.useTA)
                 if self.pdfControls: AutoComputePDF(imgId)
                 self.Pause |= G2frame.PauseIntegration