Changeset 821
- Timestamp:
- Jan 4, 2013 9:21:47 AM (10 years ago)
- Location:
- trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/GSASIIphsGUI.py
r820 r821 765 765 except ValueError: 766 766 pass 767 pawlNegWt.SetValue("%. 3g"%(generalData['Pawley neg wt'])) #reset in case of error767 pawlNegWt.SetValue("%.2f"%(generalData['Pawley neg wt'])) #reset in case of error 768 768 769 769 pawleySizer = wx.BoxSizer(wx.HORIZONTAL) … … 779 779 pawleySizer.Add(pawlVal,0,wx.ALIGN_CENTER_VERTICAL) 780 780 pawleySizer.Add(wx.StaticText(dataDisplay,label=' Pawley neg. wt.: '),0,wx.ALIGN_CENTER_VERTICAL) 781 pawlNegWt = wx.TextCtrl(dataDisplay,value='%. 3g'%(generalData['Pawley neg wt']),style=wx.TE_PROCESS_ENTER)781 pawlNegWt = wx.TextCtrl(dataDisplay,value='%.2f'%(generalData['Pawley neg wt']),style=wx.TE_PROCESS_ENTER) 782 782 pawlNegWt.Bind(wx.EVT_TEXT_ENTER,OnPawleyNegWt) 783 783 pawlNegWt.Bind(wx.EVT_KILL_FOCUS,OnPawleyNegWt) … … 884 884 except ValueError: 885 885 pass 886 kMax.SetValue("%. 0f"%(Flip['k-Max'])) #reset in case of error886 kMax.SetValue("%.1f"%(Flip['k-Max'])) #reset in case of error 887 887 888 888 refList = data['Histograms'].keys() … … 911 911 line2Sizer.Add(kFactor,0,wx.ALIGN_CENTER_VERTICAL) 912 912 line2Sizer.Add(wx.StaticText(dataDisplay,label=' k-Max (>=10.0): '),0,wx.ALIGN_CENTER_VERTICAL) 913 kMax = wx.TextCtrl(dataDisplay,value='%. 0f'%(Flip['k-Max']),style=wx.TE_PROCESS_ENTER)913 kMax = wx.TextCtrl(dataDisplay,value='%.1f'%(Flip['k-Max']),style=wx.TE_PROCESS_ENTER) 914 914 kMax.Bind(wx.EVT_TEXT_ENTER,OnkMax) 915 915 kMax.Bind(wx.EVT_KILL_FOCUS,OnkMax) -
trunk/GSASIIstruct.py
r820 r821 2054 2054 if 'PWLref' in item and parmDict[item] < 0.: 2055 2055 pId = int(item.split(':')[0]) 2056 pNames.append(item) 2057 pVals.append(-parmDict[item]) 2058 pWt.append(negWt[pId]) 2056 if negWt[pId]: 2057 pNames.append(item) 2058 pVals.append(-parmDict[item]) 2059 pWt.append(negWt[pId]) 2059 2060 pVals = np.array(pVals) 2060 2061 pWt = np.array(pWt) … … 2065 2066 pDerv = np.zeros((len(varyList),len(pVal))) 2066 2067 for phase in Phases: 2068 if phase not in restraintDict: 2069 continue 2067 2070 pId = Phases[phase]['pId'] 2068 2071 General = Phases[phase]['General']
Note: See TracChangeset
for help on using the changeset viewer.