Merge branch 'develop' into 'main'

Develop

See merge request weave/pydv!206

Author: jmoreno45

.github/workflows/release.yml

@@ -18,7 +18,7 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token
         with:
-          tag_name: pydv-3.8.2
-          release_name: PyDV 3.8.2
+          tag_name: pydv-3.9.0
+          release_name: PyDV 3.9.0
           draft: false
           prerelease: false

Makefile

@@ -1,6 +1,6 @@
 SHELL := /bin/bash
 
-PYDV_ENV := $(if $(PYDV_ENV),$(PYDV_ENV),$(HOME)/pydv_env)
+PYDV_ENV := $(if $(PYDV_ENV),$(PYDV_ENV),/usr/workspace/$(USER)/pydv_env)
 
 PKG_REGISTRY_URL = $(CI_API_V4_URL)/projects/$(CI_PROJECT_ID)/packages/generic/archive
 DEPLOY_PATH = /usr/gapps/pydv

docs/release_notes.rst

@@ -2,6 +2,11 @@
 
 Release Notes
 =============
+3.9.0
+------
+* Support for sina hdf5 files
+* Bugfix for `fit`
+
 3.8.2
 ------
 * Bugfix for xminmax mask 

pydv/pdv.py

@@ -510,6 +510,9 @@ def do_rdcsv(self, line):
     def do_rdsina(self, line):
         self.do_readsina(line)
 
+    def do_rdsinah5(self, line):
+        self.do_readsinahdf5(line)
+
     def do_cur(self, line):
         self.do_curve(line)
 
@@ -636,6 +639,8 @@ def do_help(self, arg):
             arg = 'readcsv'
         elif (arg == 'rdsina'):
             arg = 'readsina'
+        elif (arg == 'rdsinah5'):
+            arg = 'readsinahdf5'
         elif (arg == 'convol'):
             arg = 'convolve'
         elif (arg == 'convolb'):
@@ -1110,6 +1115,9 @@ def do_read(self, line):
             elif line[-1].endswith(".json"):
                 self.do_readsina(" ".join(line))
                 return
+            elif line[-1].endswith(".hdf5") or line[-1].endswith(".h5") or line[-1].endswith(".hdf"):
+                self.do_readsinahdf5(" ".join(line))
+                return
 
             if n == 1:
                 self.load(line[0])
@@ -1174,10 +1182,8 @@ def do_readcsv(self, line):
 
     def do_readsina(self, line):
         """
-        Read all curves from Sina data file. PyDV assumes there is only one record in the Sina file, and if there are
-        more than one then PyDV only reads the first. PyDV also assumes there is only one independent variable per
-        curve_set; if there are more than one then PyDV may exhibit undefined behavior. The next available prefix
-        (see the prefix command) is automatically assigned the menu index of the first curve in each data file read.
+        Read all curves from Sina data file. The next available prefix (see the prefix command) is automatically
+        assigned the menu index of the first curve in each data file read.
 
         .. code::
 
@@ -1196,6 +1202,28 @@ def do_readsina(self, line):
             self.redraw = False
             self.plotter.updateDialogs()
 
+    def do_readsinahdf5(self, line):
+        """
+        Read all curves from Sina hdf5 data file. The next available prefix (see the prefix command) is automatically
+        assigned the menu index of the first curve in each data file read.
+
+        .. code::
+
+            [PyDV]: <readsinahdf5 | rdsinah5> <filename.hdf5>
+
+            Ex:
+                [PyDV]: readsinahdf5 my_file.hdf5
+        """
+
+        try:
+            line = line.split()
+            self.load_sinahdf5(line[0])
+        except:
+            pdvutil.print_own_docstring(self)
+        finally:
+            self.redraw = False
+            self.plotter.updateDialogs()
+
     def do_setxcolumn(self, line):
         """
         Set x column for reading column formatted data files (.gnu or .csv).
@@ -9440,6 +9468,16 @@ def load_sina(self, fname):
             self.curvelist += curves
             self.filelist.append((fname, len(curves)))
 
+    def load_sinahdf5(self, fname):
+        """
+        Load a Sina HDF5 data file, add parsed curves to the curvelist
+        """
+
+        curves = pydvpy.readsinahdf5(fname, self.debug)
+        if len(curves) > 0:
+            self.curvelist += curves
+            self.filelist.append((fname, len(curves)))
+
     def loadrc(self):
         """
         Read in a resource definition file