Changeset 2459


Ignore:
Timestamp:
Sep 6, 2016 10:44:55 AM (5 years ago)
Author:
vondreele
Message:

fix import of edf SignedLong? image

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIIO.py

    r2449 r2459  
    586586    if dType == 'UnsignedShort':       
    587587        image = np.array(ar.array('H',File.read(imSize)),dtype=np.int32)
    588     elif dType == 'UnsignedInt':
     588    elif dType in ['UnsignedInt','UnsignedLong']:
    589589        image = np.array(ar.array('L',File.read(imSize)),dtype=np.int32)
    590     elif dType == 'UnsignedLong':
    591         image = np.array(ar.array('L',File.read(imSize)),dtype=np.int32)
    592     elif dType == 'SignedInteger':
     590    elif dType in ['SignedInteger','SignedLong']:
    593591        image = np.array(ar.array('l',File.read(imSize)),dtype=np.int32)
    594592    image = np.reshape(image,(sizexy[1],sizexy[0]))
  • trunk/GSASIIplot.py

    r2455 r2459  
    33183318    shModels = ['cylindrical','none','shear - 2/m','rolling - mmm']
    33193319    SamSym = dict(zip(shModels,['0','-1','2/m','mmm']))
    3320     PatternId = G2frame.PatternId
     3320#    PatternId = G2frame.PatternId
    33213321    generalData = data['General']
    33223322    SGData = generalData['SGData']
Note: See TracChangeset for help on using the changeset viewer.