Changeset 2227

Timestamp:

Apr 26, 2016 8:36:05 AM (7 years ago)

Author:

vondreele

Message:

avoid divide by zero effect if a zero image
refactor LoadImage2Tree
add new importer for summing GE images

Location:

trunk

Files:

• GSASIIIO.py (modified) (1 diff)
• GSASIIimgGUI.py (modified) (1 diff)
• imports/G2img_GE.py (modified) (4 diffs)

trunk/GSASIIIO.py

@@ -277 +277 @@
     ImageTag (where there is more than one image in the file), if defined.
     '''
-    ImgNames = []
-    if G2frame.PatternTree.GetCount(): # get a list of existing Image entries
-        item, cookie = G2frame.PatternTree.GetFirstChild(G2frame.root)
-        while item:
-            name = G2frame.PatternTree.GetItemText(item)
-            if name.startswith('IMG'): ImgNames.append(name)        
-            item, cookie = G2frame.PatternTree.GetNextChild(G2frame.root, cookie)
+    ImgNames = G2gd.GetPatternTreeDataNames(G2frame,['IMG ',])
     TreeLbl = 'IMG '+os.path.basename(imagefile)
     ImageTag = Data.get('ImageTag')

trunk/GSASIIimgGUI.py

@@ -448 +448 @@
         maxSizer.AddGrowableCol(1,1)
         maxSizer.SetFlexibleDirection(wx.HORIZONTAL)
-        sqrtDeltZero = math.sqrt(data['range'][0][1]-max(0.0,data['range'][0][0]))
-        DeltOne = data['range'][1][1]-max(0.0,data['range'][0][0])
+        sqrtDeltZero = max(1.0,math.sqrt(data['range'][0][1]-max(0.0,data['range'][0][0])))
+        DeltOne = max(1.0,data['range'][1][1]-max(0.0,data['range'][0][0]))
         sqrtDeltOne = math.sqrt(DeltOne)
         maxSizer.Add(wx.StaticText(parent=G2frame.dataDisplay,label=' Max intensity'),0,WACV)

trunk/imports/G2img_GE.py

@@ -22 +22 @@
 import GSASIIpath
 GSASIIpath.SetVersionNumber("$Revision$")
-class GEsum_ReaderClass(G2IO.ImportImage):
+class GE_ReaderClass(G2IO.ImportImage):
     '''Routine to read a GE image, typically from APS Sector 1.
         
@@ -47 +47 @@
     def Reader(self,filename,filepointer, ParentFrame=None, **kwarg):
         '''Read using GE file reader, :func:`GetGEsumData`
+        should this read all blocks & sum them if desired?
         '''
         #rdbuffer = kwarg.get('buffer')
         imagenum = kwarg.get('blocknum')
+        #sum = kwarg.get('sum')
         if imagenum is None: imagenum = 1
         self.Comments,self.Data,self.Npix,self.Image,more = GetGEsumData(filename,imagenum=imagenum)
@@ -59 +61 @@
         return True
 
-def GetGEsumData(filename,imagenum=1):
+class GE_sumReaderClass(G2IO.ImportImage):
+    '''Routine to read multiple GE images & sum them, typically from APS Sector 1.
+        
+        The image files may be of form .geX (where X is ' ', 1, 2, 3 or 4),
+        which is a raw image from the detector. These files may contain more
+        than one image and have a rudimentary header. 
+        Files with extension .sum or .cor are 4 byte integers/pixel, one image/file.
+        Files with extension .avg are 2 byte integers/pixel, one image/file.
+    '''
+
+    def __init__(self):
+        super(self.__class__,self).__init__( # fancy way to self-reference
+            extensionlist=('.ge1','.ge2','.ge3','.ge4'),
+            strictExtension=True,
+            formatName = 'GE multi-image summed',
+            longFormatName = 'sum of GE multi-image file'
+            )
+
+    def ContentsValidator(self, filepointer):
+        '''no test at this time
+        '''
+        return True
+        
+    def Reader(self,filename,filepointer, ParentFrame=None, **kwarg):
+        '''Read using GE file reader, :func:`GetGEsumData`
+        should this read all blocks & sum them if desired?
+        '''
+        #rdbuffer = kwarg.get('buffer')
+        imagenum = kwarg.get('blocknum')
+        if imagenum is None: imagenum = 1
+        self.Comments,self.Data,self.Npix,self.Image,more = GetGEsumData(filename,imagenum=imagenum,sum=True)
+        if self.Npix == 0 or not self.Comments:
+            return False
+        self.LoadImage(ParentFrame,filename,imagenum)
+        self.repeatcount = imagenum
+        self.repeat = more
+        return True
+
+def GetGEsumData(filename,imagenum=1,sum=False):  #
     '''Read G.E. detector images from various files as produced at 1-ID and
-    with Detector Pool detector.
+    with Detector Pool detector. Also sums multiple image files if desired
     '''
     import struct as st
@@ -100 +140 @@
             return 0,0,0,0,False            
         head += ['file: '+filename+' image #'+str(imagenum),]
-        #while nframes > 1:
-        #    print 'adding'
-        #    image += np.array(ar.array('H',File.read(2*Npix)),dtype=np.int32)
-        #    nframes -= 1
+        if sum:    #will ignore imagenum
+            while nframes > 1: #OK, this will sum the frames.
+        #      print 'adding'
+                image += np.array(ar.array('H',File.read(2*Npix)),dtype=np.int32)
+                nframes -= 1
+            more = False
     image = np.reshape(image,(sizexy[1],sizexy[0]))
     data = {'pixelSize':[200,200],'wavelength':0.15,'distance':250.0,'center':[204.8,204.8],'size':sizexy}