Changeset 3463 for trunk/GSASIIimgGUI.py

Timestamp:

Jul 9, 2018 11:30:16 AM (5 years ago)

Author:

toby

Message:

process all masks in autointegrate

File:

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

trunk/GSASIIimgGUI.py

@@ -1244 +1244 @@
         return gonioSizer
         
-# Image Controls main code             
+    # UpdateImageControls: Image Controls main code             
                             
     #fix for old files:
@@ -1262 +1262 @@
     
     if IntegrateOnly:
+        Masks = G2frame.GPXtree.GetItemPyData(
+            G2gd.GetGPXtreeItemId(G2frame,G2frame.Image,'Masks'))
+        # Mhash = hash(str(Masks))  # TODO: implement this to save integration time (?)
+        # 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
         OnIntegrate(None,useTA=useTA,useMask=useMask)
         return
@@ -2870 +2878 @@
         G2frame.IntegratedList.append(img) # note this as integrated
         # split name and control number
-        s = re.split(r'(\d+)\Z',os.path.split(os.path.splitext(imagefile)[0])[1])
+        try:
+            s = re.split(r'(\d+)\Z',os.path.split(os.path.splitext(imagefile)[0])[1])
+        except AttributeError: # not sure why, but sometimes imagefile is a list here (should not be)!
+            s = re.split(r'(\d+)\Z',os.path.split(os.path.splitext(imagefile[0])[0])[1])
         namepre = s[0]
         if len(s) > 1: