Changeset 4332


Ignore:
Timestamp:
Feb 27, 2020 3:00:25 AM (20 months ago)
Author:
vondreele
Message:

faster build of spot mask
spot masks now work in integrate all

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIimage.py

    r4330 r4332  
    14781478    for it,TTh in enumerate(TThs):
    14791479        band.mask = ma.masked_outside(TA,TTh,TTh+dtth).mask+tam
    1480         pcmax = np.percentile(band.compressed(),prob)
    1481         mband = ma.masked_greater(band,pcmax)
    1482         mean = ma.median(mband)
     1480        pcmax = np.percentile(band.compressed(),[prob,50.])
     1481        mband = ma.masked_greater(band,pcmax[0])
    14831482        std = ma.std(mband)
    1484         anom = ma.masked_greater((band-mean)/std,esdMul)
     1483        anom = ma.masked_greater((band-pcmax[1])/std,esdMul)
    14851484        mask ^= (anom.mask^band.mask)
    14861485        if not dlg is None:
  • trunk/GSASIIimgGUI.py

    r4325 r4332  
    496496                            oldMhash = Mhash
    497497                        image = GetImageZ(G2frame,Data)
     498                        if not Masks['SpotMask']['spotMask'] is None:
     499                            image = ma.array(image,mask=Masks['SpotMask']['spotMask'])
    498500                        G2frame.Integrate = G2img.ImageIntegrate(image,Data,Masks,blkSize,useTA=useTA,useMask=useMask)
    499501                        del image   #force cleanup
Note: See TracChangeset for help on using the changeset viewer.