Changeset 2797
- Timestamp:
- Apr 19, 2017 3:15:36 PM (6 years ago)
- Location:
- trunk
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/GSASIIgrid.py
r2786 r2797 1608 1608 subSizer.Add(wx.StaticText(self.panel,wx.ID_ANY,str(name))) 1609 1609 if name in self.varyList: 1610 subSizer.Add(wx.StaticText(self.panel, wx.ID_ANY,'R'))1610 subSizer.Add(wx.StaticText(self.panel,label='R')) #TODO? maybe a checkbox for one stop refinemnt flag setting? 1611 1611 elif name in self.fullVaryList: 1612 subSizer.Add(wx.StaticText(self.panel, wx.ID_ANY,'C'))1612 subSizer.Add(wx.StaticText(self.panel,label='C')) 1613 1613 explainRefine = True 1614 1614 else: 1615 1615 subSizer.Add((-1,-1)) 1616 subSizer.Add(wx.StaticText(self.panel, wx.ID_ANY,value),0,wx.ALIGN_RIGHT)1616 subSizer.Add(wx.StaticText(self.panel,label=value),0,wx.ALIGN_RIGHT) 1617 1617 1618 1618 mainSizer.Add(subSizer,0) -
trunk/GSASIIplot.py
r2796 r2797 3144 3144 Plot.set_xscale("log",nonposy='mask') 3145 3145 Plot.set_xlim([np.min(2.*Bins)/2.,np.max(2.*Bins)*2.]) 3146 Plot.bar(2.*Bins-Dbins,BinMag,2.*Dbins,facecolor='white') #plot diameters 3146 Plot.bar(2.*Bins-Dbins,BinMag,2.*Dbins,facecolor='green') #plot diameters 3147 colors=['b','r','c','m','k'] 3147 3148 if 'Size Calc' in data: 3148 3149 Rbins,Dist = data['Size Calc'] 3149 3150 for i in range(len(Rbins)): 3150 3151 if len(Rbins[i]): 3151 Plot.plot(2.*Rbins[i],Dist[i] ) #plot diameters3152 Plot.plot(2.*Rbins[i],Dist[i],color=colors[i%5]) #plot diameters 3152 3153 Page.canvas.draw() 3153 3154 -
trunk/GSASIIstrMath.py
r2754 r2797 3772 3772 yc[xB:xF] += yb[xB:xF] 3773 3773 if not np.any(y): #fill dummy data 3774 rv = st.poisson(yc[xB:xF]) 3775 y[xB:xF] = rv.rvs() 3774 try: 3775 rv = st.poisson(yc[xB:xF]) 3776 y[xB:xF] = rv.rvs() 3777 except ValueError: 3778 y[xB:xF] = yc[xB:xF] 3776 3779 Z = np.ones_like(yc[xB:xF]) 3777 3780 Z[1::2] *= -1
Note: See TracChangeset
for help on using the changeset viewer.