Changeset 2275


Ignore:
Timestamp:
May 16, 2016 10:18:34 AM (6 years ago)
Author:
vondreele
Message:

add warning for high Levenberg-Marquardt lambda.

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASII.py

    r2272 r2275  
    36623662                tabId = self.dataDisplay.GetSelection()
    36633663        try:
    3664             OK,Msg = G2stMn.Refine(self.GSASprojectfile,dlg)
     3664            OK,Msg = G2stMn.Refine(self.GSASprojectfile,dlg)    #Msg is Rvals dict if Ok=True
    36653665        finally:
    36663666            dlg.Update(101.) # forces the Auto_Hide; needed after move w/Win & wx3.0
     
    36683668            wx.Yield()
    36693669        if OK:
    3670             Rw = Msg
    3671             dlg2 = wx.MessageDialog(self,'Load new result?','Refinement results, Rw =%.3f'%(Rw),wx.OK|wx.CANCEL)
     3670            Rw = Msg['Rwp']
     3671            lamMax = Msg.get('lamMax',0.001)
     3672            text = 'Load new result?'
     3673            if lamMax >= 10.:
     3674                text += '\nWARNING: Steepest descents dominates;'+   \
     3675                ' minimum may not have been reached\nor result may be false minimum.'+  \
     3676                ' You should reconsider your parameter suite'
     3677            dlg2 = wx.MessageDialog(self,text,'Refinement results, Rw =%.3f'%(Rw),wx.OK|wx.CANCEL)
    36723678            try:
    36733679                if dlg2.ShowModal() == wx.ID_OK:
     
    37213727        dlg.CenterOnParent()
    37223728        try:
    3723             OK,Msg = G2stMn.SeqRefine(self.GSASprojectfile,dlg)
     3729            OK,Msg = G2stMn.SeqRefine(self.GSASprojectfile,dlg)     #Msg is Rvals dict if Ok=True
    37243730        finally:
    37253731            dlg.Update(101.) # forces the Auto_Hide; needed after move w/Win & wx3.0
  • trunk/GSASIImath.py

    r2166 r2275  
    158158        if Print:
    159159            print ' Cycle: %d, Time: %.2fs, Chi**2: %.5g, Lambda: %.3g,  Delta: %.3g'%(
    160                 icycle,time.time()-time0,chisq1,lam,deltaChi2)
     160                icycle,time.time()-time0,chisq1,lamMax,deltaChi2)
    161161        if deltaChi2 < ftol:
    162162            ifConverged = True
  • trunk/GSASIIstrMain.py

    r2126 r2275  
    235235        fl.close()
    236236    if dlg:
    237         return True,Rvals['Rwp']
     237        return True,Rvals
    238238
    239239def SeqRefine(GPXfile,dlg):
Note: See TracChangeset for help on using the changeset viewer.