Changeset 3843


Ignore:
Timestamp:
Mar 8, 2019 11:07:55 AM (3 years ago)
Author:
vondreele
Message:

change image integration block size to 256 from 1024 - 3x faster
change masks check with out thresholds & avoid bit mask creation from frames, spots & polygons if unchanged
cuts 1/3 s off integration time - for both integrate all & auto integrate
change default outChannels (2theta steps) to 2500 from 2250 (not a mod 4 number)

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIIO.py

    r3828 r3843  
    348348        Data['LRazimuth'] = [0.,180.]
    349349        Data['azmthOff'] = 0.0
    350         Data['outChannels'] = 2250
     350        Data['outChannels'] = 2500
    351351        Data['outAzimuths'] = 1
    352352        Data['centerAzm'] = False
  • trunk/GSASIIimgGUI.py

    r3842 r3843  
    149149##### Image Controls
    150150################################################################################                   
    151 blkSize = 1024   #this seems to be optimal; will break in polymask if >1024
     151blkSize = 256   #256 seems to be optimal; will break in polymask if >1024
    152152def UpdateImageControls(G2frame,data,masks,useTA=None,useMask=None,IntegrateOnly=False):
    153153    '''Shows and handles the controls on the "Image Controls"
     
    310310                        Masks = G2frame.GPXtree.GetItemPyData(
    311311                            G2gd.GetGPXtreeItemId(G2frame,G2frame.Image,'Masks'))
    312                         Mhash = hash(str(Masks))
     312                        Mhash = copy.deepcopy(Masks)
     313                        Mhash.pop('Thresholds')
     314                        Mhash = hash(str(Mhash))
    313315                        if  Mhash != oldMhash:
    314316                            t0 = time.time()
     
    31583160            Mask = G2frame.GPXtree.GetItemPyData(
    31593161                G2gd.GetGPXtreeItemId(G2frame,imgId, 'Masks'))
    3160             Mhash = hash(str(Mask))
     3162            Mhash = copy.deepcopy(Mask)
     3163            Mhash.pop('Thresholds')
     3164            Mhash = hash(str(Mhash))
    31613165            if  Mhash != oldMhash:
    31623166                t0 = time.time()
  • trunk/GSASIIscriptable.py

    r3841 r3843  
    22782278                Data['LRazimuth'] = [0.,180.]
    22792279                Data['azmthOff'] = 0.0
    2280                 Data['outChannels'] = 2250
     2280                Data['outChannels'] = 2500
    22812281                Data['outAzimuths'] = 1
    22822282                Data['centerAzm'] = False
Note: See TracChangeset for help on using the changeset viewer.