debug test_CBF

Author: briantoby

GSASII/imports/G2img_CBF.py

@@ -38,7 +38,7 @@ def GetCbfData(self,filename):
 
     import unpack_cbf as cbf
     if GSASIIpath.GetConfigValue('debug'):
-        print ('Read cif binary detector data cbf file: '+filename)
+        print ('Reading cif binary detector data cbf file: '+filename)
     File = open(filename,'rb')
     sizexy = [0,0]
     pixSize = [172,172]     #Pixium4700?
@@ -49,6 +49,7 @@ def GetCbfData(self,filename):
     byteOrd = '<'
     stream = File.read()
     if 'bytes' in str(type(stream)):
+        print ('decoding: '+filename)
         stream = stream.decode('latin-1')
     starter = '\x0c\x1a\x04\xd5'
     imageBeg = stream.find(starter)+4
@@ -59,6 +60,7 @@ def GetCbfData(self,filename):
     else:
         term = '\n' #LF only
     head = head.split(term)
+    compImageSize = None
     for line in head:
         fields = line.split()
         if 'Wavelength' in line:
@@ -81,6 +83,12 @@ def GetCbfData(self,filename):
             Npix = int(fields[1])
         elif 'Detector_2theta' in line:
             det2theta = float(fields[2])
+    if compImageSize is None:
+        print('CBF failed to read header')
+        print(header)
+        print('\\r\\n in header','\r\n' in header, 'size',imageBeg)
+        return
+        
     nxy = sizexy[0]*sizexy[1]
     cent = [cent[0]*pixSize[0]/1000.,cent[1]*pixSize[1]/1000.]
     File.seek(0)