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

{llnl_pydv-3.6.3 → llnl_pydv-3.8.0}/LICENSE

@@ -1,7 +1,7 @@
-Copyright (c) 2011-2024, Lawrence Livermore National Security, LLC.
-Produced at the Lawrence Livermore National Laboratory  
-Written by Mason Kwiat, Douglas S. Miller, and Kevin Griffin, Ephraim Rusu, Sarah El-Jurf, Jorge Moreno
-e-mail: eljurf11@llnl.gov, moreno45@llnl.gov
+Copyright (c) 2011-2025, Lawrence Livermore National Security, LLC.
+Produced at the Lawrence Livermore National Laboratory
+Written by Mason Kwiat, Douglas S. Miller, Kevin Griffin, Ephraim Rusu, Rachael Brooks, Sarah El-Jurf, Jorge Moreno
+e-mail: moreno45@llnl.gov
 LLNL-CODE-507071
 All rights reserved.  
   

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

@@ -1,13 +1,14 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: LLNL-PyDV
-Version: 3.6.3
+Version: 3.8.0
 Summary: PyDV: Python Data Visualizer
 License: BSD
-Author: Sarah El-Jurf
-Author-email: eljurf1@llnl.gov
-Maintainer: Sarah El-Jurf
-Maintainer-email: eljurf1@llnl.gov
-Requires-Python: >=3.6
+License-File: LICENSE
+Author: Jorge Moreno
+Author-email: moreno45@llnl.gov
+Maintainer: Jorge Moreno
+Maintainer-email: moreno45@llnl.gov
+Requires-Python: >=3.9
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers
 Classifier: Intended Audience :: End Users/Desktop
@@ -16,20 +17,18 @@ Classifier: License :: OSI Approved :: BSD License
 Classifier: License :: Other/Proprietary License
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.6
-Classifier: Programming Language :: Python :: 3.7
-Classifier: Programming Language :: Python :: 3.8
 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: Programming Language :: Python :: 3.14
 Classifier: Topic :: Scientific/Engineering
 Classifier: Topic :: Scientific/Engineering :: Mathematics
-Requires-Dist: PyQt5
-Requires-Dist: PySide2
+Requires-Dist: PyQt6
 Requires-Dist: matplotlib
 Requires-Dist: numpy
+Requires-Dist: scikit-image
 Requires-Dist: scikit-learn
 Requires-Dist: scipy
 Project-URL: Bug Tracker, https://github.com/LLNL/PyDV/issues

{llnl_pydv-3.6.3 → llnl_pydv-3.8.0}/pydv/curve.py

@@ -1,7 +1,6 @@
-# Copyright (c) 2011-2024, Lawrence Livermore National Security, LLC.
-# Produced at the Lawrence Livermore National Laboratory
-# Written by Mason Kwiat, Douglas S. Miller, and Kevin Griffin, Ephraim Rusu
-# e-mail: rusu1@llnl.gov
+# Copyright (c) Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+# See top-level LICENSE AND COPYRIGHT files for dates and other details.
 # LLNL-CODE-507071
 # All rights reserved.
 
@@ -76,6 +75,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 +109,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 +257,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,
@@ -286,8 +291,10 @@ class Curve(object):
         """
 
         c = self.copy()
-
-        area0 = integrate.simpson(c.y, c.x)
+        try:
+            area0 = integrate.simpson(c.y, c.x)
+        except:
+            area0 = np.trapz(c.y, c.x)
         c.y /= float(area0)
         c.name = "Normalized %s" % self.plotname
         return c

llnl_pydv-3.8.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