Changeset 4843 for trunk/GSASIIdataGUI.py
- Timestamp:
- Mar 7, 2021 5:46:32 PM (2 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/GSASIIdataGUI.py
r4841 r4843 760 760 self.Refine.append(item) 761 761 self.Bind(wx.EVT_MENU, self.OnRefine, id=item.GetId()) 762 item = parent.Append(wx.ID_ANY,'&Le Bail fit\tCTRL+B','Fit LeBail intensities only')762 item = parent.Append(wx.ID_ANY,'&Le Bail fit\tCTRL+B','Fit Le Bail intensities only') 763 763 item.Enable(state) 764 764 self.Refine.append(item) … … 802 802 803 803 for item in self.Refine: 804 if 'Le Bail' in item.GetItemLabel():804 if 'Le Bail' in item.GetItemLabel(): 805 805 if seqSetting: item.Enable(False) 806 806 elif seqSetting: … … 5260 5260 item = GetGPXtreeItemId(self,self.root,'Covariance') 5261 5261 covData = self.GPXtree.GetItemPyData(item) 5262 GOF0 = covData['Rvals']['GOF'] 5262 try: 5263 rChi2initial = '{:.3f}'.format(covData['Rvals']['GOF']**2) 5264 except: 5265 rChi2initial = '?' 5263 5266 5264 5267 dlg = wx.ProgressDialog('Residual','All data Rw =',101.0, … … 5283 5286 if OK: 5284 5287 text = '' 5285 rtext = 'Le Bail+only fit done. '5288 rtext = 'Le Bail-only fit done. ' 5286 5289 Rwp = Rvals.get('Rwp','?') 5287 5290 if 'GOF' in Rvals: 5288 txt = 'Final Reduced Chi^2: {:.3f} (before ref: { :.3f})\n'.format(5289 Rvals['GOF']**2, GOF0**2)5291 txt = 'Final Reduced Chi^2: {:.3f} (before ref: {})\n'.format( 5292 Rvals['GOF']**2,rChi2initial) 5290 5293 text += txt 5291 5294 rtext += txt 5292 5295 text += '\nLoad new result?' 5293 dlg2 = wx.MessageDialog(self,text,'Le Bail fit: Rwp={:.3f}'5296 dlg2 = wx.MessageDialog(self,text,'Le Bail fit: Rwp={:.3f}' 5294 5297 .format(Rwp),wx.OK|wx.CANCEL) 5295 5298 dlg2.CenterOnParent() … … 5303 5306 dlg2.Destroy() 5304 5307 else: 5305 self.ErrorDialog('Le Bail error',Rvals['msg'])5308 self.ErrorDialog('Le Bail error',Rvals['msg']) 5306 5309 5307 5310 def reloadFromGPX(self,rtext=None):
Note: See TracChangeset
for help on using the changeset viewer.