Changeset 1016
- Timestamp:
- Aug 4, 2013 9:35:54 PM (9 years ago)
- Location:
- trunk
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/GSASIIgrid.py
r1007 r1016 87 87 ] = [wx.NewId() for item in range(2)] 88 88 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)] 92 91 93 92 [ wxID_IMCALIBRATE,wxID_IMRECALIBRATE,wxID_IMINTEGRATE, wxID_IMCLEARCALIB, … … 2031 2030 self.PawleyEdit.Append(id=wxID_PAWLEYUPDATE, kind=wx.ITEM_NORMAL,text='Pawley update', 2032 2031 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')2035 2032 self.PostfillDataMenu() 2036 2033 -
trunk/GSASIIphsGUI.py
r1015 r1016 4606 4606 for iref,ref in enumerate(Refs): 4607 4607 try: 4608 if ref Data[iref][9] < 0.:4609 ref[6] = abs(refData[iref][9])*mult4608 if ref[6] < 0.: 4609 ref[6] *= -mult 4610 4610 refData[iref][8] *= -mult 4611 4611 refData[iref][9] *= -mult … … 4613 4613 ref[7] = 1.0 4614 4614 except IndexError: 4615 print 'skipped',ref 4615 4616 pass 4616 4617 finally: 4617 4618 wx.EndBusyCursor() 4618 FillPawleyReflectionsGrid()4619 wx.CallAfter(FillPawleyReflectionsGrid) 4619 4620 4620 def OnPawleyDelete(event): #doesn't work4621 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'] = Refs4633 FillPawleyReflectionsGrid()4634 finally:4635 dlg.Destroy()4636 4637 4621 ################################################################################ 4638 4622 ##### Fourier routines … … 5086 5070 G2frame.dataFrame.Bind(wx.EVT_MENU, OnPawleyEstimate, id=G2gd.wxID_PAWLEYESTIMATE) 5087 5071 G2frame.dataFrame.Bind(wx.EVT_MENU, OnPawleyUpdate, id=G2gd.wxID_PAWLEYUPDATE) 5088 G2frame.dataFrame.Bind(wx.EVT_MENU, OnPawleyDelete, id=G2gd.wxID_PAWLEYDELETE)5089 5072 FillPawleyReflectionsGrid() 5090 5073 else: -
trunk/GSASIIstrMain.py
r975 r1016 149 149 # for item in table: print item,table[item] #useful debug - are things shifting? 150 150 break #refinement succeeded - finish up! 151 except TypeError : #result[1] is None on singular matrix151 except TypeError,FloatingPointError: #result[1] is None on singular matrix 152 152 print '**** Refinement failed - singular matrix ****' 153 153 if 'Hessian' in Controls['deriv type']:
Note: See TracChangeset
for help on using the changeset viewer.