Changeset 2213 for trunk/GSASIIimgGUI.py

Timestamp:

Apr 15, 2016 9:34:00 AM (7 years ago)

Author:

vondreele

Message:

force delete of images after they are no longer needed during integration

File:

• trunk/GSASIIimgGUI.py (modified) (4 diffs)

trunk/GSASIIimgGUI.py

@@ -83 +83 @@
             backImage += darkImage*darkScale                
         sumImg += backImage*backScale
+    if darkImg: del darkImg         #force cleanup
+    if backImg: del backImg
     sumImg -= data.get('Flat Bkg',0.)
     return sumImg
@@ -195 +197 @@
             sumImg = GetImageZ(G2frame,data)
             G2frame.Integrate = G2img.ImageIntegrate(sumImg,data,masks,blkSize,dlg)
+            del sumImg  #force cleanup
             Id = G2IO.SaveIntegration(G2frame,G2frame.PickId,data,(event is None))
             G2frame.PatternId = Id
@@ -243 +246 @@
                                     G2gd.GetPatternTreeItemId(G2frame,id, 'Masks'))
                                 G2frame.Integrate = G2img.ImageIntegrate(image,Data,Masks,blkSize,dlgp)
+                                del image   #force cleanup
                                 pId = G2IO.SaveIntegration(G2frame,Id,Data)
                             finally:
@@ -2315 +2319 @@
         # do integration
         size,imagefile,imagetag = G2frame.PatternTree.GetImageLoc(imgId)
-#        G2frame.ImageZ = G2IO.GetImageData(G2frame,imagefile,True,imagetag)     #pointless since done in OnIntegrate?
         masks = G2frame.PatternTree.GetItemPyData(
-                G2gd.GetPatternTreeItemId(G2frame,G2frame.Image, 'Masks'))
+            G2gd.GetPatternTreeItemId(G2frame,G2frame.Image, 'Masks'))
         data = G2frame.PatternTree.GetItemPyData(G2frame.PickId)
         # simulate a Image Controls press, since that is where the