Changeset 2630 for trunk/GSASIIimage.py


Ignore:
Timestamp:
Jan 14, 2017 9:00:40 AM (5 years ago)
Author:
vondreele
Message:

change '(Running)' to Pause' in auto integrate dialog
remove remaining clutter from now removed Progress Bar in integrste
catch an old pdf version problem

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIimage.py

    r2627 r2630  
    2323import polymask as pm
    2424from scipy.optimize import leastsq
    25 import scipy.signal as scsg
    2625import copy
    2726import GSASIIpath
     
    3130import GSASIIpwd as G2pwd
    3231import GSASIIspc as G2spc
    33 import GSASIImath as G2mth
    3432
    3533# trig functions in degrees
     
    887885    nXBlks = (Nx-1)/blkSize+1
    888886    nYBlks = (Ny-1)/blkSize+1
    889     Nup = nXBlks*nYBlks*3+3
    890887    tbeg = time.time()
    891     Nup = 0
    892888    times = [0,0,0,0,0]
    893889    for iBlk in range(nYBlks):
     
    899895            # next is most expensive step!
    900896            TA,tam = Make2ThetaAzimuthMap(data,masks,(iBeg,iFin),(jBeg,jFin),times)           #2-theta & azimuth arrays & create position mask
    901             Nup += 1
    902897            Block = image[iBeg:iFin,jBeg:jFin]
    903898            t0 = time.time()
     
    905900            del TA; del tam
    906901            times[2] += time.time()-t0
    907             Nup += 1
    908902            tax = np.where(tax > LRazm[1],tax-360.,tax)                 #put azm inside limits if possible
    909903            tax = np.where(tax < LRazm[0],tax+360.,tax)
     
    924918                    numAzms,numChans,LRazm,lutth,Dazm,dtth,NST,H0)
    925919            times[3] += time.time()-t0
    926             Nup += 1
    927920            del tax; del tay; del taz; del tad; del tabs
    928921    t0 = time.time()
     
    947940        #NB: in G2pwd.Polarization azm is defined from plane of polarization, not image x axis!
    948941        H0 /= np.array([G2pwd.Polarization(data['PolaVal'][0],H2[:-1],Azm=azm-90.)[0] for azm in (H1[:-1]+np.diff(H1)/2.)])
    949     Nup += 1
    950942    times[4] += time.time()-t0
    951943    print 'Step times: \n apply masks  %8.3fs xy->th,azm   %8.3fs fill map     %8.3fs \
     
    11481140    #should be able to filter out spotty Bragg rings here
    11491141    PeaksList = np.array(PeaksList)
    1150 #    Peakarray = np.vstack((tth,peaks.T)).T
    1151 #    Peakarray = np.array(G2mth.sortArray(Peakarray,0))  #now in 2theta
    1152 #    if peaks.shape[0] > 100:
    1153 #        txt = 'More than 100 spots found: %d. Are rings spotty?'%(len(jndx))
    1154 #        return txt
    11551142    Points = np.ones((PeaksList.shape[0],3))
    1156 #    Points[:,:2] = Peakarray[:,1:]
    11571143    Points[:,:2] = PeaksList
    11581144    Masks['Points'] = list(Points)
Note: See TracChangeset for help on using the changeset viewer.