Changeset 2302 for trunk/GSASIIimage.py


Ignore:
Timestamp:
Jun 1, 2016 10:00:21 AM (6 years ago)
Author:
vondreele
Message:

fresh binaries for binwin2.7/fellipse.pyd
explicit del for various arrays in ImageIntegrate?
implement one of Andrey's modifications (other covered by RBVD changes)
change order of wildcard in file dialog for integration table input; .imtbl is now default

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIimage.py

    r2284 r2302  
    900900            jFin = min(jBeg+blkSize,Nx)
    901901            # next is most expensive step!
     902#            print 'before Make'
    902903            TA,tam = Make2ThetaAzimuthMap(data,masks,(iBeg,iFin),(jBeg,jFin),times)           #2-theta & azimuth arrays & create position mask
     904#            print '\tafter Make'
    903905            Nup += 1
    904906            if dlg:
     
    906908            Block = image[iBeg:iFin,jBeg:jFin]
    907909            t0 = time.time()
     910#            print 'before Fill'
    908911            tax,tay,taz,tad,tabs = Fill2ThetaAzimuthMap(masks,TA,tam,Block)    #and apply masks
     912#            print '\tafter Fill'
     913            del TA; del tam
    909914            times[2] += time.time()-t0
    910915            Nup += 1
     
    925930            t0 = time.time()
    926931            if any([tax.shape[0],tay.shape[0],taz.shape[0]]):
     932#                print 'before histo'
    927933                NST,H0 = h2d.histogram2d(len(tax),tax,tay,taz*tad/tabs,
    928934                    numAzms,numChans,LRazm,lutth,Dazm,dtth,NST,H0)
     935#                print '\tafter histo'
    929936            times[3] += time.time()-t0
    930937            Nup += 1
     938            del tax; del tay; del taz; del tad; del tabs
    931939            if dlg:
    932940                dlg.Update(Nup)
Note: See TracChangeset for help on using the changeset viewer.