cleanup now-working CBF reader

Author: briantoby

GSASII/imports/G2img_CBF.py

@@ -22,13 +22,11 @@ def __init__(self):
     def ContentsValidator(self, filename):        
         '''no test used at this time
         '''
-        print('CBF ContentsValidator')
         return True
 
     def Reader(self,filename, ParentFrame=None, **unused):
         '''Read using Bob's routine :func:`GetCbfData`
         '''
-        print('CBF Reader')
         self.Comments,self.Data,self.Npix,self.Image = GetCbfData(self,filename)
         if self.Npix == 0 or not self.Comments:
             return False
@@ -38,7 +36,6 @@ def Reader(self,filename, ParentFrame=None, **unused):
 def GetCbfData(self,filename):    
     'Read cif binary detector data cbf file'
 
-    print('CBF GetCbfData',filename)
     if GSASIIpath.binaryPath:
         import unpack_cbf as cbf
     else:
@@ -55,12 +52,10 @@ 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
     head = stream[:imageBeg]
-    print('\\r\\n in head','\r\n' in head, 'size',imageBeg)
     term = '\r\n'       #CR-LF
     if term in head:
         pass
@@ -91,9 +86,8 @@ def GetCbfData(self,filename):
         elif 'Detector_2theta' in line:
             det2theta = float(fields[2])
     if compImageSize is None:
-        print('CBF failed to read header')
-        print(head)
-        return
+        print('CBF error failed to read header')
+        return False
 
     nxy = sizexy[0]*sizexy[1]
     cent = [cent[0]*pixSize[0]/1000.,cent[1]*pixSize[1]/1000.]