Changeset 1016


Ignore:
Timestamp:
Aug 4, 2013 9:35:54 PM (8 years ago)
Author:
vondreele
Message:

remove PawleyDelete? - not used
fix floating point error in vcov matrix processing

Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIgrid.py

    r1007 r1016  
    8787] = [wx.NewId() for item in range(2)]
    8888
    89 [ wxID_PAWLEYLOAD, wxID_PAWLEYDELETE, wxID_PAWLEYESTIMATE,
    90     wxID_PAWLEYUPDATE,
    91 ] = [wx.NewId() for item in range(4)]
     89[ wxID_PAWLEYLOAD, wxID_PAWLEYESTIMATE, wxID_PAWLEYUPDATE,
     90] = [wx.NewId() for item in range(3)]
    9291
    9392[ wxID_IMCALIBRATE,wxID_IMRECALIBRATE,wxID_IMINTEGRATE, wxID_IMCLEARCALIB, 
     
    20312030        self.PawleyEdit.Append(id=wxID_PAWLEYUPDATE, kind=wx.ITEM_NORMAL,text='Pawley update',
    20322031            help='Update negative Pawley intensities with -0.5*Fobs and turn off refinemnt')
    2033 #        self.PawleyEdit.Append(id=wxID_PAWLEYDELETE, kind=wx.ITEM_NORMAL,text='Pawley delete',
    2034 #            help='Delete selected Pawley reflection')
    20352032        self.PostfillDataMenu()
    20362033           
  • trunk/GSASIIphsGUI.py

    r1015 r1016  
    46064606            for iref,ref in enumerate(Refs):
    46074607                try:
    4608                     if refData[iref][9] < 0.:
    4609                         ref[6] = abs(refData[iref][9])*mult
     4608                    if ref[6] < 0.:
     4609                        ref[6] *= -mult
    46104610                        refData[iref][8] *= -mult
    46114611                        refData[iref][9] *= -mult
     
    46134613                        ref[7] = 1.0
    46144614                except IndexError:
     4615                    print 'skipped',ref
    46154616                    pass
    46164617        finally:
    46174618            wx.EndBusyCursor()
    4618         FillPawleyReflectionsGrid()
     4619        wx.CallAfter(FillPawleyReflectionsGrid)
    46194620                           
    4620     def OnPawleyDelete(event):          #doesn't work
    4621         dlg = wx.MessageDialog(G2frame,'Do you really want to delete selected Pawley reflections?','Delete',
    4622             wx.YES_NO | wx.ICON_QUESTION)
    4623         try:
    4624             result = dlg.ShowModal()
    4625             if result == wx.ID_YES:
    4626                 Refs = data['Pawley ref']
    4627                 Ind = G2frame.PawleyRefl.GetSelectedRows()
    4628                 Ind.sort()
    4629                 Ind.reverse()
    4630                 for ind in Ind:
    4631                     Refs = np.delete(Refs,ind,0)
    4632                 data['Pawley ref'] = Refs
    4633                 FillPawleyReflectionsGrid()
    4634         finally:
    4635             dlg.Destroy()
    4636 
    46374621################################################################################
    46384622##### Fourier routines
     
    50865070            G2frame.dataFrame.Bind(wx.EVT_MENU, OnPawleyEstimate, id=G2gd.wxID_PAWLEYESTIMATE)
    50875071            G2frame.dataFrame.Bind(wx.EVT_MENU, OnPawleyUpdate, id=G2gd.wxID_PAWLEYUPDATE)
    5088             G2frame.dataFrame.Bind(wx.EVT_MENU, OnPawleyDelete, id=G2gd.wxID_PAWLEYDELETE)           
    50895072            FillPawleyReflectionsGrid()
    50905073        else:
  • trunk/GSASIIstrMain.py

    r975 r1016  
    149149#            for item in table: print item,table[item]               #useful debug - are things shifting?
    150150            break                   #refinement succeeded - finish up!
    151         except TypeError:          #result[1] is None on singular matrix
     151        except TypeError,FloatingPointError:          #result[1] is None on singular matrix
    152152            print '**** Refinement failed - singular matrix ****'
    153153            if 'Hessian' in Controls['deriv type']:
Note: See TracChangeset for help on using the changeset viewer.