Changeset 4047
- Timestamp:
- Jul 1, 2019 5:22:10 PM (4 years ago)
- Location:
- trunk
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/GSASIIIntPDFtool.py
r4031 r4047 423 423 424 424 wx.Frame.__init__(self, None, title='Automatic Integration', 425 style=wx.DEFAULT_FRAME_STYLE ^ wx.CLOSE_BOX)425 style=wx.DEFAULT_FRAME_STYLE) 426 426 self.Status = self.CreateStatusBar() 427 427 self.Status.SetStatusText('Press Start to load and integrate images matching filter') … … 587 587 ShowbyMode() 588 588 if len(sys.argv) > 1: 589 if os.path.exists(sys.argv[1]): 590 self.gpxin[3] = sys.argv[1] 589 fil = os.path.splitext(sys.argv[1])[0]+'.gpx' 590 if os.path.exists(fil): 591 self.gpxin[3] = fil 591 592 SetGPXInputFile() 592 593 showPDFctrls(None) … … 689 690 return False 690 691 692 def ArgGen(self,PDFobj,imgprms,mskprms,xydata): 693 '''generator for arguments for integration/PDF calc 694 ''' 695 for newImage in self.currImageList: 696 self.Pause |= self.G2frame.PauseIntegration 697 if self.Pause: 698 self.OnPause() 699 self.PreventTimerReEntry = False 700 self.Raise() 701 return 702 print('generating ',newImage) 703 TableMode = self.params['TableMode'] 704 ComputePDF = self.params['ComputePDF'] 705 SeparateDir = self.params['SeparateDir'] 706 optPDF = self.params['optPDF'] 707 outdir = self.params['outdir'] 708 calcModes = (TableMode,ComputePDF,SeparateDir,optPDF) 709 InterpVals = self.params.get('InterVals') 710 outputSelect = self.params['outsel'] 711 PDFformats = self.PDFformats 712 fmtlist = self.fmtlist 713 outputModes = (outputSelect,PDFformats,fmtlist,outdir) 714 if PDFobj: 715 PDFdict = PDFobj.data 716 else: 717 PDFdict = None 718 yield (newImage,imgprms,mskprms,xydata,PDFdict,InterpVals,calcModes,outputModes) 691 719 def OnTimerLoop(self,event): 692 720 '''A method that is called every :meth:`PollTime` seconds that is … … 739 767 else: 740 768 PDFobj = None 741 # loop over image files 742 for newImage in self.currImageList: 743 self.Pause |= self.G2frame.PauseIntegration 744 if self.Pause: 745 self.OnPause() 746 self.PreventTimerReEntry = False 747 self.Raise() 748 return 769 for intArgs in self.ArgGen(PDFobj,imgprms,mskprms,xydata): 770 newImage = intArgs[0] 749 771 print('processing ',newImage) 750 TableMode = self.params['TableMode'] 751 ComputePDF = self.params['ComputePDF'] 752 SeparateDir = self.params['SeparateDir'] 753 optPDF = self.params['optPDF'] 754 outdir = self.params['outdir'] 755 calcModes = (TableMode,ComputePDF,SeparateDir,optPDF) 756 InterpVals = self.params.get('InterVals') 757 outputSelect = self.params['outsel'] 758 PDFformats = self.PDFformats 759 fmtlist = self.fmtlist 760 outputModes = (outputSelect,PDFformats,fmtlist,outdir) 761 if PDFobj: 762 PDFdict = PDFobj.data 763 else: 764 PDFdict = None 765 ProcessImage(newImage,imgprms,mskprms,xydata,PDFdict,InterpVals,calcModes,outputModes) 772 ProcessImage(*intArgs) 766 773 updateList = True 767 774 self.ProcessedList.append(newImage) -
trunk/GSASIIddataGUI.py
r4046 r4047 1046 1046 1047 1047 if DData.GetSizer(): 1048 if hasattr(DData,'select'): 1049 DData.select.Unbind(wx.EVT_LISTBOX) # remove binding to avoid event on Linux 1048 try: 1049 if hasattr(DData,'select'): 1050 DData.select.Unbind(wx.EVT_LISTBOX) # remove binding to avoid event on Linux 1051 except: 1052 pass 1050 1053 DData.GetSizer().Clear(True) 1051 1054 mainSizer = wx.BoxSizer(wx.VERTICAL) -
trunk/GSASIIstrIO.py
r4021 r4047 2447 2447 Vec,x,maxH = Phases[phase]['General']['SuperVec'] 2448 2448 pId = Phases[phase]['pId'] 2449 for histogram in Histograms: 2450 if histogram not in HistoPhase and phase in Histograms[histogram]['Reflection Lists']: 2451 #remove previously created reflection list if histogram is removed from phase 2452 #print("removing ",phase,"from",histogram) 2453 del Histograms[histogram]['Reflection Lists'][phase] 2449 2454 histoList = list(HistoPhase.keys()) 2450 2455 histoList.sort()
Note: See TracChangeset
for help on using the changeset viewer.