Changeset 1295

Timestamp:

Apr 22, 2014 9:37:51 AM (10 years ago)

Author:

vondreele

Message:

disable plotting while multiple PWDR & SASD data sets are imported - huge speedup
small fix in neutron anomalous data input (current not used)
begin sequential SASD fit
add an OnMotion? for sequential plots & add point plotting for Pseudo Variable plots

Location:

trunk

Files:

• GSASII.py (modified) (6 diffs)
• GSASIIElem.py (modified) (1 diff)
• GSASIIgrid.py (modified) (2 diffs)
• GSASIIplot.py (modified) (3 diffs)
• GSASIIpwdGUI.py (modified) (1 diff)

trunk/GSASII.py

@@ -1181 +1181 @@
         lastdatafile = ''
         newHistList = []
+        self.EnablePlot = False
         for rd in rdlist:
             # get instrument parameters for each dataset
@@ -1254 +1255 @@
                 self.PatternTree.AppendItem(Id,text='Reflection Lists'),
                 {})
+            newHistList.append(HistName)
+        else:
+            self.EnablePlot = True
             self.PatternTree.Expand(Id)
             self.PatternTree.SelectItem(Id)
-            newHistList.append(HistName)
             
         if not newHistList: return # somehow, no new histograms
@@ -1522 +1525 @@
         lastdatafile = ''
         newHistList = []
+        self.EnablePlot = False
         for rd in rdlist:
             lastdatafile = rd.smallangleentry[0]
@@ -1579 +1583 @@
             self.PatternTree.SetItemPyData(
                 self.PatternTree.AppendItem(Id,text='Models'),G2pdG.SetDefaultSASDModel())
+            newHistList.append(HistName)
+        else:
+            self.EnablePlot = True
             self.PatternTree.Expand(Id)
             self.PatternTree.SelectItem(Id)
-            newHistList.append(HistName)
             
         if not newHistList: return # somehow, no new histograms
@@ -1906 +1912 @@
         self.MaskKey = ''           #trigger for making image masks
         self.StrainKey = ''         #ditto for new strain d-zeros
+        self.EnablePlot = True
         arg = sys.argv
         if len(arg) > 1:
@@ -2080 +2087 @@
                         self.PickId = Id
                         self.Image = Id
-                os.chdir(dlg.GetDirectory())           # to get Mac/Linux to change directory!
+                os.chdir(dlg.GetDirectory())           # to get Mac/Linux to change directory!                
                 self.PatternTree.SelectItem(G2gd.GetPatternTreeItemId(self,Id,'Image Controls'))             #show last one
         finally:

trunk/GSASIIElem.py

@@ -191 +191 @@
                         isoName = 'Nat. Abund.'              #natural abundance
                     if S[76:78] in ['LS','BW']:     #special anomalous scattering length info
-                        St = [S[10:19],S[19:25],S[25:31],S[31:38],S[38:44],S[44:50],
+                        St = [S[19:25],S[25:31],S[31:38],S[38:44],S[44:50],
                             S[50:56],S[56:62],S[62:68],S[68:74],]
                         Vals = []

trunk/GSASIIgrid.py

@@ -2640 +2640 @@
             help='Undo model fit')
         self.SasdUndo.Enable(False)            
-        self.ModelEdit.Append(id=wxID_MODELFITALL, kind=wx.ITEM_NORMAL,text='Fit all',
-            help='Fit model parameters to all SASD data')
+        self.ModelEdit.Append(id=wxID_MODELFITALL, kind=wx.ITEM_NORMAL,text='Sequential fit',
+            help='Sequential fit of model parameters to all SASD data')
         self.ModelEdit.Append(id=wxID_MODELCOPY, kind=wx.ITEM_NORMAL,text='Copy',
             help='Copy model parameters to other histograms')
@@ -4253 +4253 @@
         elif 'PWDR' in G2frame.PatternTree.GetItemText(item):
             #for i in G2frame.ExportPattern: i.Enable(True)
-            UpdatePWHKPlot(G2frame,'PWDR',item)
+            if G2frame.EnablePlot:
+                UpdatePWHKPlot(G2frame,'PWDR',item)
         elif 'SASD' in G2frame.PatternTree.GetItemText(item):
             #for i in G2frame.ExportPattern: i.Enable(True)
-            UpdatePWHKPlot(G2frame,'SASD',item)
+            if G2frame.EnablePlot:
+                UpdatePWHKPlot(G2frame,'SASD',item)
         elif 'HKLF' in G2frame.PatternTree.GetItemText(item):
             G2frame.Sngl = True

trunk/GSASIIplot.py

@@ -2309 +2309 @@
     except:
         G2frame.seqXaxis = None
+
+    def OnMotion(event):
+        if event.xdata and event.ydata:                 #avoid out of frame errors
+            xpos = event.xdata
+            ypos = event.ydata
+            msg = '%5.3f %.6g'%(xpos,ypos)
+            Page.canvas.SetToolTipString(msg)
+
     def OnKeyPress(event):
         if event.key == 's':
@@ -2325 +2333 @@
         Page = G2frame.G2plotNB.nb.GetPage(plotNum)
         Page.canvas.mpl_connect('key_press_event', OnKeyPress)
+        Page.canvas.mpl_connect('motion_notify_event', OnMotion)
     Page.Choice = ['s to select plot x-axis']
     Page.keyPress = OnKeyPress
@@ -2342 +2351 @@
                 Plot.errorbar(X,Y,yerr=sig,label=name)
             else:
-                Plot.errorbar(X,Y,label=name)
+                Plot.plot(X,Y)
+                Plot.plot(X,Y,'o',label=name)
         Plot.legend(loc='best')
         Plot.set_ylabel('Parameter values')

trunk/GSASIIpwdGUI.py

@@ -2723 +2723 @@
                 
     def OnFitModelAll(event):
-        event.Skip()
+        choices = GetPatternTreeDataNames(G2frame,['SASD',])
+        sel = []
+        dlg = G2MultiChoiceDialog(G2frame.dataFrame, 'Sequential SASD refinement',
+             'Select dataset to include',choices)
+        dlg.SetSelections(sel)
+        names = []
+        if dlg.ShowModal() == wx.ID_OK:
+            for sel in dlg.GetSelections():
+                names.append(choices[sel])
+        dlg.Destroy()
+        for name in names: print name
         
     def OnFitModel(event):