fix HDF5 image bug & cosmetics

Author: briantoby

GSASII/GSASIIfiles.py

@@ -160,7 +160,7 @@ def NeededPackage(pkgDict):
 
       Examples::
 
-          {'MIDAS Zarr importer':['zarr=2.18.*']}
+          {'MIDAS Zarr importer':['zarr=3.18.*']}
           {'HDF5 image importer':['h5py','hdf5']}
     '''
     condaRequestList.update(pkgDict)

GSASII/GSASIIseqGUI.py

@@ -1271,9 +1271,9 @@ def OnEditSelectPhaseVars(event):
         phaseKeys = [i for i in parmDict if ':' in i and i.split(':')[1] == '']
         phaseKeys = [i for i in phaseKeys if type(parmDict[i]) not in (int,str,bool)]
         if len(selRows) == 1:
-            lbl = "\nin {histNames[selRows[0]]}      "
+            lbl = f"\nin {histNames[selRows[0]]}      "
         else:
-            lbl = "\nin {len(selRows)} histograms"
+            lbl = f"\nin {len(selRows)} histograms"
         dlg = G2G.G2MultiChoiceDialog(G2frame, 'Choose phase parmDict item(s) to set'+lbl,
                                       'Choose items to edit', phaseKeys)
         if dlg.ShowModal() == wx.ID_OK:

GSASII/imports/G2img_HDF5.py

@@ -284,8 +284,9 @@ def readDataset(self,fp,imagenum=1,name=None,num=None):
             try:
                 pixelsize = [float(fp['/instrument/Detector/PixelSizeX'][0]),
                              float(fp['/instrument/Detector/PixelSizeY'][0])]
+                print(f'Using PixelSize[XY] for Pixel size: {pixelsize}.')
             except:
-                pass
+                pixelsize = None
         try:
             if not pixelsize:
                 misc = {}
@@ -300,9 +301,12 @@ def readDataset(self,fp,imagenum=1,name=None,num=None):
                     pixelsize = [misc[f'DetPixelSize{i}'][j] for i in ('X','Y')]
                     print(f'Using DetPixelSize* for Pixel size: {pixelsize}.')
         except:
-            print(f'No DetSize* or DetPixelSize* Pixel size defaulting to {pixelsize}.')
+            pixelsize = None
+            print(f'No PixelSize[XY], DetSize[XY] or DetPixelSize[XY].')
         # default pixel size (for APS sector 6?)
-        if not pixelsize: pixelsize = [74.8,74.8]
+        if not pixelsize:
+            pixelsize = [74.8,74.8]
+            print(f'Pixel size defaulting to {pixelsize}')
         data = {'pixelSize':pixelsize,'wavelength':0.15,'distance':1000.,
                 'center':[sizexy[0]*0.1,sizexy[1]*0.1],'size':sizexy,'det2theta':0.0}
         for item in self.Comments: