Changeset 2460 for trunk/GSASIIIO.py

Timestamp:

Sep 6, 2016 5:15:21 PM (6 years ago)

Author:

vondreele

Message:

further fixes to edf importer

File:

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

trunk/GSASIIIO.py

@@ -585 +585 @@
     File.seek(fileSize-imSize)
     if dType == 'UnsignedShort':        
-        image = np.array(ar.array('H',File.read(imSize)),dtype=np.int32)
-    elif dType in ['UnsignedInt','UnsignedLong']:
-        image = np.array(ar.array('L',File.read(imSize)),dtype=np.int32)
-    elif dType in ['SignedInteger','SignedLong']:
-        image = np.array(ar.array('l',File.read(imSize)),dtype=np.int32)
+        image = np.array(np.frombuffer(File.read(imSize),dtype=np.int16),dtype=np.int32)
+    else:
+        image = np.array(np.frombuffer(File.read(imSize),dtype=np.int32),dtype=np.int32)
     image = np.reshape(image,(sizexy[1],sizexy[0]))
     data = {'pixelSize':pixSize,'wavelength':wave,'distance':dist,'center':cent,'size':sizexy}