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

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

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

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

@@ -76,6 +76,8 @@ class Curve(object):
                  title='',
                  record_id='',
                  step=False,
+                 step_original_x=np.empty(0),
+                 step_original_y=np.empty(0),
                  xticks_labels=None,
                  plotname='',
                  color='',
@@ -108,6 +110,8 @@ class Curve(object):
         self.title = title
         self.record_id = record_id
         self.step = step
+        self.step_original_x = step_original_x,
+        self.step_original_y = step_original_y,
         self.xticks_labels = xticks_labels
         self.plotname = plotname
         self.color = color
@@ -254,6 +258,8 @@ class Curve(object):
                   title=self.title,
                   record_id=self.record_id,
                   step=self.step,
+                  step_original_x=self.step_original_x,
+                  step_original_y=self.step_original_y,
                   xticks_labels=self.xticks_labels,
                   plotname=self.plotname,
                   color=self.color,

llnl_pydv-3.7.0/pydv/pdv

@@ -0,0 +1,22 @@
+#!/usr/bin/env bash
+pth=$(realpath $0)
+pth=$(dirname $pth)
+pth="$pth/pdv_launcher.py $*"
+
+if [[ $pth == *"pdv-sa"* ]]; then
+
+    /usr/tce/bin/python3 $pth
+
+else
+
+    FILE="/usr/apps/weave/weave-prod-cpu/bin/activate"
+
+    if [ -e "$FILE" ]; then
+
+        source $FILE
+
+    fi
+
+    python3 $pth
+
+fi

{llnl_pydv-3.6.1 → llnl_pydv-3.7.0}/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
@@ -5815,7 +5896,7 @@ class Command(cmd.Cmd, object):
 
     def do_linemarker(self, line):
         """
-        Set the marker symbol for the curves
+        Set the marker symbol and marker size for the curves
         """
 
         if not line:
@@ -6679,16 +6760,18 @@ 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]
+                    curves = [line.split()[0]]
                     line_labels = [' '.join(line.split()[1:])]
 
                 for i in range(len(curves)):
@@ -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):
         """
@@ -7644,10 +7728,7 @@ class Command(cmd.Cmd, object):
             xmin = 1e-2
             for cur in orderlist:
                 if not cur.hidden:
-                    xdat = numpy.array(cur.x)
-                    for i in range(len(xdat)):
-                        if xdat[i] < 1e-300:
-                            xdat[i] = 1e301
+                    xdat = numpy.where(cur.x < 1e-300, 1e301, cur.x)
                     localmin = min(xdat)
                     if localmin and localmin < xmin:
                         xmin = localmin
@@ -8511,13 +8592,9 @@ class Command(cmd.Cmd, object):
                     xdat = numpy.array(cur.x)
                     ydat = numpy.array(cur.y)
                     if yls:
-                        for i in range(len(ydat)):
-                            if (ydat[i] < 0):
-                                ydat[i] = 1e-301  # custom ydata clipping
+                        ydat = numpy.where(ydat < 0, 1e-301, ydat)  # custom ydata clipping
                     if xls:
-                        for i in range(len(xdat)):
-                            if xdat[i] < 0:
-                                xdat[i] = 1e-301  # custom ydata clipping
+                        xdat = numpy.where(xdat < 0, 1e-301, xdat)  # custom ydata clipping
 
                     if cur.ebar is not None:
                         plt.errorbar(xdat,

llnl_pydv-3.6.1/pydv/pdv → llnl_pydv-3.7.0/pydv/pdv_launcher.py

@@ -1,5 +1,3 @@
-#!/usr/bin/env /usr/apps/weave/weave-prod-cpu/bin/python3
-
 import sys
 import os
 
@@ -14,4 +12,3 @@ try:
 except ImportError:
     import pydv.pdv
     pydv.pdv.Command().main()
-

{llnl_pydv-3.6.1 → llnl_pydv-3.7.0}/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"(^[a-zA-Z]:[a-zA-Z]$)|(^[a-zA-Z]:@\d+$)|(^@\d+:@\d+$)", 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)):