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

{llnl_pydv-3.7.0 → 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.7.0 → llnl_pydv-3.8.0}/PKG-INFO

@@ -1,13 +1,14 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: LLNL-PyDV
-Version: 3.7.0
+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.7.0 → 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.
 
@@ -292,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