Changeset 1171 for trunk/GSASIIimage.py


Ignore:
Timestamp:
Dec 17, 2013 2:46:39 PM (9 years ago)
Author:
vondreele
Message:

geometric correction for image integration - OK for tilts

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/GSASIIimage.py

    r1170 r1171  
    779779    taz = ma.compressed(ma.array(taz.flatten(),mask=tam))
    780780    tad = ma.compressed(ma.array(tad.flatten(),mask=tam))
    781     return tax,tay,taz*tad
     781    return tax,tay,taz,tad
    782782   
    783783def ImageIntegrate(image,data,masks,blkSize=128,dlg=None):
    … …  
    816816                dlg.Update(Nup)
    817817            Block = image[iBeg:iFin,jBeg:jFin]
    818             tax,tay,taz = Fill2ThetaAzimuthMap(masks,TA,tam,Block)    #and apply masks
     818            tax,tay,taz,tad = Fill2ThetaAzimuthMap(masks,TA,tam,Block)    #and apply masks
    819819            Nup += 1
    820820            if dlg:
    … …  
    823823            tax = np.where(tax < LRazm[0],tax+360.,tax)
    824824            if any([tax.shape[0],tay.shape[0],taz.shape[0]]):
    825                 NST,H0 = h2d.histogram2d(len(tax),tax,tay,taz,numAzms,numChans,LRazm,LUtth,Dazm,Dtth,NST,H0)
     825                NST,H0 = h2d.histogram2d(len(tax),tax,tay,taz*tad,numAzms,numChans,LRazm,LUtth,Dazm,Dtth,NST,H0)
    826826            Nup += 1
    827827            if dlg:
Note: See TracChangeset for help on using the changeset viewer.