Changeset 1465 for trunk/GSASIIimage.py


Ignore:
Timestamp:
Aug 18, 2014 10:06:22 AM (9 years ago)
Author:
vondreele
Message:

added mod to ImageIntegrate? requested by Steven Weigand - return NST array if requested.
Powder extinction now correct for TOF - not same as for GSAS; that code has an error!

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIimage.py

    r1405 r1465  
    822822    return tax,tay,taz,tad,tabs
    823823   
    824 def ImageIntegrate(image,data,masks,blkSize=128,dlg=None):
     824def ImageIntegrate(image,data,masks,blkSize=128,dlg=None,returnN=False):
    825825    'Needs a doc string'    #for q, log(q) bins need data['binType']
    826826    import histogram2d as h2d
     
    896896    H0 = np.divide(H0,NST)
    897897    H0 = np.nan_to_num(H0)
    898     del NST
    899898    H2 = np.array([tth for tth in np.linspace(lutth[0],lutth[1],numChans+1)])
    900899    if 'log(q)' in data['binType']:
     
    922921    print "Elapsed time:","%8.3fs"%(time.time()-tbeg)
    923922    print 'Integration complete'
    924     return H0,H1,H2
     923    if returnN:     #As requested by Steven Weigand
     924        return H0,H1,H2,NST
     925    else:
     926        return H0,H1,H2
    925927   
    926928def MakeStrStaRing(ring,Image,Controls):
Note: See TracChangeset for help on using the changeset viewer.