Changeset 1360 for trunk/GSASIIstrIO.py

Timestamp:

May 22, 2014 1:07:10 PM (8 years ago)

Author:

vondreele

Message:

add SRM660b to ImageCalibrants?.py
revamp element stuff to use atmdata.py instead of atmdata.dat
should be immune to old gpx files.

File:

• trunk/GSASIIstrIO.py (modified) (1 diff)

trunk/GSASIIstrIO.py

@@ -748 +748 @@
             bldata = BLtable[Ename]
             isotope = bldata[0]
-            mass = bldata[1][0]
-            blen = bldata[1][1]
-            bres = []
-            if len(bldata[1]) > 2:
-                bres = bldata[1][2:]
+            mass = bldata[1]['Mass']
+            if 'SL' in bldata[1]:
+                blen = bldata[1]['SL'][0]
+                bres = []
+            else:
+                blen = 0
+                bres = bldata[1]['BW-LS']
             line = ' %8s%11s %10.3f %8.3f'%(Ename.ljust(8),isotope.center(11),mass,blen)
             for item in bres: