Ignore:
Timestamp:
Mar 7, 2021 5:46:32 PM (9 months ago)
Author:
toby
Message:

fix Le Bail issues: LB before refinement; bug for combined fits; LeBail? -> Le Bail

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIdataGUI.py

    r4841 r4843  
    760760        self.Refine.append(item)
    761761        self.Bind(wx.EVT_MENU, self.OnRefine, id=item.GetId())
    762         item = parent.Append(wx.ID_ANY,'&LeBail fit\tCTRL+B','Fit LeBail intensities only')
     762        item = parent.Append(wx.ID_ANY,'&Le Bail fit\tCTRL+B','Fit Le Bail intensities only')
    763763        item.Enable(state)
    764764        self.Refine.append(item)
     
    802802           
    803803        for item in self.Refine:
    804             if 'LeBail' in item.GetItemLabel():
     804            if 'Le Bail' in item.GetItemLabel():
    805805                if seqSetting: item.Enable(False)
    806806            elif seqSetting:
     
    52605260        item = GetGPXtreeItemId(self,self.root,'Covariance')
    52615261        covData = self.GPXtree.GetItemPyData(item)
    5262         GOF0 = covData['Rvals']['GOF']
     5262        try:
     5263            rChi2initial = '{:.3f}'.format(covData['Rvals']['GOF']**2)
     5264        except:
     5265            rChi2initial = '?'
    52635266       
    52645267        dlg = wx.ProgressDialog('Residual','All data Rw =',101.0,
     
    52835286        if OK:
    52845287            text = ''
    5285             rtext = 'LeBail+only fit done. '
     5288            rtext = 'Le Bail-only fit done. '
    52865289            Rwp = Rvals.get('Rwp','?')
    52875290            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)
    52905293                text += txt
    52915294                rtext += txt
    52925295            text += '\nLoad new result?'
    5293             dlg2 = wx.MessageDialog(self,text,'LeBail fit: Rwp={:.3f}'
     5296            dlg2 = wx.MessageDialog(self,text,'Le Bail fit: Rwp={:.3f}'
    52945297                                            .format(Rwp),wx.OK|wx.CANCEL)
    52955298            dlg2.CenterOnParent()
     
    53035306                dlg2.Destroy()
    53045307        else:
    5305             self.ErrorDialog('LeBail error',Rvals['msg'])
     5308            self.ErrorDialog('Le Bail error',Rvals['msg'])
    53065309           
    53075310    def reloadFromGPX(self,rtext=None):
Note: See TracChangeset for help on using the changeset viewer.