Changeset 3472

Timestamp:

Jul 13, 2018 4:21:07 PM (5 years ago)

Author:

toby

Message:

allow .ge5 for GE files

File:

• trunk/imports/G2img_GE.py (modified) (6 diffs)

trunk/imports/G2img_GE.py

@@ -11 +11 @@
 ---------------------------------------
 
+Read data from General Electric angiography x-ray detectors,
+primarily as used at APS 1-ID. 
 This shows an example of an importer that will handle files with
 more than a single image. 
@@ -25 +27 @@
     '''Routine to read a GE image, typically from APS Sector 1.
         
-        The image files may be of form .geX (where X is ' ', 1, 2, 3 or 4),
+        The image files may be of form .geX (where X is ' ', 1, 2, 3, 4 or 5),
         which is a raw image from the detector. These files may contain more
         than one image and have a rudimentary header. 
@@ -34 +36 @@
     def __init__(self):
         super(self.__class__,self).__init__( # fancy way to self-reference
-            extensionlist=('.sum','.cor','.avg','.ge','.ge1','.ge2','.ge3','.ge4'),
+            extensionlist=('.sum','.cor','.avg','.ge','.ge1','.ge2','.ge3','.ge4','.ge5'),
             strictExtension=True,
             formatName = 'GE image',
@@ -73 +75 @@
     '''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),
+        The image files may be of form .geX (where X is ' ', 1, 2, 3, 4 or 5),
         which is a raw image from the detector. These files may contain more
         than one image and have a rudimentary header. 
@@ -82 +84 @@
     def __init__(self):
         super(self.__class__,self).__init__( # fancy way to self-reference
-            extensionlist=('.ge1','.ge2','.ge3','.ge4'),
+            extensionlist=('.ge1','.ge2','.ge3','.ge4','.ge5'),
             strictExtension=True,
             formatName = 'sum GE multi-image',
@@ -107 +109 @@
         imagenum = kwarg.get('blocknum')
         if imagenum is None: imagenum = 1
-        self.Comments,self.Data,self.Npix,self.Image,more = \
-            GetGEsumData(self,filename,imagenum=imagenum,sum=True)
+        self.Comments,self.Data,self.Npix,self.Image,more = GetGEsumData(
+            self,filename,imagenum=imagenum,sum=True)
         if self.Npix == 0 or not self.Comments:
             return False