Changeset 1964
- Timestamp:
- Aug 28, 2015 9:25:44 AM (7 years ago)
- Location:
- trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/GSASIIindex.py
r1637 r1964 330 330 hkl = HKL[pos] # put in hkl 331 331 if hkl[-1] >= 0: # peak already assigned - test if this one better 332 opeak = peaks[ hkl[-1]]332 opeak = peaks[int(hkl[-1])] #hkl[-1] needs to be int here 333 333 dold = abs(opeak[-2]-hkl[3]) 334 334 dnew = min(dm,dp) -
trunk/GSASIIphsGUI.py
r1963 r1964 857 857 Map['RefList'] = [Map['RefList'],] 858 858 lineSizer.Add(wx.ComboBox(General,value=Map['RefList'][0],choices=Map['RefList'], 859 style=wx.CB_DROPDOWN ),0,WACV)859 style=wx.CB_DROPDOWN|wx.CB_READONLY),0,WACV) 860 860 refList = wx.Button(General,label='Select reflection sets') 861 861 refList.Bind(wx.EVT_BUTTON,OnRefList) … … 932 932 Flip['RefList'] = [Flip['RefList'],] 933 933 lineSizer.Add(wx.ComboBox(General,value=Flip['RefList'][0],choices=Flip['RefList'], 934 style=wx.CB_DROPDOWN ),0,WACV)934 style=wx.CB_DROPDOWN|wx.CB_READONLY),0,WACV) 935 935 refList = wx.Button(General,label='Select reflection sets') 936 936 refList.Bind(wx.EVT_BUTTON,OnRefList) … … 1614 1614 atomData.append([Name,El,'',x,y,z,1,Sytsym,Mult,'I',0.01,0,0,0,0,0,0,atId]) 1615 1615 elif generalData['Type'] in ['modulated','magnetic']: 1616 atomData.append([Name,El,'',x,y,z,1,Sytsym,Mult, 0,'I',0.01,0,0,0,0,0,0,atId,[],[],SSdefault])1616 atomData.append([Name,El,'',x,y,z,1,Sytsym,Mult,'I',0.01,0,0,0,0,0,0,atId,[],[],SSdefault]) 1617 1617 SetupGeneral() 1618 1618 if 'Atoms' in data['Drawing']: … … 2494 2494 Map['RefList'] = [Map['RefList'],] 2495 2495 mapSizer.Add(wx.ComboBox(waveData,value=Map['RefList'][0],choices=Map['RefList'], 2496 style=wx.CB_DROPDOWN ),0,WACV)2496 style=wx.CB_DROPDOWN|wx.CB_READONLY),0,WACV) 2497 2497 refList = wx.Button(waveData,label='Select reflection sets') 2498 2498 refList.Bind(wx.EVT_BUTTON,OnRefList) … … 3891 3891 shPenalty.Add(wx.StaticText(Texture,wx.ID_ANY,' Negative MRD penalty list: '),0,WACV) 3892 3892 shPenalty.Add(wx.ComboBox(Texture,value=Penalty[0][0],choices=Penalty[0], 3893 style=wx.CB_DROPDOWN ),0,WACV)3893 style=wx.CB_DROPDOWN|wx.CB_READONLY),0,WACV) 3894 3894 hklList = wx.Button(Texture,label='Select penalty hkls') 3895 3895 hklList.Bind(wx.EVT_BUTTON,OnHKLList)
Note: See TracChangeset
for help on using the changeset viewer.