Changeset 2465 for trunk/imports/G2img_HDF5.py

Timestamp:

Sep 12, 2016 6:30:40 PM (7 years ago)

Author:

toby

Message:

implement 3 dimensional HDF images

File:

• trunk/imports/G2img_HDF5.py (modified) (4 diffs)

trunk/imports/G2img_HDF5.py

@@ -36 +36 @@
             self.UseReader = False
             print('HDF5 Reader skipped because h5py library is not installed')
+            import os,sys
+            os.path.split(sys.executable)[0]
+            conda = os.path.join(os.path.split(sys.executable)[0],'conda')
+            if os.path.exists(conda):
+                print('To fix this use command:\n\t'+conda+' install h5py hdf5')
         super(self.__class__,self).__init__( # fancy way to self-reference
                                              extensionlist=('.hdf5','.hd5','.h5','.hdf'),
@@ -66 +71 @@
                 self.buffer['init'] = True
                 self.Comments = self.visit(fp)
+                if imagenum > len(self.buffer['imagemap']):
+                    self.errors = 'No valid images found in file'
+                    return False
+                
             self.Data,self.Npix,self.Image = self.readDataset(fp,imagenum)
-            if self.Npix == 0 or not self.Comments:
+            if self.Npix == 0:
+                self.errors = 'No valid images found in file'
                 return False
             self.LoadImage(ParentFrame,filename,imagenum)
@@ -95 +105 @@
                     dims = dset.shape
                     if len(dims) == 4:
-                        self.buffer['imagemap'] += [
-                            (dset.name,i) for i in range(dims[1])]
+                        self.buffer['imagemap'] += [(dset.name,i) for i in range(dims[1])]
+                    elif len(dims) == 3:
+                        self.buffer['imagemap'] += [(dset.name,i) for i in range(dims[0])]
                     elif len(dims) == 2:
                         self.buffer['imagemap'] += [(dset.name,None)]
-        if GSASIIpath.GetConfigValue('debug'): print 'visit'
+                    else:
+                        print('Skipping entry '+str(dset.name)+'. Shape is '+str(dims))
+        #if GSASIIpath.GetConfigValue('debug'): print 'visit'
         self.buffer['imagemap'] = []
         fp.visititems(func)
@@ -111 +124 @@
         if num is None:
             image = dset[()]
+        elif len(dset.shape) == 4:
+            image = dset[0,num,...]
+        elif len(dset.shape) == 3:
+            image = dset[num,...]
         else:
-            image = dset[0,num,...]
+            msg = 'Unexpected image dimensions '+name
+            print(msg)
+            raise Exception(msg)
         sizexy = list(image.shape) 
         Npix = sizexy[0]*sizexy[1]