Changeset 2800

Timestamp:

Apr 21, 2017 8:36:17 AM (6 years ago)

Author:

vondreele

Message:

fix a simulation output format
use a couple of wx.CallAfter? to fix crashes in stacking GUI
fix a limits error in PWDR simulation

Location:

trunk

Files:

• GSASII.py (modified) (1 diff)
• GSASIIphsGUI.py (modified) (3 diffs)
• GSASIIpwd.py (modified) (2 diffs)

trunk/GSASII.py

@@ -1824 +1824 @@
         self.PatternTree.Expand(Id)
         self.PatternTree.SelectItem(Id)
-        print(u'Added simulation powder data {}'++ 
-              ' with parameters from {}'.format(HistName,rd.instmsg))
+        print(u'Added simulation powder data {}'.format(HistName)+
+              ' with parameters from {}'.format(rd.instmsg))
 
         # make a list of phase names

trunk/GSASIIphsGUI.py

@@ -2820 +2820 @@
             G2plt.PlotXY(G2frame,resultXY,XY2=resultXY2,labelX=r'$\mathsf{2\theta}$',
                 labelY='Intensity',newPlot=True,Title='Sequential simulations on '+pName,
-                lines=False,names=seqNames)
+                lines=True,names=seqNames)
             
         def CellSizer():
@@ -2997 +2997 @@
                 event.Skip()
                 Layer['Name'] = layerName.GetValue()                
-                UpdateLayerData()
+                wx.CallAfter(UpdateLayerData)
                 
             def OnAddAtom(event):
                 Layer['Atoms'].append(['Unk','Unk',0.,0.,0.,1.,0.01])
-                UpdateLayerData()
+                wx.CallAfter(UpdateLayerData)
                 
             def OnSymm(event):
@@ -3022 +3022 @@
                                 data['Layers']['AtInfo'][atType] = G2elem.GetAtomInfo(atType)
                     PE.Destroy()
-                    UpdateLayerData()
+                    wx.CallAfter(UpdateLayerData)
                 else:
                     event.Skip()

trunk/GSASIIpwd.py

@@ -2548 +2548 @@
     x0 = profile[0]
     iBeg = np.searchsorted(x0,limits[0])
-    iFin = np.searchsorted(x0,limits[1])+1
+    iFin = np.searchsorted(x0,limits[1])
     if iFin-iBeg > 20000:
         iFin = iBeg+20000
@@ -2702 +2702 @@
     profile[3][iBeg:iFin] = BrdSpec*scale+profile[4][iBeg:iFin]
     if not np.any(profile[1]):                   #fill dummy data x,y,w,yc,yb,yd
-        rv = st.poisson(profile[3][iBeg:iFin])
-        profile[1][iBeg:iFin] = rv.rvs()
+        try:
+            rv = st.poisson(profile[3][iBeg:iFin])
+            profile[1][iBeg:iFin] = rv.rvs()
+        except ValueError:
+            profile[1][iBeg:iFin] = profile[3][iBeg:iFin]
         Z = np.ones_like(profile[3][iBeg:iFin])
         Z[1::2] *= -1