Changeset 3463


Ignore:
Timestamp:
Jul 9, 2018 11:30:16 AM (3 years ago)
Author:
toby
Message:

process all masks in autointegrate

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIimgGUI.py

    r3454 r3463  
    12441244        return gonioSizer
    12451245       
    1246 # Image Controls main code             
     1246    # UpdateImageControls: Image Controls main code             
    12471247                           
    12481248    #fix for old files:
     
    12621262   
    12631263    if IntegrateOnly:
     1264        Masks = G2frame.GPXtree.GetItemPyData(
     1265            G2gd.GetGPXtreeItemId(G2frame,G2frame.Image,'Masks'))
     1266        # Mhash = hash(str(Masks))  # TODO: implement this to save integration time (?)
     1267        # if  Mhash != oldMhash:
     1268        #     t0 = time.time()
     1269        useMask = G2img.MakeUseMask(data,Masks,blkSize)
     1270        #     print(' Use new mask; make mask time: %.3f'%(time.time()-t0))
     1271        #     oldMhash = Mhash
    12641272        OnIntegrate(None,useTA=useTA,useMask=useMask)
    12651273        return
     
    28702878        G2frame.IntegratedList.append(img) # note this as integrated
    28712879        # split name and control number
    2872         s = re.split(r'(\d+)\Z',os.path.split(os.path.splitext(imagefile)[0])[1])
     2880        try:
     2881            s = re.split(r'(\d+)\Z',os.path.split(os.path.splitext(imagefile)[0])[1])
     2882        except AttributeError: # not sure why, but sometimes imagefile is a list here (should not be)!
     2883            s = re.split(r'(\d+)\Z',os.path.split(os.path.splitext(imagefile[0])[0])[1])
    28732884        namepre = s[0]
    28742885        if len(s) > 1:
Note: See TracChangeset for help on using the changeset viewer.