File tree Expand file tree Collapse file tree 1 file changed +6
-3
lines changed
Expand file tree Collapse file tree 1 file changed +6
-3
lines changed Original file line number Diff line number Diff line change @@ -915,14 +915,17 @@ def SetupGeneral(data, dirname):
915915 F000N = 0.
916916 F000E = 0.
917917 ElTypes = [StripValence (elem ) for elem in generalData ['AtomTypes' ]]
918- EFFtables = GetEFFtable (ElTypes )
918+ if 'D' in ElTypes or 'T' in ElTypes : ElTypes .append ('H' ) # pseudo-elements D & T are
919+ EFFtables = GetEFFtable (ElTypes ) # ignored in GetEFFtable
919920 for i ,elem in enumerate (generalData ['AtomTypes' ]):
920921 F000X += generalData ['NoAtoms' ][elem ]* generalData ['Z' ]
921922 isotope = generalData ['Isotope' ][elem ]
922923 F000N += generalData ['NoAtoms' ][elem ]* generalData ['Isotopes' ][elem ][isotope ]['SL' ][0 ]
923924 if elem .strip () in ['D' ,'T' ]:
924- elem = 'H'
925- F000E += generalData ['NoAtoms' ][elem ]* ScatFac (EFFtables [StripValence (elem )],0. )[0 ]
925+ elem1 = 'H'
926+ else :
927+ elem1 = elem
928+ F000E += generalData ['NoAtoms' ][elem ]* ScatFac (EFFtables [StripValence (elem1 )],0. )[0 ]
926929 generalData ['F000X' ] = F000X
927930 generalData ['F000N' ] = F000N
928931 generalData ['F000E' ] = F000E
You can’t perform that action at this time.
0 commit comments