Changeset 2506 for trunk/GSASIIpwdGUI.py


Ignore:
Timestamp:
Oct 26, 2016 12:24:19 PM (6 years ago)
Author:
vondreele
Message:

some work on automatic mag constraints
move a dlg.Destroy() in OnSeqPeakFit? & OnIndexPeaks? - get rid of orphan wait cursor & progress dialog
more work on mag moment derivs - still wrong! Other derivs now all OK

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIpwdGUI.py

    r2505 r2506  
    599599                        'covMatrix':np.eye(len(result[0])),'title':name,'parmDict':parmDict,
    600600                        'fullVary':fullvaryList,'badVary':badVary}
    601             dlg.Destroy()
    602601            print ' ***** Sequential peak fit successful *****'
    603602        finally:
     603            dlg.Destroy()
    604604            wx.EndBusyCursor()
    605605        if Reverse:
     
    30013001#            style = wx.PD_ELAPSED_TIME|wx.PD_AUTO_HIDE|wx.PD_REMAINING_TIME|wx.PD_CAN_SKIP|wx.PD_CAN_ABORT) #desn't work in 32 bit versions
    30023002            style = wx.PD_ELAPSED_TIME|wx.PD_AUTO_HIDE|wx.PD_REMAINING_TIME|wx.PD_CAN_ABORT)
    3003         OK,dmin,newcells = G2indx.DoIndexPeaks(peaks[0],controls,bravais,dlg,G2frame.ifX20)
    3004         dlg.Destroy()
     3003        try:
     3004            OK,dmin,newcells = G2indx.DoIndexPeaks(peaks[0],controls,bravais,dlg,G2frame.ifX20)
     3005        finally:
     3006            dlg.Destroy()
    30053007        cells = keepcells+newcells
    30063008        cells = G2indx.sortM20(cells)
Note: See TracChangeset for help on using the changeset viewer.