Renaming hdf5 to HAWC2 HDF5

Author: ebranlard

pydatview/io/__init__.py

@@ -70,9 +70,9 @@ def fileFormats(userpath=None, ignoreErrors=False, verbose=False):
     from .rosco_discon_file       import ROSCODISCONFile
     from .rosco_performance_file  import ROSCOPerformanceFile
     try:
-        from .hdf5_file               import Hdf5File
+        from .hawc2_hdf5_file               import HAWC2Hdf5File
     except ImportError:
-        Hdf5File=None
+        HAWC2Hdf5File=None
     from .plot3d_file             import Plot3DFile
     from .yaml_file               import YAMLFile
     from .airfoil_file            import AirfoilShapeFile
@@ -102,9 +102,9 @@ def addFormat(priority, fmt):
     addFormat(30, FileFormat(HAWCStab2PwrFile))
     addFormat(30, FileFormat(HAWCStab2IndFile))
     addFormat(30, FileFormat(HAWCStab2CmbFile))
+    if HAWC2Hdf5File is not None:
+        addFormat(30, FileFormat(HAWC2Hdf5File))
     addFormat(30, FileFormat(MannBoxFile))
-    if Hdf5File is not None:
-        addFormat(30, FileFormat(Hdf5File))
     addFormat(40, FileFormat(FLEXBladeFile))
     addFormat(40, FileFormat(FLEXProfileFile))
     addFormat(40, FileFormat(FLEXOutFile))

pydatview/io/hdf5_file.py pydatview/io/hawc2_hdf5_file.pypydatview/io/hdf5_file.py renamed to pydatview/io/hawc2_hdf5_file.py

@@ -3,20 +3,20 @@
 import numpy as np
 import pandas as pd
 
-class Hdf5File(File):
+class HAWC2Hdf5File(File):
 
     @staticmethod
     def defaultExtensions():
         return ['.hdf5']
 
     @staticmethod
     def formatName():
-        return 'hdf5 file'
+        return 'HAWC2 hdf5 file'
 
     def __init__(self, filename=None, **kwargs):
         self.info = {}
         self.data = np.array([])
-        super(Hdf5File, self).__init__(filename=filename, **kwargs)
+        super(HAWC2Hdf5File, self).__init__(filename=filename, **kwargs)
 
     def _read(self):
         try:

pydatview/io/wetb/gtsdf/gtsdf.py

@@ -12,10 +12,9 @@
 try:
     import h5py
 except ImportError as e:
-    print('[FAIL] h5py package not available. HDF5 format will fail. Do `pip install h5py` to use it.')
+    print('[FAIL] h5py package not available. HAWC2 HDF5 format will fail. Do `pip install h5py` to use it.')
     raise e
-#     h5py = None
-#     raise ImportError("HDF5 library cannot be loaded. Windows XP is a known cause of this problem\n%s" % e)
+    h5py = None
 
 block_name_fmt = "block%04d"