Changeset 4047

Timestamp:

Jul 1, 2019 5:22:10 PM (4 years ago)

Author:

toby

Message:

remove reflections if hist dropped from phase

Location:

trunk

Files:

• GSASIIIntPDFtool.py (modified) (4 diffs)
• GSASIIddataGUI.py (modified) (1 diff)
• GSASIIstrIO.py (modified) (1 diff)

trunk/GSASIIIntPDFtool.py

@@ -423 +423 @@
         
         wx.Frame.__init__(self, None, title='Automatic Integration',
-                          style=wx.DEFAULT_FRAME_STYLE ^ wx.CLOSE_BOX)
+                          style=wx.DEFAULT_FRAME_STYLE)
         self.Status = self.CreateStatusBar()
         self.Status.SetStatusText('Press Start to load and integrate images matching filter')
@@ -587 +587 @@
         ShowbyMode()
         if len(sys.argv) > 1:
-            if os.path.exists(sys.argv[1]):
-                self.gpxin[3] = sys.argv[1]
+            fil = os.path.splitext(sys.argv[1])[0]+'.gpx'
+            if os.path.exists(fil):
+                self.gpxin[3] = fil
                 SetGPXInputFile()
         showPDFctrls(None)
@@ -689 +690 @@
         return False
                 
+    def ArgGen(self,PDFobj,imgprms,mskprms,xydata):
+        '''generator for arguments for integration/PDF calc
+        '''
+        for newImage in self.currImageList:
+            self.Pause |= self.G2frame.PauseIntegration
+            if self.Pause:
+                self.OnPause()
+                self.PreventTimerReEntry = False
+                self.Raise()
+                return
+            print('generating ',newImage)
+            TableMode = self.params['TableMode']
+            ComputePDF = self.params['ComputePDF']
+            SeparateDir = self.params['SeparateDir']
+            optPDF = self.params['optPDF']
+            outdir = self.params['outdir']
+            calcModes = (TableMode,ComputePDF,SeparateDir,optPDF)
+            InterpVals = self.params.get('InterVals')
+            outputSelect = self.params['outsel']
+            PDFformats = self.PDFformats
+            fmtlist = self.fmtlist
+            outputModes = (outputSelect,PDFformats,fmtlist,outdir)
+            if PDFobj:
+                PDFdict = PDFobj.data
+            else:
+                PDFdict = None
+            yield (newImage,imgprms,mskprms,xydata,PDFdict,InterpVals,calcModes,outputModes)
     def OnTimerLoop(self,event):
         '''A method that is called every :meth:`PollTime` seconds that is
@@ -739 +767 @@
         else:
             PDFobj = None
-        # loop over image files
-        for newImage in self.currImageList:
-            self.Pause |= self.G2frame.PauseIntegration
-            if self.Pause:
-                self.OnPause()
-                self.PreventTimerReEntry = False
-                self.Raise()
-                return
+        for intArgs in self.ArgGen(PDFobj,imgprms,mskprms,xydata):
+            newImage = intArgs[0]
             print('processing ',newImage)
-            TableMode = self.params['TableMode']
-            ComputePDF = self.params['ComputePDF']
-            SeparateDir = self.params['SeparateDir']
-            optPDF = self.params['optPDF']
-            outdir = self.params['outdir']
-            calcModes = (TableMode,ComputePDF,SeparateDir,optPDF)
-            InterpVals = self.params.get('InterVals')
-            outputSelect = self.params['outsel']
-            PDFformats = self.PDFformats
-            fmtlist = self.fmtlist
-            outputModes = (outputSelect,PDFformats,fmtlist,outdir)
-            if PDFobj:
-                PDFdict = PDFobj.data
-            else:
-                PDFdict = None
-            ProcessImage(newImage,imgprms,mskprms,xydata,PDFdict,InterpVals,calcModes,outputModes)
+            ProcessImage(*intArgs)
             updateList = True
             self.ProcessedList.append(newImage)

trunk/GSASIIddataGUI.py

@@ -1046 +1046 @@
     
     if DData.GetSizer():
-        if hasattr(DData,'select'): 
-            DData.select.Unbind(wx.EVT_LISTBOX)  # remove binding to avoid event on Linux
+        try:
+            if hasattr(DData,'select'): 
+                DData.select.Unbind(wx.EVT_LISTBOX)  # remove binding to avoid event on Linux
+        except:
+            pass
         DData.GetSizer().Clear(True)
     mainSizer = wx.BoxSizer(wx.VERTICAL)

trunk/GSASIIstrIO.py

@@ -2447 +2447 @@
             Vec,x,maxH = Phases[phase]['General']['SuperVec']
         pId = Phases[phase]['pId']
+        for histogram in Histograms:
+            if histogram not in HistoPhase and phase in Histograms[histogram]['Reflection Lists']:
+                #remove previously created reflection list if histogram is removed from phase
+                #print("removing ",phase,"from",histogram)
+                del Histograms[histogram]['Reflection Lists'][phase]
         histoList = list(HistoPhase.keys())
         histoList.sort()