Changeset 2339 for trunk/GSASIIimage.py


Ignore:
Timestamp:
Jun 22, 2016 5:51:56 PM (5 years ago)
Author:
toby
Message:

fixup autoint bugs; change labels on autoint window during integrations

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIimage.py

    r2322 r2339  
    863863   
    864864def ImageIntegrate(image,data,masks,blkSize=128,dlg=None,returnN=False):
    865     'Needs a doc string'    #for q, log(q) bins need data['binType']
     865    'Integrate an image; called from OnIntegrateAll and OnIntegrate in G2imgGUI'    #for q, log(q) bins need data['binType']
    866866    import histogram2d as h2d
    867867    print 'Begin image integration'
     868    CancelPressed = False
    868869    LUtth = np.array(data['IOtth'])
    869870    LRazm = np.array(data['LRazimuth'],dtype=np.float64)
     
    905906            if dlg:
    906907                pause = dlg.Update(Nup)
     908                if not pause[0]: CancelPressed = True
    907909            Block = image[iBeg:iFin,jBeg:jFin]
    908910            t0 = time.time()
     
    913915            if dlg:
    914916                pause = dlg.Update(Nup)
     917                if not pause[0]: CancelPressed = True
    915918            tax = np.where(tax > LRazm[1],tax-360.,tax)                 #put azm inside limits if possible
    916919            tax = np.where(tax < LRazm[0],tax+360.,tax)
     
    935938            if dlg:
    936939                pause = dlg.Update(Nup)
     940                if not pause[0]: CancelPressed = True
    937941    t0 = time.time()
    938942    NST = np.array(NST,dtype=np.float)
     
    959963    if dlg:
    960964        pause = dlg.Update(Nup)
     965        if not pause[0]: CancelPressed = True
    961966    times[4] += time.time()-t0
    962967    print 'Step times: \n apply masks  %8.3fs xy->th,azm   %8.3fs fill map     %8.3fs \
     
    965970    print 'Integration complete'
    966971    if returnN:     #As requested by Steven Weigand
    967         return H0,H1,H2,NST,not pause[0]
     972        return H0,H1,H2,NST,CancelPressed
    968973    else:
    969         return H0,H1,H2,not pause[0]
     974        return H0,H1,H2,CancelPressed
    970975   
    971976def MakeStrStaRing(ring,Image,Controls):
Note: See TracChangeset for help on using the changeset viewer.