Changeset 4181 for trunk/GSASIIimage.py


Ignore:
Timestamp:
Oct 16, 2019 3:51:36 PM (2 years ago)
Author:
vondreele
Message:

one more small improvement in integration speed

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIimage.py

    r4180 r4181  
    10891089    tabs = ma.compressed(ma.array(tabs.flatten(),mask=tam)) #ones - later used for absorption corr.
    10901090    pol = ma.compressed(ma.array(pol.flatten(),mask=tam))   #polarization
    1091     return tax,tay,taz,tad,tabs,pol
     1091    return tax,tay,taz/pol,tad,tabs
    10921092
    10931093def MakeUseTA(data,blkSize=128):
     
    11891189            t0 = time.time()
    11901190            Block = image[iBeg:iFin,jBeg:jFin]
    1191             tax,tay,taz,tad,tabs,pol = Fill2ThetaAzimuthMap(Masks,TA,tam,Block)    #and apply masks
     1191            tax,tay,taz,tad,tabs = Fill2ThetaAzimuthMap(Masks,TA,tam,Block)    #and apply masks
    11921192            tax = np.where(tax > LRazm[1],tax-360.,tax)                 #put azm inside limits if possible
    11931193            tax = np.where(tax < LRazm[0],tax+360.,tax)
     
    12051205
    12061206            t0 = time.time()
    1207             taz = np.array((taz*tad/tabs),dtype='float32')/pol
     1207            taz = np.array((taz*tad/tabs),dtype='float32')
    12081208            if any([tax.shape[0],tay.shape[0],taz.shape[0]]):
    12091209                NST,H0 = h2d.histogram2d(len(tax),tax,tay,taz,
Note: See TracChangeset for help on using the changeset viewer.