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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: LLNL-PyDV
-Version: 3.6.1
+Version: 3.6.3
 Summary: PyDV: Python Data Visualizer
 License: BSD
 Author: Sarah El-Jurf

{llnl_pydv-3.6.1 → llnl_pydv-3.6.3}/pydv/pdv.py

@@ -258,6 +258,7 @@ class Command(cmd.Cmd, object):
     tightlayout = 0
     group = 0
     slashes = 100
+    do_label_done = False
 
     # Users wanted support for automatically loading some plot attributes. The
     # following commands handle the situations where there are multiple plots or
@@ -1353,7 +1354,12 @@ class Command(cmd.Cmd, object):
                 return 0
             if "*." in line:
                 for fdx in range(len(self.filelist)):
-                    temp_line = line.replace("*", chr(ord('a') + fdx))
+
+                    if fdx < 26:
+                        temp_line = line.replace("*", chr(ord('a') + fdx))
+                    else:
+                        temp_line = line.replace("*", f"@{fdx + 1}")
+
                     if len(line.split(':')) > 1:  # check for list notation
                         self.do_curve(pdvutil.getnumberargs(temp_line, self.filelist))
                     else:
@@ -1368,8 +1374,15 @@ class Command(cmd.Cmd, object):
                 for i in range(len(line)):
                     curvedex = 0
                     skip = False
-                    if ord('A') <= ord(line[i][0].upper()) <= ord('Z'):  # check for a.% b.% file index notation
-                        filedex = ord(line[i][0].upper()) - ord('A')  # file index we want
+
+                    # check for a.% b.% @#. file index notation
+                    if ord('A') <= ord(line[i][0].upper()) <= ord('Z') or '@' in line[i]:
+
+                        if ord('A') <= ord(line[i][0].upper()) <= ord('Z'):
+                            filedex = ord(line[i][0].upper()) - ord('A')  # file index we want
+                        else:
+                            filedex = int(line[i].split(".")[0].replace("@", "")) - 1  # 0 index
+
                         prevfile = ''  # set prevfile to impossible value
                         filecounter = 0
                         fileend = 0
@@ -1385,9 +1398,9 @@ class Command(cmd.Cmd, object):
                         curvedex += int(line[i].split('.')[-1]) - 1
                         if curvedex + 1 > fileend:
                             filestart = fileend - self.filelist[filedex][1] + 1
-                            print('error: curve index out of bounds')
-                            print(f"\tFile {self.filelist[filedex]}: Start {filestart}, End {fileend}")
-                            print(f"\tRequested Curve {line[i]}")
+                            print(f"File {filedex + 1}: {self.filelist[filedex]}: Start {filestart}, End {fileend}")
+                            print(f"\tRequested Curve {line[i]}: {curvedex + 1}")
+                            print('\tError: curve index out of bounds')
                             skip = True
                     elif 0 < int(line[i]) <= len(self.curvelist):
                         curvedex = int(line[i]) - 1
@@ -1565,6 +1578,80 @@ class Command(cmd.Cmd, object):
         print('\n   Display the mean and standard deviation for the given curves.'
               '\n   usage: stats <curve-list>\n')
 
+    def do_deltax(self, line):
+        """
+        Create new curve that calculates difference between its own X points. Delta X vs # of points - 1.
+        """
+
+        if not line:
+            return 0
+
+        if len(line.split(':')) > 1:
+            self.do_deltax(pdvutil.getletterargs(line))
+            return 0
+        else:
+            try:
+                line = line.split()
+                for i in range(len(line)):
+                    try:
+                        curvidx = pdvutil.getCurveIndex(line[i], self.plotlist)
+                        cur = self.plotlist[curvidx]
+
+                        c = pydvpy.makecurve(x=range(len(cur.x) - 1),
+                                             y=cur.x[1:] - cur.x[:-1],
+                                             name=f"{cur.name} Delta X",  # we name the curve with the input 'line'
+                                             plotname=self.getcurvename())  # get the next available data ID label
+                        self.addtoplot(c)
+
+                    except pdvutil.CurveIndexError:
+                        pass
+            except:
+                if self.debug:
+                    traceback.print_exc(file=sys.stdout)
+            finally:
+                self.redraw = True
+
+    def help_deltax(self):
+        print('\n   Create new curve that calculates difference between its own X points. Delta X vs # of points - 1.'
+              '\n   usage: deltax <curve-list>\n')
+
+    def do_deltay(self, line):
+        """
+        Create new curve that calculates difference between its own Y points. Delta Y vs # of points - 1.
+        """
+
+        if not line:
+            return 0
+
+        if len(line.split(':')) > 1:
+            self.do_deltay(pdvutil.getletterargs(line))
+            return 0
+        else:
+            try:
+                line = line.split()
+                for i in range(len(line)):
+                    try:
+                        curvidx = pdvutil.getCurveIndex(line[i], self.plotlist)
+                        cur = self.plotlist[curvidx]
+
+                        c = pydvpy.makecurve(x=range(len(cur.y) - 1),
+                                             y=cur.y[1:] - cur.y[:-1],
+                                             name=f"{cur.name} Delta Y",  # we name the curve with the input 'line'
+                                             plotname=self.getcurvename())  # get the next available data ID label
+                        self.addtoplot(c)
+
+                    except pdvutil.CurveIndexError:
+                        pass
+            except:
+                if self.debug:
+                    traceback.print_exc(file=sys.stdout)
+            finally:
+                self.redraw = True
+
+    def help_deltay(self):
+        print('\n   Create new curve that calculates difference between its own Y points. Delta Y vs # of points - 1.'
+              '\n   usage: deltay <curve-list>\n')
+
     def do_getattributes(self, line):
         """
         Return a curve's attributes
@@ -4495,11 +4582,8 @@ class Command(cmd.Cmd, object):
                   ('densely_dashdotdotted', '(0, (3, 1, 1, 1, 1, 1))')]
 
         for i, filename in enumerate(groups):
-            if i < 14:
-                curves_ = " ".join(groups[filename])
-                self.do_lnstyle(curves_ + ' ' + styles[i][0].replace("'", ""))
-            else:
-                print('There are only fourteen linestyles available. Please reduce the number of files.')
+            curves_ = " ".join(groups[filename])
+            self.do_lnstyle(curves_ + ' ' + styles[i % len(styles)][0].replace("'", ""))
 
         # Setting Colors at the curve level
         curve_names = []
@@ -4520,11 +4604,8 @@ class Command(cmd.Cmd, object):
         colors = plt.rcParams['axes.prop_cycle'].by_key()['color']
 
         for i, curve_name in enumerate(groups):
-            if i < 10:
-                curves_ = " ".join(groups[curve_name])
-                self.do_color(curves_ + ' ' + colors[i].replace("'", ""))
-            else:
-                print('There are only ten colors available. Please reduce the number of same name curves.')
+            curves_ = " ".join(groups[curve_name])
+            self.do_color(curves_ + ' ' + colors[i % len(colors)].replace("'", ""))
 
         for cur in self.plotlist:
             path = os.path.normpath(cur.filename)
@@ -4540,10 +4621,10 @@ class Command(cmd.Cmd, object):
         if len(curve_names) == 1 and title_update:
             self.do_title(f"{curve_names[0].strip()}")
 
-        if not self.group:
+        if not self.group or len(files) == 1:
             for i, cur in enumerate(self.plotlist):
                 self.do_label(f"{cur.plotname} {cur._original_name}")
-                temp_color = colors[i].replace("'", "")
+                temp_color = colors[i % len(colors)].replace("'", "")
                 self.do_color(f"{cur.plotname} {temp_color}")
                 self.do_lnstyle(f"{cur.plotname} solid")
             self.slashes = 100
@@ -6679,14 +6760,16 @@ class Command(cmd.Cmd, object):
         """
 
         try:
-            if len(line.split(':')) > 1:
+            if len(line.split(':')) > 1 and not self.do_label_done:
+                self.do_label_done = True
                 self.do_label(pdvutil.getletterargs(line))
                 return 0
             else:
-                line_labels = line.split('#')[1:]  # First entry will be curves
+                self.do_label_done = False
+                line_labels = line.split('`')[1:]  # First entry will be curves
 
                 if line_labels:  # Multiple curves and labels
-                    curves = line.split('#')[0].split()
+                    curves = line.split('`')[0].split()
                 else:  # single curve and label
                     curves = line.split()[0]
                     line_labels = [' '.join(line.split()[1:])]
@@ -6698,16 +6781,17 @@ class Command(cmd.Cmd, object):
 
                 self.plotedit = True
         except:
+            self.do_label_done = False
             print('error - usage: label <curve> <new-label>\n')
-            print('For multiple curves, each label must start with #')
-            print('label a:c #mynewlabel #my other label #my thirdlabel')
+            print('For multiple curves, each label must start with `')
+            print('label a:c `mynewlabel `my other label `my thirdlabel')
             if self.debug:
                 traceback.print_exc(file=sys.stdout)
 
     def help_label(self):
         print('\n   Procedure: Change the key and list label for a curve\n   Usage: label <curve> <new-label>\n')
-        print('   For multiple curves, each label must start with #')
-        print('   label a:c #mynewlabel #my other label #my thirdlabel')
+        print('   For multiple curves, each label must start with `')
+        print('   label a:c `mynewlabel `my other label `my thirdlabel')
 
     def do_labelrecordids(self, line):
         """

{llnl_pydv-3.6.1 → llnl_pydv-3.6.3}/pydv/pdvutil.py

@@ -60,6 +60,7 @@
 # endorsement purposes.
 
 import numpy as np
+import re
 
 
 class CurveIndexError(ValueError):
@@ -203,11 +204,16 @@ def getnumberargs(line, filelist):
                     arglist += nolist + ' '
             start = line[i].split()[-1]
             end = line[i + 1].split()[0]
-            # File notation e.g. a.1:a.10
+            # File notation e.g. a.1:a.10 and @#.
             filedex = None
             filestart = 0
             if (len(start.split('.')) > 1):
-                filedex = ord(start[0].upper()) - ord('A')
+
+                if ord('A') <= ord(start[0].upper()) <= ord('Z'):
+                    filedex = ord(start[0].upper()) - ord('A')
+                else:
+                    filedex = int(start.split(".")[0].replace("@", "")) - 1  # 0 index
+
                 start = start.split('.')[-1]
                 if (filedex != 0):
                     for f in range(filedex):
@@ -216,7 +222,12 @@ def getnumberargs(line, filelist):
                 filestart += 1
             fileend = 0
             if (len(end.split('.')) > 1):
-                filedex = ord(end[0].upper()) - ord('A')
+
+                if ord('A') <= ord(end[0].upper()) <= ord('Z'):
+                    filedex = ord(end[0].upper()) - ord('A')
+                else:
+                    filedex = int(end.split(".")[0].replace("@", "")) - 1  # 0 index
+
                 end = end.split('.')[-1]
                 if (filedex != 0):
                     for f in range(filedex):
@@ -231,45 +242,49 @@ def getnumberargs(line, filelist):
                 step = 1
                 if filedex is not None:
                     if int(start) > fileend and int(end) > fileend:
-                        print(f"File {filelist[filedex]}: Start {filestart}, End {fileend}")
+                        print(f"File {filedex + 1}: {filelist[filedex]}: Start {filestart}, End {fileend}")
                         print(f"\tRequested Start {start}, End {end}")
                         print(f'\tStart {start} and End {end} is greater than file end {fileend}')
                         print("\tThis range will not be plotted")
                         ignore = True
                     elif int(start) > fileend:
-                        print(f"File {filelist[filedex]}: Start {filestart}, End {fileend}")
+                        print(f"File {filedex + 1}: {filelist[filedex]}: Start {filestart}, End {fileend}")
                         print(f"\tRequested Start {start}, End {end}")
                         print(f'\tStart {start} is greater than file end {fileend}')
                         start = str(fileend)
                         print(f'\tSetting Start to {start}')
+                        print(f'\tNew Start {start} and New End {end}')
                     elif int(end) > fileend:
-                        print(f"File {filelist[filedex]}: Start {filestart}, End {fileend}")
+                        print(f"File {filedex + 1}: {filelist[filedex]}: Start {filestart}, End {fileend}")
                         print(f"\tRequested Start {start}, End {end}")
                         print(f'\tEnd {end} is greater than file end {fileend}')
                         end = str(fileend)
                         print(f'\tSetting End to {end}')
+                        print(f'\tNew Start {start} and New End {end}')
                     delta = int(end) - int(start)
             else:
                 step = -1
                 if filedex is not None:
                     if int(end) > fileend and int(start) > fileend:
-                        print(f"File {filelist[filedex]}: Start {filestart}, End {fileend}")
+                        print(f"File {filedex + 1}: {filelist[filedex]}: Start {filestart}, End {fileend}")
                         print(f"\tRequested Start {end}, End {start}")
                         print(f'\tStart {end} and End {start} is greater than file end {fileend}')
                         print("\tThis range will not be plotted")
                         ignore = True
                     elif int(end) > fileend:
-                        print(f"File {filelist[filedex]}: Start {filestart}, End {fileend}")
+                        print(f"File {filedex + 1}: {filelist[filedex]}: Start {filestart}, End {fileend}")
                         print(f"\tRequested Start {end}, End {start}")
                         print(f'\tStart {end} is greater than file end {fileend}')
                         end = str(fileend)
                         print(f'\tSetting Start to {end}')
+                        print(f'\tNew Start {end} and New End {start}')
                     elif int(start) > fileend:
-                        print(f"File {filelist[filedex]}: Start {filestart}, End {fileend}")
+                        print(f"File {filedex + 1}: {filelist[filedex]}: Start {filestart}, End {fileend}")
                         print(f"\tRequested Start {end}, End {start}")
                         print(f'\tEnd {start} is greater than file end {fileend}')
                         start = str(fileend)
                         print(f'\tSetting End to {start}')
+                        print(f'\tNew Start {end} and New End {start}')
                     delta = int(end) - int(start)
             for j in range(int(start), int(start) + delta + step, step):
                 args += str(j) + ' '
@@ -288,7 +303,16 @@ def getletterargs(line):
     Get a full list of arguments from compact list or mixed notation (ex a:d)
     """
 
-    line = line.split(':')  # begin arduous list parsing
+    if "`" in line:  # list of multiple label names from do_label()
+        label_line = line.split("`", 1)
+        temp_line = label_line[0].split(':')
+        temp_line[-1] = temp_line[-1] + "`" + label_line[1]
+        line = temp_line
+    elif len(re.split(r"(\b[a-zA-Z]:[a-zA-Z]\b)|(\b[a-zA-Z]:@\d+\b)|(\b@\d+:@\d+\b)", line)) == 1:  # single label w/ :
+        return line
+    else:
+        line = line.split(':')  # begin arduous list parsing
+
     arglist = ''
     if len(line) > 1:
         for i in range(len(line)):

{llnl_pydv-3.6.1 → llnl_pydv-3.6.3}/pydv/pydvpy.py

@@ -646,22 +646,10 @@ def read(fname, gnu=False, xcol=0, verbose=False, pattern=None, matches=None):
         with open(fname, 'r') as f:
             for line in f:
                 labels = False
-                split_line = re.split(r'[ \t]+', str.strip(line))
-
-                # No space between curvename and hashtag #mycurve
-                try:  # Exponential numbers and single text will cause issues
-                    if re.search('[a-zA-Z]', split_line[0]):
-                        split_line_2 = re.split(r'#', str.strip(line))
-                        split_line = [None] * 2
-                        split_line[0] = '#'
-                        split_line[1] = split_line_2[1]
-                except:
-                    split_line = re.split(r'[ \t]+', str.strip(line))
 
                 # Check for labels
-                split_line_3 = re.split(r'#', str.strip(line))
-                for split in split_line_3:
-
+                split_line_label = re.split(r'#', str.strip(line))
+                for split in split_line_label:
                     if re.search('[a-zA-Z]', split):
                         if 'xlabel' in split:
                             xlabel = split.replace('xlabel', '').strip()
@@ -674,11 +662,18 @@ def read(fname, gnu=False, xcol=0, verbose=False, pattern=None, matches=None):
                 if labels:
                     split_line = [None] * 2
                     split_line[0] = '#'
-                    split_line[1] = split_line_3[1].strip()
+                    split_line[1] = line.split("# xlabel")[0].split("# ylabel")[0].split("#xlabel")[0].split("#ylabel")[0][1:].strip()  # noqae501
                     xlabels[split_line[1]] = xlabel
                     ylabels[split_line[1]] = ylabel
                     xlabel = ''
                     ylabel = ''
+                else:  # might be numerical or text
+                    if "#" in line:  # text
+                        split_line = [None] * 2
+                        split_line[0] = '#'
+                        split_line[1] = line[1:].strip()
+                    else:  # numerical
+                        split_line = re.split(r'[ \t]+', str.strip(line))
 
                 if not split_line or not split_line[0]:
                     continue
@@ -4714,14 +4709,14 @@ def overlap_interp(cr1, cr2, npts_interp=0):
     return cr1_interp, cr2_interp
 
 
-def AvgDiff(cr1, cr2, npts=100, tol=1e-6):
+def AvgDiff(cr1, cr2, npts=0, tol=1e80):
     """
     Calculate the difference between the overlapping interpolated curves.
 
     >>> curves = pydvpy.read('testData.txt')
 
     >>> cr1_interp, cr2_interp, differences, avgDiff, maxDiff, failed_curve, failed = pydvpy.AvgDiff(curves[0],
-            curves[1], npts=100, tol=1e-6)
+            curves[1], npts=0, tol=1e80)
 
     :param cr1: The first curve
     :type cr1: Curve
@@ -4763,14 +4758,14 @@ def AvgDiff(cr1, cr2, npts=100, tol=1e-6):
     return cr1_interp, cr2_interp, differences, avgDiff, maxDiff, failed_curve, failed
 
 
-def AbsDiff(cr1, cr2, npts=100, tol=1e-6):
+def AbsDiff(cr1, cr2, npts=0, tol=1e80):
     """
     Calculate the absolute difference between the overlapping interpolated curves.
 
     >>> curves = pydvpy.read('testData.txt')
 
     >>> cr1_interp, cr2_interp, differences, avgDiff, maxDiff, failed_curve, failed = pydvpy.AbsDiff(curves[0],
-            curves[1], npts=100, tol=1e-6)
+            curves[1], npts=0, tol=1e80)
 
     :param cr1: The first curve
     :type cr1: Curve
@@ -4813,14 +4808,14 @@ def AbsDiff(cr1, cr2, npts=100, tol=1e-6):
     return cr1_interp, cr2_interp, differences, avgDiff, maxDiff, failed_curve, failed
 
 
-def RelDiff(cr1, cr2, npts=100, tol=1e-6):
+def RelDiff(cr1, cr2, npts=0, tol=1e80):
     """
     Calculate the relative difference between the overlapping interpolated curves.
 
     >>> curves = pydvpy.read('testData.txt')
 
     >>> cr1_interp, cr2_interp, differences, avgDiff, maxDiff, failed_curve, failed = pydvpy.RelDiff(curves[0],
-            curves[1], npts=100, tol=1e-6)
+            curves[1], npts=0, tol=1e80)
 
     :param cr1: The first curve
     :type cr1: Curve
@@ -4882,9 +4877,9 @@ def RelDiff(cr1, cr2, npts=100, tol=1e-6):
     return cr1_interp, cr2_interp, differences, avgDiff, maxDiff, failed_curve, failed
 
 
-def AbsAndRelDiff(cr1, cr2, npts=100, tol=1e-6):
+def AbsAndRelDiff(cr1, cr2, npts=0, abs_tol=1e80, rel_tol=1e80):
     """
-    Calculate the relative and absolute difference between the overlapping interpolated curves.
+    Calculate the absolute and relative difference between the overlapping interpolated curves.
     Returns the updated AND statement for `failed` along with curves from AbsDiff and RelDiff
 
     >>> curves = pydvpy.read('testData.txt')
@@ -4892,7 +4887,7 @@ def AbsAndRelDiff(cr1, cr2, npts=100, tol=1e-6):
     >>> (cr1_interp, cr2_interp,
          differences_Abs, avgDiff_Abs, maxDiff_Abs, failed_curve_Abs, failed_Abs
          differences_Rel, avgDiff_Rel, maxDiff_Rel, failed_curve_Rel, failed_Rel
-         failed_AND) = pydvpy.AbsAndRelDiff(curves[0], curves[1], npts=100, tol=1e-6)
+         failed_AND) = pydvpy.AbsAndRelDiff(curves[0], curves[1], npts=0, abs_tol=1e80, rel_tol=1e80)
 
     :param cr1: The first curve
     :type cr1: Curve
@@ -4900,8 +4895,10 @@ def AbsAndRelDiff(cr1, cr2, npts=100, tol=1e-6):
     :type cr2: Curve
     :param npts: The number of points in the interpolation
     :type npts: int
-    :param tol: The tolerance for failure
-    :type tol: float
+    :param abs_tol: The tolerance for absolute difference failure
+    :type abs_tol: float
+    :param rel_tol: The tolerance for relative difference failure
+    :type rel_tol: float
     :returns:
         - cr1_interp (:py:class:`Curve`) - The first overlapping interpolated curve
         - cr2_interp (:py:class:`Curve`) - The second overlapping interpolated curve
@@ -4921,12 +4918,12 @@ def AbsAndRelDiff(cr1, cr2, npts=100, tol=1e-6):
     (cr1_interp, cr2_interp,
      differences_Abs, avgDiff_Abs,
      maxDiff_Abs, failed_curve_Abs,
-     failed_Abs) = AbsDiff(cr1, cr2, npts, tol)
+     failed_Abs) = AbsDiff(cr1, cr2, npts, abs_tol)
 
     (cr1_interp, cr2_interp,
      differences_Rel, avgDiff_Rel,
      maxDiff_Rel, failed_curve_Rel,
-     failed_Rel) = RelDiff(cr1, cr2, npts, tol)
+     failed_Rel) = RelDiff(cr1, cr2, npts, rel_tol)
 
     if failed_Abs and failed_Rel:
         failed_AND = True
@@ -4939,9 +4936,9 @@ def AbsAndRelDiff(cr1, cr2, npts=100, tol=1e-6):
             failed_AND)
 
 
-def AbsOrRelDiff(cr1, cr2, npts=100, tol=1e-6):
+def AbsOrRelDiff(cr1, cr2, npts=0, abs_tol=1e80, rel_tol=1e80):
     """
-    Calculate the relative and absolute difference between the overlapping interpolated curves.
+    Calculate the absolute and relative difference between the overlapping interpolated curves.
     Returns the updated OR statement for `failed` along with curves from AbsDiff and RelDiff
 
     >>> curves = pydvpy.read('testData.txt')
@@ -4949,7 +4946,7 @@ def AbsOrRelDiff(cr1, cr2, npts=100, tol=1e-6):
     >>> (cr1_interp, cr2_interp,
          differences_Abs, avgDiff_Abs, maxDiff_Abs, failed_curve_Abs, failed_Abs
          differences_Rel, avgDiff_Rel, maxDiff_Rel, failed_curve_Rel, failed_Rel
-         failed_OR) = pydvpy.AbsOrRelDiff(curves[0], curves[1], npts=100, tol=1e-6)
+         failed_OR) = pydvpy.AbsOrRelDiff(curves[0], curves[1], npts=0, abs_tol=1e80, rel_tol=1e80)
 
     :param cr1: The first curve
     :type cr1: Curve
@@ -4957,8 +4954,10 @@ def AbsOrRelDiff(cr1, cr2, npts=100, tol=1e-6):
     :type cr2: Curve
     :param npts: The number of points in the interpolation
     :type npts: int
-    :param tol: The tolerance for failure
-    :type tol: float
+    :param abs_tol: The tolerance for absolute difference failure
+    :type abs_tol: float
+    :param rel_tol: The tolerance for relative difference failure
+    :type rel_tol: float
     :returns:
         - cr1_interp (:py:class:`Curve`) - The first overlapping interpolated curve
         - cr2_interp (:py:class:`Curve`) - The second overlapping interpolated curve
@@ -4978,12 +4977,12 @@ def AbsOrRelDiff(cr1, cr2, npts=100, tol=1e-6):
     (cr1_interp, cr2_interp,
      differences_Abs, avgDiff_Abs,
      maxDiff_Abs, failed_curve_Abs,
-     failed_Abs) = AbsDiff(cr1, cr2, npts, tol)
+     failed_Abs) = AbsDiff(cr1, cr2, npts, abs_tol)
 
     (cr1_interp, cr2_interp,
      differences_Rel, avgDiff_Rel,
      maxDiff_Rel, failed_curve_Rel,
-     failed_Rel) = RelDiff(cr1, cr2, npts, tol)
+     failed_Rel) = RelDiff(cr1, cr2, npts, rel_tol)
 
     if failed_Abs or failed_Rel:
         failed_OR = True
@@ -5386,7 +5385,7 @@ def MedianFilter(c, npts):
                      name=f"{c.name} MedianFilter npts={npts}")
 
 
-def TimeShift(cbase, cset, tol=1e-6, pairID=0, version=0):
+def TimeShift(cbase, cset, tol=1e80, pairID=0, version=0):
     """
     This filter will take a curve and return a time shifted curve.
     It uses the slope of the baseline curve to find the time offset
@@ -5399,7 +5398,7 @@ def TimeShift(cbase, cset, tol=1e-6, pairID=0, version=0):
 
      >>> curves = pydvpy.read('testData.txt')
 
-     >>> new_curve = pydvpy.TimeShift(curves[0], curves[1], tol=1e-6, pairID=0, version=0)
+     >>> new_curve = pydvpy.TimeShift(curves[0], curves[1], tol=1e80, pairID=0, version=0)
 
     :param cbase: The base Curve
     :type cbase: Curve
@@ -5468,3 +5467,32 @@ def TimeShift(cbase, cset, tol=1e-6, pairID=0, version=0):
     return makecurve(x=xshifted,
                      y=yset,
                      name=f"{cset.name} pairID={pairID} version={version}")
+
+
+def getfl(curvelist):
+    """
+    Returns the first and last data point from the yData array
+
+     >>> curves = pydvpy.read('testData.txt')
+
+     >>> first_last = pydvpy.getfl(curves) OR
+
+     >>> first_last = pydvpy.getfl(curves[0])
+
+    :param curvelist: The Curve or list of Curves
+    :type curvelist: Curve or list
+    :return: list -- A list of y values at the first and last index
+    """
+    first_last = list()
+
+    curves = list()
+
+    if isinstance(curvelist, list):
+        curves.extend(curvelist)
+    else:
+        curves.append(curvelist)
+
+    for cur in curves:
+        first_last.append([cur.y[0], cur.y[-1]])
+
+    return first_last

llnl_pydv-3.6.3/pydv/scripts/date.txt

@@ -0,0 +1 @@
+04.14.2025

llnl_pydv-3.6.3/pydv/scripts/version.txt

@@ -0,0 +1 @@
+3.6.3

{llnl_pydv-3.6.1 → llnl_pydv-3.6.3}/pyproject.toml

@@ -1,7 +1,7 @@
 [tool]
 [tool.poetry]
 name = "LLNL-PyDV"
-version = "3.6.1"
+version = "3.6.3"
 description = "PyDV: Python Data Visualizer"
 license = "BSD"
 classifiers = [
@@ -65,7 +65,7 @@ build-backend = "poetry.core.masonry.api"
 line-length = 79
 
 [tool.bumpver]
-current_version = "3.6.1"
+current_version = "3.6.3"
 version_pattern = "MAJOR.MINOR.PATCH"
 commit_message = "bump version {old_version} -> {new_version}"
 commit = true

llnl_pydv-3.6.1/pydv/scripts/date.txt

@@ -1 +0,0 @@
-02.19.2025

llnl_pydv-3.6.1/pydv/scripts/version.txt

@@ -1 +0,0 @@
-3.6.1