LLNL-PyDV 3.4.3__tar.gz → 3.6.1__tar.gz

{llnl_pydv-3.4.3 → llnl_pydv-3.6.1}/PKG-INFO

@@ -1,8 +1,7 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.3
 Name: LLNL-PyDV
-Version: 3.4.3
+Version: 3.6.1
 Summary: PyDV: Python Data Visualizer
-Home-page: https://github.com/LLNL/PyDV
 License: BSD
 Author: Sarah El-Jurf
 Author-email: eljurf1@llnl.gov
@@ -24,6 +23,7 @@ Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: Scientific/Engineering
 Classifier: Topic :: Scientific/Engineering :: Mathematics
 Requires-Dist: PyQt5
@@ -35,28 +35,43 @@ Requires-Dist: scipy
 Project-URL: Bug Tracker, https://github.com/LLNL/PyDV/issues
 Project-URL: Documentation, https://pydv.readthedocs.io/en/latest/
 Project-URL: Discussions, https://github.com/LLNL/PyDV/discussions
+Project-URL: Homepage, https://github.com/LLNL/PyDV
 Description-Content-Type: text/markdown
 
-## PyDV 
+# PyDV 
 
 A 1D graphics and data analysis tool, heavily based on the ULTRA plotting tool.
 
-### PyDV Importable Interface Module ###
+## PyDV Importable Interface Module ###
 You can now call most of PyDV's functionality from within a Python script. Below is an example of how to do this.
-        
-        import sys
-        sys.path.append("/usr/gapps/pydv/current")
-        import pydvpy as pydvif
 
-        curves = list()
-        curves.append(pydvif.span(1,10,6))
-        pydvif.save('myFile.txt', curves)
-        
-## Documentation
+### Most Current
+
+```
+import sys
+sys.path.append("/usr/gapps/pydv/current")
+import pydvpy
+
+curves = list()
+curves.append(pydvpy.span(1,10,6))
+pydvpy.save('myFile.txt', curves)
+```
+
+### PyPi or WEAVE Environment
+
+```
+from pydv import pydvpy
+
+curves = list()
+curves.append(pydvpy.span(1,10,6))
+pydvpy.save('myFile.txt', curves)
+```
+
+# Documentation
 
 [PyDV Users Manual](https://pydv.readthedocs.io/en/latest/) [![Documentation Status](https://readthedocs.org/projects/pydv/badge/?version=latest)](https://pydv.readthedocs.io/en/latest/?badge=latest)
 
-## License
+# License
 
 PyDV is distributed under the terms of the [BSD-3 License](LICENSE)
 

{llnl_pydv-3.4.3 → llnl_pydv-3.6.1}/README.md

@@ -1,23 +1,37 @@
-## PyDV 
+# PyDV 
 
 A 1D graphics and data analysis tool, heavily based on the ULTRA plotting tool.
 
-### PyDV Importable Interface Module ###
+## PyDV Importable Interface Module ###
 You can now call most of PyDV's functionality from within a Python script. Below is an example of how to do this.
-        
-        import sys
-        sys.path.append("/usr/gapps/pydv/current")
-        import pydvpy as pydvif
 
-        curves = list()
-        curves.append(pydvif.span(1,10,6))
-        pydvif.save('myFile.txt', curves)
-        
-## Documentation
+### Most Current
+
+```
+import sys
+sys.path.append("/usr/gapps/pydv/current")
+import pydvpy
+
+curves = list()
+curves.append(pydvpy.span(1,10,6))
+pydvpy.save('myFile.txt', curves)
+```
+
+### PyPi or WEAVE Environment
+
+```
+from pydv import pydvpy
+
+curves = list()
+curves.append(pydvpy.span(1,10,6))
+pydvpy.save('myFile.txt', curves)
+```
+
+# Documentation
 
 [PyDV Users Manual](https://pydv.readthedocs.io/en/latest/) [![Documentation Status](https://readthedocs.org/projects/pydv/badge/?version=latest)](https://pydv.readthedocs.io/en/latest/?badge=latest)
 
-## License
+# License
 
 PyDV is distributed under the terms of the [BSD-3 License](LICENSE)
 

{llnl_pydv-3.4.3 → llnl_pydv-3.6.1}/pydv/curve.py

@@ -66,80 +66,124 @@ from scipy import interpolate, integrate
 
 class Curve(object):
 
-    name = ''
-    filename = ''
-    record_id = ''
-    xlabel = ''
-    ylabel = ''
-    title = ''
-    plotname = ''
-    color = ''
-    edited = False
-    scatter = False
-    linespoints = False
-    linewidth = None
-    linestyle = '-'
-    drawstyle = 'default'
-    dashes = None
-    hidden = False
-    x = np.empty(0)
-    y = np.empty(0)
-    ebar = None  # errorbar
-    erange = None  # errorrange
-    marker = '.'  # Use matplotlib markers when setting directly
-    markerstyle = None
-    markersize = 3
-    markerfacecolor = None
-    markeredgecolor = None
-    plotprecedence = 0
-    legend_show = True
-
-    def __init__(self, filename='', name='', record_id='', xlabel='', ylabel='', title='',
-                 step=False, xticks_labels=None):
-        self.filename = filename
+    def __init__(self,
+                 x=np.empty(0),
+                 y=np.empty(0),
+                 name='',
+                 filename='',
+                 xlabel='',
+                 ylabel='',
+                 title='',
+                 record_id='',
+                 step=False,
+                 xticks_labels=None,
+                 plotname='',
+                 color='',
+                 edited=False,
+                 scatter=False,
+                 linespoints=False,
+                 linewidth=None,
+                 linestyle='-',
+                 drawstyle='default',
+                 dashes=None,
+                 hidden=False,
+                 ebar=None,  # errorbar
+                 erange=None,  # errorrange
+                 marker='.',  # Use matplotlib markers when setting directly
+                 markerstyle=None,
+                 markersize=3,
+                 markerfacecolor=None,
+                 markeredgecolor=None,
+                 plotprecedence=0,
+                 legend_show=True,
+                 math_interp_left=None,
+                 math_interp_right=None,
+                 math_interp_period=None):
+        self.x = np.array(x, dtype=float)
+        self.y = np.array(y, dtype=float)
         self.name = name
-        self.record_id = record_id
+        self.filename = filename
         self.xlabel = xlabel
         self.ylabel = ylabel
         self.title = title
+        self.record_id = record_id
         self.step = step
         self.xticks_labels = xticks_labels
+        self.plotname = plotname
+        self.color = color
+        self.edited = edited
+        self.scatter = scatter
+        self.linespoints = linespoints
+        self.linewidth = linewidth
+        self.linestyle = linestyle
+        self.drawstyle = drawstyle
+        self.dashes = dashes
+        self.hidden = hidden
+        self.ebar = ebar
+        self.erange = erange
+        self.marker = marker
+        self.markerstyle = markerstyle
+        self.markersize = markersize
+        self.markerfacecolor = markerfacecolor
+        self.markeredgecolor = markeredgecolor
+        self.plotprecedence = plotprecedence
+        self.legend_show = legend_show
+        self.math_interp_left = math_interp_left
+        self.math_interp_right = math_interp_right
+        self.math_interp_period = math_interp_period
+
+        # Other attributes
+        self._original_name = name
 
     def __add__(a, b):
-        c = Curve('', '')
+        c = Curve()
         c.drawstyle = a.drawstyle
         c.plotname = str(a.plotname + ' + ' + b.plotname + ' ').strip('  ')
-        ia, ib = getinterp(a, b)
+        ia, ib = getinterp(a, b,
+                           a.math_interp_left, a.math_interp_right, a.math_interp_period,
+                           b.math_interp_left, b.math_interp_right, b.math_interp_period)
         if ia.x is not None and ib.x is not None:
             c.x = ia.x
             c.y = ia.y + ib.y
+            c.math_interp_left = 0
+            c.math_interp_right = 0
         return c
 
     def __sub__(a, b):
-        c = Curve('', '')
+        c = Curve()
         c.drawstyle = a.drawstyle
         c.plotname = str(a.plotname + ' - ' + b.plotname + ' ').strip('  ')
-        ia, ib = getinterp(a, b)
+        ia, ib = getinterp(a, b,
+                           a.math_interp_left, a.math_interp_right, a.math_interp_period,
+                           b.math_interp_left, b.math_interp_right, b.math_interp_period)
         if ia.x is not None and ib.x is not None:
             c.x = ia.x
             c.y = ia.y - ib.y
+            c.math_interp_left = 0
+            c.math_interp_right = 0
         return c
 
     def __mul__(a, b):
-        c = Curve('', '')
+        c = Curve()
         c.drawstyle = a.drawstyle
         c.plotname = str(a.plotname + ' * ' + b.plotname + ' ').strip('  ')
-        ia, ib = getinterp(a, b)
+        ia, ib = getinterp(a, b,
+                           a.math_interp_left, a.math_interp_right, a.math_interp_period,
+                           b.math_interp_left, b.math_interp_right, b.math_interp_period)
         if ia.x is not None and ib.x is not None:
             c.x = ia.x
             c.y = ia.y * ib.y
+            c.math_interp_left = 0
+            c.math_interp_right = 0
         return c
 
     def __div__(a, b):
-        c = Curve('', '')
+        c = Curve()
         c.drawstyle = a.drawstyle
         c.plotname = str(a.plotname + ' / ' + b.plotname + ' ').strip('  ')
-        ia, ib = getinterp(a, b)
+        ia, ib = getinterp(a, b,
+                           a.math_interp_left, a.math_interp_right, a.math_interp_period,
+                           b.math_interp_left, b.math_interp_right, b.math_interp_period)
         if ia.x is not None and ib.x is not None:
             c.x = ia.x
 
@@ -150,14 +194,18 @@ class Curve(object):
             c.y = ia.y / ib.y
             for idx in zero_indices:
                 c.y[idx] = float(sys.maxsize)
+            c.math_interp_left = 0
+            c.math_interp_right = 0
 
         return c
 
     def __truediv__(a, b):
-        c = Curve('', '')
+        c = Curve()
         c.drawstyle = a.drawstyle
         c.plotname = str(a.plotname + ' / ' + b.plotname + ' ').strip('  ')
-        ia, ib = getinterp(a, b)
+        ia, ib = getinterp(a, b,
+                           a.math_interp_left, a.math_interp_right, a.math_interp_period,
+                           b.math_interp_left, b.math_interp_right, b.math_interp_period)
         if ia.x is not None and ib.x is not None:
             c.x = ia.x
 
@@ -168,11 +216,13 @@ class Curve(object):
             c.y = ia.y / ib.y
             for idx in zero_indices:
                 c.y[idx] = float(sys.maxsize)
+            c.math_interp_left = 0
+            c.math_interp_right = 0
 
         return c
 
     def __pow__(a, b):
-        c = Curve('', '')
+        c = Curve()
         c.drawstyle = a.drawstyle
         c.plotname = str(a.plotname + '^' + str(b)).strip('  ')
         c.x = np.array(a.x)
@@ -183,7 +233,7 @@ class Curve(object):
         return c
 
     def __neg__(a):
-        c = Curve('', '')
+        c = Curve()
         c.drawstyle = a.drawstyle
         c.plotname = str('-' + a.plotname)
         c.x = np.array(a.x)
@@ -195,27 +245,38 @@ class Curve(object):
         Return a new copy of the curve object
         """
 
-        c = Curve(self.filename, self.name, self.record_id, self.xlabel, self.ylabel, self.title)
-        c.plotname = self.plotname
-        c.x = np.array(self.x)
-        c.y = np.array(self.y)
-        c.color = self.color
-        c.edited = self.edited
-        c.scatter = self.scatter
-        c.linespoints = self.linespoints
-        c.linewidth = self.linewidth
-        c.linestyle = self.linestyle
-        c.drawstyle = self.drawstyle
-        c.dashes = self.dashes
-        c.hidden = self.hidden
-        c.marker = self.marker
-        c.markerstyle = self.markerstyle
-        c.markersize = self.markersize
-        c.markeredgecolor = self.markeredgecolor
-        c.markerfacecolor = self.markerfacecolor
-        c.ebar = self.ebar
-        c.erange = self.erange
-        c.plotprecedence = self.plotprecedence
+        c = Curve(x=np.array(self.x, dtype=float),
+                  y=np.array(self.y, dtype=float),
+                  name=self.name,
+                  filename=self.filename,
+                  xlabel=self.xlabel,
+                  ylabel=self.ylabel,
+                  title=self.title,
+                  record_id=self.record_id,
+                  step=self.step,
+                  xticks_labels=self.xticks_labels,
+                  plotname=self.plotname,
+                  color=self.color,
+                  edited=self.edited,
+                  scatter=self.scatter,
+                  linespoints=self.linespoints,
+                  linewidth=self.linewidth,
+                  linestyle=self.linestyle,
+                  drawstyle=self.drawstyle,
+                  dashes=self.dashes,
+                  hidden=self.hidden,
+                  ebar=self.ebar,
+                  erange=self.erange,
+                  marker=self.marker,
+                  markerstyle=self.markerstyle,
+                  markersize=self.markersize,
+                  markerfacecolor=self.markerfacecolor,
+                  markeredgecolor=self.markeredgecolor,
+                  plotprecedence=self.plotprecedence,
+                  legend_show=self.legend_show,
+                  math_interp_left=self.math_interp_left,
+                  math_interp_right=self.math_interp_right,
+                  math_interp_period=self.math_interp_period)
 
         return c
 
@@ -232,7 +293,10 @@ class Curve(object):
         return c
 
 
-def getinterp(a, b, left=None, right=None, samples=100, match='domain'):
+def getinterp(a, b,
+              a_left=None, a_right=None, a_period=None,
+              b_left=None, b_right=None, b_period=None,
+              samples=100, match='domain'):
     """
     Gets the interpolated and domain matched versions of the two curves.
 
@@ -240,10 +304,18 @@ def getinterp(a, b, left=None, right=None, samples=100, match='domain'):
     :type a: curve
     :param b: Curve B
     :type b: curve
-    :param left: Value to return for `x < a.x[0]`, default is `a.y[0]`.
-    :type left: float, optional
-    :param right: Value to return for `x > a.x[-1]`, default is `a.y[-1]`.
-    :type: right: float, optional
+    :param a_left: `numpy.interp()` `left` parameter for internal curve math methods for Curve A
+    :type a_left: float, optional
+    :param a_right: `numpy.interp()` `right` parameter for internal curve math methods for Curve A
+    :type: a_right: float, optional
+    :param a_period: `numpy.interp()` `period` parameter for internal curve math methods for Curve A
+    :type: a_period: float, optional
+    :param b_left: `numpy.interp()` `left` parameter for internal curve math methods for Curve B
+    :type b_left: float, optional
+    :param b_right: `numpy.interp()` `right` parameter for internal curve math methods for Curve B
+    :type: b_right: float, optional
+    :param b_period: `numpy.interp()` `period` parameter for internal curve math methods for Curve B
+    :type: b_period: float, optional
     :param match {'domain','step'},optional: A string indicating how to interpolate the two curves
     :type match: str
     :returns: curve pair -- the interpolated and domain matched versions of a and b
@@ -254,11 +326,11 @@ def getinterp(a, b, left=None, right=None, samples=100, match='domain'):
 
         ia = a.copy()
         ia.x = np.array(ux)
-        ia.y = np.interp(ux, a.x, a.y, left, right)  # interpolate y vals
+        ia.y = np.interp(ux, a.x, a.y, a_left, a_right, a_period)  # interpolate y vals
 
-        ib = Curve('', '')
+        ib = Curve()
         ib.x = np.array(ux)
-        ib.y = np.interp(ux, b.x, b.y, left, right)  # interpolate y vals
+        ib.y = np.interp(ux, b.x, b.y, b_left, b_right, b_period)  # interpolate y vals
 
         return ia, ib
     elif match == 'step':
@@ -272,11 +344,11 @@ def getinterp(a, b, left=None, right=None, samples=100, match='domain'):
 
         ia = a.copy()
         ia.x = ax
-        ia.y = np.interp(ax, a.x, a.y, left, right)  # interpolate y vals
+        ia.y = np.interp(ax, a.x, a.y, a_left, a_right, a_period)  # interpolate y vals
 
-        ib = Curve('', '')
+        ib = Curve()
         ib.x = bx
-        ib.y = np.interp(bx, b.x, b.y, left, right)  # interpolate y vals
+        ib.y = np.interp(bx, b.x, b.y, b_left, b_right, b_period)  # interpolate y vals
 
         return ia, ib
     else:
@@ -325,7 +397,7 @@ def append(a, b):
     ux = list(set(a.x).union(set(b.x)))  # get union of xvals
     ux.sort()
 
-    aub = Curve('', '')
+    aub = Curve()
     aub.x = np.array(ux)
     aub.y = np.zeros(len(aub.x))
 

{llnl_pydv-3.4.3 → llnl_pydv-3.6.1}/pydv/pdv

@@ -1,4 +1,4 @@
-#!/usr/bin/env /usr/apps/weave/weave-develop-cpu/bin/python3
+#!/usr/bin/env /usr/apps/weave/weave-prod-cpu/bin/python3
 
 import sys
 import os