Changeset 104 for trunk/GSASIIimage.py


Ignore:
Timestamp:
Jul 6, 2010 7:10:54 AM (12 years ago)
Author:
vondreel
Message:

new fortran binning routine added

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIimage.py

    r101 r104  
    522522    numAzms = data['outAzimuths']
    523523    numChans = data['outChannels']
    524     NST = np.zeros(shape=(numAzms,numChans),dtype=int,order='F')
     524    t0 = time.time()
     525    NST = np.zeros(shape=(numAzms,numChans),dtype=np.int,order='F')
    525526    H0 = np.zeros(shape=(numAzms,numChans),order='F')
    526527    H1 = np.zeros(shape=(numAzms+1,))
     
    528529    NST,H0,H1,H2 = h2d.histogram2d(len(tax),tax,tay,taz,numAzms,numChans,LRazm,LUtth,NST,H0,H1,H2)
    529530    HST = [H0,H1,H2]
     531    print "Binning elapsed time:","%8.3f"%(time.time()-t0), "s"
    530532    return NST,HST
    531533
     
    550552        dlg.Update(3)
    551553        print 'Form normalized 1D pattern(s)'
    552         self.Integrate = [HST[0]/NST[0],HST[1],HST[2]]
     554        self.Integrate = [HST[0]/NST,HST[1],HST[2]]
    553555        del NST,HST
    554556        dlg.Update(4)
Note: See TracChangeset for help on using the changeset viewer.