Skip to content

Commit ea9e993

Browse files
committed
add computation of F000E to SetupGeneral
1 parent dcd5496 commit ea9e993

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

GSASII/GSASIIElem.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,6 @@ def GetFFtable(atomTypes):
8989

9090
def GetEFFtable(atomTypes):
9191
''' returns a dictionary of electron form factor data for atom types found in atomTypes
92-
might not be needed?
9392
9493
:param list atomTypes: list of atom types
9594
:return: FFtable, dictionary of form factor data; key is atom type
@@ -906,12 +905,16 @@ def SetupGeneral(data, dirname):
906905

907906
F000X = 0.
908907
F000N = 0.
908+
F000E = 0.
909+
EFFtables = GetEFFtable(generalData['AtomTypes'])
909910
for i,elem in enumerate(generalData['AtomTypes']):
910911
F000X += generalData['NoAtoms'][elem]*generalData['Z']
911912
isotope = generalData['Isotope'][elem]
912913
F000N += generalData['NoAtoms'][elem]*generalData['Isotopes'][elem][isotope]['SL'][0]
914+
F000E += generalData['NoAtoms'][elem]*ScatFac(EFFtables[elem],0.)[0]
913915
generalData['F000X'] = F000X
914916
generalData['F000N'] = F000N
917+
generalData['F000E'] = F000E
915918
generalData['Mass'] = G2mth.getMass(generalData)
916919

917920
if badList:

0 commit comments

Comments
 (0)