Changeset 2302


Ignore:
Timestamp:
Jun 1, 2016 10:00:21 AM (6 years ago)
Author:
vondreele
Message:

fresh binaries for binwin2.7/fellipse.pyd
explicit del for various arrays in ImageIntegrate?
implement one of Andrey's modifications (other covered by RBVD changes)
change order of wildcard in file dialog for integration table input; .imtbl is now default

Location:
trunk
Files:
11 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIimage.py

    r2284 r2302  
    900900            jFin = min(jBeg+blkSize,Nx)
    901901            # next is most expensive step!
     902#            print 'before Make'
    902903            TA,tam = Make2ThetaAzimuthMap(data,masks,(iBeg,iFin),(jBeg,jFin),times)           #2-theta & azimuth arrays & create position mask
     904#            print '\tafter Make'
    903905            Nup += 1
    904906            if dlg:
     
    906908            Block = image[iBeg:iFin,jBeg:jFin]
    907909            t0 = time.time()
     910#            print 'before Fill'
    908911            tax,tay,taz,tad,tabs = Fill2ThetaAzimuthMap(masks,TA,tam,Block)    #and apply masks
     912#            print '\tafter Fill'
     913            del TA; del tam
    909914            times[2] += time.time()-t0
    910915            Nup += 1
     
    925930            t0 = time.time()
    926931            if any([tax.shape[0],tay.shape[0],taz.shape[0]]):
     932#                print 'before histo'
    927933                NST,H0 = h2d.histogram2d(len(tax),tax,tay,taz*tad/tabs,
    928934                    numAzms,numChans,LRazm,lutth,Dazm,dtth,NST,H0)
     935#                print '\tafter histo'
    929936            times[3] += time.time()-t0
    930937            Nup += 1
     938            del tax; del tay; del taz; del tad; del tabs
    931939            if dlg:
    932940                dlg.Update(Nup)
  • trunk/GSASIIimgGUI.py

    r2301 r2302  
    24362436            # skip if already integrated
    24372437            if img in G2frame.IntegratedList: continue
     2438            controlsDict = G2frame.PatternTree.GetItemPyData(
     2439                G2gd.GetPatternTreeItemId(G2frame,imgId, 'Image Controls'))
     2440            ImageMasks = G2frame.PatternTree.GetItemPyData(
     2441                G2gd.GetPatternTreeItemId(G2frame,imgId, 'Masks'))
    24382442            if self.params['Mode'] == 'table': # look up parameter values from table
    2439                 controlsDict = G2frame.PatternTree.GetItemPyData(
    2440                     G2gd.GetPatternTreeItemId(G2frame,imgId, 'Image Controls'))
    2441                 ImageMasks = G2frame.PatternTree.GetItemPyData(
    2442                     G2gd.GetPatternTreeItemId(G2frame,imgId, 'Masks'))
    24432443                self.ResetFromTable(controlsDict['distance'])
    2444                 # update controls from master
    2445                 controlsDict.update(self.ImageControls)
    2446                 # update masks from master w/o Thresholds
    2447                 ImageMasks.update(self.ImageMasks)
     2444            # update controls from master
     2445            controlsDict.update(self.ImageControls)
     2446            # update masks from master w/o Thresholds
     2447            ImageMasks.update(self.ImageMasks)
    24482448            self.IntegrateImage(img)
    24492449            self.G2frame.oldImagefile = '' # mark image as changed; reread as needed
     
    24552455        # loop over image files matching glob, reading in any new ones
    24562456        for newImage in self.currImageList:
     2457
    24572458            if newImage in imageFileList: continue # already read?
    24582459            for imgId in G2IO.ReadImages(G2frame,newImage):
     
    25622563                if not pth: pth = '.'
    25632564                dlg = wx.FileDialog(self, 'Read previous table or build new table by selecting image control files', pth,
    2564                                     style=wx.OPEN| wx.MULTIPLE,
    2565                                     wildcard='image control files (.imctrl)|*.imctrl|Integration table (*.imtbl)|*.imtbl')
     2565                    style=wx.OPEN| wx.MULTIPLE,
     2566                    wildcard='Integration table (*.imtbl)|*.imtbl|image control files (.imctrl)|*.imctrl')
    25662567                dlg.CenterOnParent()
    25672568                if dlg.ShowModal() == wx.ID_OK:
Note: See TracChangeset for help on using the changeset viewer.