Changeset 3423
- Timestamp:
- Jun 6, 2018 8:28:50 AM (5 years ago)
- Location:
- trunk
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/GSASIIctrlGUI.py
r3418 r3423 3531 3531 varSelSizer = wx.BoxSizer(wx.HORIZONTAL) 3532 3532 varSelSizer.Add(SelCtrl,0) 3533 varSpin = wx.SpinButton(self,style=wx. wx.SP_VERTICAL)3533 varSpin = wx.SpinButton(self,style=wx.SP_VERTICAL) 3534 3534 varSpin.SetValue(0) 3535 3535 varSpin.SetRange(-1,1) -
trunk/GSASIImath.py
r3329 r3423 546 546 return XYZ 547 547 548 #def TransformAtoms(Atoms,cx,cia,Trans,Vec): 548 def GetAtomFracByID(pId,parmDict,AtLookup,indx): 549 '''default doc string 550 551 :param type name: description 552 553 :returns: type name: description 554 555 ''' 556 pfx = str(pId)+'::Afrac:' 557 Frac = [] 558 for ind in indx: 559 name = pfx+str(AtLookup[ind]) 560 Frac.append(parmDict[name]) 561 return Frac 562 549 563 # for Atom in Atoms: 550 564 # XYZ = Atom[cx:cx+3] -
trunk/GSASIIstrMath.py
r3418 r3423 373 373 pNames.append(str(pId)+':'+name+':'+str(i)) 374 374 mul = np.array(G2mth.GetAtomItemsById(Atoms,AtLookup,indx,cs+1)) 375 frac = np.array(G2mth.GetAtom ItemsById(Atoms,AtLookup,indx,cs-1))375 frac = np.array(G2mth.GetAtomFracByID(pId,parmDict,AtLookup,indx)) 376 376 calc = np.sum(mul*frac*factors) 377 377 pVals.append(obs-calc) -
trunk/GSASIItestplot.py
r2551 r3423 10 10 import wx.aui 11 11 import matplotlib as mpl 12 from matplotlib.backends.backend_wxagg import FigureCanvasWxAgg as Canvas 13 from matplotlib.backends.backend_wxagg import NavigationToolbar2Wx as Toolbar 12 try: 13 from matplotlib.backends.backend_wxagg import FigureCanvasWxAgg as Canvas 14 except ImportError: 15 from matplotlib.backends.backend_wx import FigureCanvas as Canvas 16 try: 17 from matplotlib.backends.backend_wxagg import NavigationToolbar2Wx as Toolbar 18 except ImportError: 19 from matplotlib.backends.backend_wxagg import Toolbar as Toolbar # name changes in wx4.0.1 14 20 15 21 class Plot(wx.Panel): -
trunk/testSSymbols.py
r3257 r3423 27 27 self.testSSMenu = wx.MenuBar() 28 28 self.File = wx.Menu(title='') 29 self.File.Append(help='Exit from testSS', id=wxID_FILEEXIT, kind=wx.ITEM_NORMAL, 30 text='Exit') 29 self.File.Append(wxID_FILEEXIT,'Exit','Exit from testSS') 31 30 self.Bind(wx.EVT_MENU, self.OnFileExit, id=wxID_FILEEXIT) 32 31 self.testSSMenu.Append(menu=self.File, title='Run')
Note: See TracChangeset
for help on using the changeset viewer.