Changeset 2797

Timestamp:

Apr 19, 2017 3:15:36 PM (6 years ago)

Author:

vondreele

Message:

fix simulation problem when calc intensities too small

Location:

trunk

Files:

• GSASIIgrid.py (modified) (1 diff)
• GSASIIplot.py (modified) (1 diff)
• GSASIIstrMath.py (modified) (1 diff)

trunk/GSASIIgrid.py

@@ -1608 +1608 @@
             subSizer.Add(wx.StaticText(self.panel,wx.ID_ANY,str(name)))
             if name in self.varyList:
-                subSizer.Add(wx.StaticText(self.panel,wx.ID_ANY,'R'))
+                subSizer.Add(wx.StaticText(self.panel,label='R'))   #TODO? maybe a checkbox for one stop refinemnt flag setting?
             elif name in self.fullVaryList:
-                subSizer.Add(wx.StaticText(self.panel,wx.ID_ANY,'C'))
+                subSizer.Add(wx.StaticText(self.panel,label='C'))
                 explainRefine = True
             else:
                 subSizer.Add((-1,-1))
-            subSizer.Add(wx.StaticText(self.panel,wx.ID_ANY,value),0,wx.ALIGN_RIGHT)
+            subSizer.Add(wx.StaticText(self.panel,label=value),0,wx.ALIGN_RIGHT)
 
         mainSizer.Add(subSizer,0)

trunk/GSASIIplot.py

@@ -3144 +3144 @@
         Plot.set_xscale("log",nonposy='mask')
         Plot.set_xlim([np.min(2.*Bins)/2.,np.max(2.*Bins)*2.])
-    Plot.bar(2.*Bins-Dbins,BinMag,2.*Dbins,facecolor='white')       #plot diameters
+    Plot.bar(2.*Bins-Dbins,BinMag,2.*Dbins,facecolor='green')       #plot diameters
+    colors=['b','r','c','m','k']
     if 'Size Calc' in data:
         Rbins,Dist = data['Size Calc']
         for i in range(len(Rbins)):
             if len(Rbins[i]):
-                Plot.plot(2.*Rbins[i],Dist[i])       #plot diameters
+                Plot.plot(2.*Rbins[i],Dist[i],color=colors[i%5])       #plot diameters
     Page.canvas.draw()
 

trunk/GSASIIstrMath.py

@@ -3772 +3772 @@
             yc[xB:xF] += yb[xB:xF]
             if not np.any(y):                   #fill dummy data
-                rv = st.poisson(yc[xB:xF])
-                y[xB:xF] = rv.rvs()
+                try:
+                    rv = st.poisson(yc[xB:xF])
+                    y[xB:xF] = rv.rvs()
+                except ValueError:
+                    y[xB:xF] = yc[xB:xF]
                 Z = np.ones_like(yc[xB:xF])
                 Z[1::2] *= -1