Skip to content

Commit f1d75d2

Browse files
committed
fix valence/D for listing of electron scattering in .lst; make OK default for Load new after ref.
1 parent 26013ca commit f1d75d2

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

GSASII/GSASIIctrlGUI.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2732,6 +2732,7 @@ def OnRowSelected(event):
27322732
btn.Bind(wx.EVT_BUTTON,lambda event: dlg.EndModal(wx.ID_CANCEL))
27332733
btnsizer.Add(btn)
27342734
btn = wx.Button(dlg, wx.ID_OK)
2735+
btn.SetDefault()
27352736
btn.Bind(wx.EVT_BUTTON,lambda event: dlg.EndModal(wx.ID_OK))
27362737
btnsizer.Add(btn)
27372738
mainSizer.Add(btnsizer, 0, wx.ALIGN_CENTER|wx.ALL, 5)

GSASII/GSASIIstrIO.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1637,7 +1637,9 @@ def MakeRBSphHarm(rbKey,phaseVary,phaseDict):
16371637
pfx = str(pId)+'::'
16381638
Deformations = PhaseData[name].get('Deformations',[])
16391639
FFtable = G2el.GetFFtable(General['AtomTypes'])
1640-
EFtable = G2el.GetEFFtable(General['AtomTypes'])
1640+
ElTypes = [G2el.StripValence(elem) for elem in General['AtomTypes']]
1641+
if 'D' in ElTypes or 'T' in ElTypes: ElTypes.append('H') # D & T are ignored
1642+
EFtable = G2el.GetEFFtable(ElTypes)
16411643
BLtable = G2el.GetBLtable(General)
16421644
FFtables.update(FFtable)
16431645
EFtables.update(EFtable)

0 commit comments

Comments
 (0)