Changeset 2302

Timestamp:

Jun 1, 2016 10:00:21 AM (7 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:

• GSASIIimage.py (modified) (3 diffs)
• GSASIIimgGUI.py (modified) (3 diffs)
• binwin2.7/fellipse.pyd (modified) (previous)
• binwin2.7/histogram2d.pyd (modified) (previous)
• binwin2.7/histosigma2d.pyd (modified) (previous)
• binwin2.7/pack_f.pyd (modified) (previous)
• binwin2.7/polymask.pyd (modified) (previous)
• binwin2.7/pydiffax.pyd (modified) (previous)
• binwin2.7/pypowder.pyd (modified) (previous)
• binwin2.7/pyspg.pyd (modified) (previous)
• binwin2.7/pytexture.pyd (modified) (previous)

trunk/GSASIIimage.py

@@ -900 +900 @@
             jFin = min(jBeg+blkSize,Nx)
             # next is most expensive step!
+#            print 'before Make'
             TA,tam = Make2ThetaAzimuthMap(data,masks,(iBeg,iFin),(jBeg,jFin),times)           #2-theta & azimuth arrays & create position mask
+#            print '\tafter Make'
             Nup += 1
             if dlg:
@@ -906 +908 @@
             Block = image[iBeg:iFin,jBeg:jFin]
             t0 = time.time()
+#            print 'before Fill'
             tax,tay,taz,tad,tabs = Fill2ThetaAzimuthMap(masks,TA,tam,Block)    #and apply masks
+#            print '\tafter Fill'
+            del TA; del tam
             times[2] += time.time()-t0
             Nup += 1
@@ -925 +930 @@
             t0 = time.time()
             if any([tax.shape[0],tay.shape[0],taz.shape[0]]):
+#                print 'before histo'
                 NST,H0 = h2d.histogram2d(len(tax),tax,tay,taz*tad/tabs,
                     numAzms,numChans,LRazm,lutth,Dazm,dtth,NST,H0)
+#                print '\tafter histo'
             times[3] += time.time()-t0
             Nup += 1
+            del tax; del tay; del taz; del tad; del tabs
             if dlg:
                 dlg.Update(Nup)

trunk/GSASIIimgGUI.py

@@ -2436 +2436 @@
             # skip if already integrated
             if img in G2frame.IntegratedList: continue
+            controlsDict = G2frame.PatternTree.GetItemPyData(
+                G2gd.GetPatternTreeItemId(G2frame,imgId, 'Image Controls'))
+            ImageMasks = G2frame.PatternTree.GetItemPyData(
+                G2gd.GetPatternTreeItemId(G2frame,imgId, 'Masks'))
             if self.params['Mode'] == 'table': # look up parameter values from table
-                controlsDict = G2frame.PatternTree.GetItemPyData(
-                    G2gd.GetPatternTreeItemId(G2frame,imgId, 'Image Controls'))
-                ImageMasks = G2frame.PatternTree.GetItemPyData(
-                    G2gd.GetPatternTreeItemId(G2frame,imgId, 'Masks'))
                 self.ResetFromTable(controlsDict['distance'])
-                # update controls from master
-                controlsDict.update(self.ImageControls)
-                # update masks from master w/o Thresholds
-                ImageMasks.update(self.ImageMasks)
+            # update controls from master
+            controlsDict.update(self.ImageControls)
+            # update masks from master w/o Thresholds
+            ImageMasks.update(self.ImageMasks)
             self.IntegrateImage(img)
             self.G2frame.oldImagefile = '' # mark image as changed; reread as needed
@@ -2455 +2455 @@
         # loop over image files matching glob, reading in any new ones
         for newImage in self.currImageList:
+
             if newImage in imageFileList: continue # already read?
             for imgId in G2IO.ReadImages(G2frame,newImage):
@@ -2562 +2563 @@
                 if not pth: pth = '.'
                 dlg = wx.FileDialog(self, 'Read previous table or build new table by selecting image control files', pth,
-                                    style=wx.OPEN| wx.MULTIPLE,
-                                    wildcard='image control files (.imctrl)|*.imctrl|Integration table (*.imtbl)|*.imtbl')
+                    style=wx.OPEN| wx.MULTIPLE,
+                    wildcard='Integration table (*.imtbl)|*.imtbl|image control files (.imctrl)|*.imctrl')
                 dlg.CenterOnParent()
                 if dlg.ShowModal() == wx.ID_OK: