Changeset 1360 for trunk/GSASIIstrIO.py


Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIstrIO.py

    r1312 r1360  
    748748            bldata = BLtable[Ename]
    749749            isotope = bldata[0]
    750             mass = bldata[1][0]
    751             blen = bldata[1][1]
    752             bres = []
    753             if len(bldata[1]) > 2:
    754                 bres = bldata[1][2:]
     750            mass = bldata[1]['Mass']
     751            if 'SL' in bldata[1]:
     752                blen = bldata[1]['SL'][0]
     753                bres = []
     754            else:
     755                blen = 0
     756                bres = bldata[1]['BW-LS']
    755757            line = ' %8s%11s %10.3f %8.3f'%(Ename.ljust(8),isotope.center(11),mass,blen)
    756758            for item in bres:
Note: See TracChangeset for help on using the changeset viewer.