diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 9fed7d3..13a3886 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -18,7 +18,7 @@ jobs:
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token
with:
- tag_name: pydv-3.0.6
- release_name: PyDV 3.0.6
+ tag_name: pydv-3.0.7
+ release_name: PyDV 3.0.7
draft: false
prerelease: false
diff --git a/LICENSE b/LICENSE
index 15e5c97..95ac82c 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,7 +1,7 @@
Copyright (c) 2011-2020, Lawrence Livermore National Security, LLC.
Produced at the Lawrence Livermore National Laboratory
-Written by Mason Kwiat, Douglas S. Miller, and Kevin Griffin
-e-mail: griffin28@llnl.gov
+Written by Mason Kwiat, Douglas S. Miller, and Kevin Griffin, Edward Rusu
+e-mail: rusu1@llnl.gov
LLNL-CODE-507071
All rights reserved.
diff --git a/pydv/curve.py b/pydv/curve.py
index 43afdc4..54fa4dc 100644
--- a/pydv/curve.py
+++ b/pydv/curve.py
@@ -1,7 +1,7 @@
# Copyright (c) 2011-2020, Lawrence Livermore National Security, LLC.
# Produced at the Lawrence Livermore National Laboratory
-# Written by Mason Kwiat, Douglas S. Miller, and Kevin Griffin
-# e-mail: griffin28@llnl.gov
+# Written by Mason Kwiat, Douglas S. Miller, and Kevin Griffin, Edward Rusu
+# e-mail: rusu1@llnl.gov
# LLNL-CODE-507071
# All rights reserved.
diff --git a/pydv/docs/conf.py b/pydv/docs/conf.py
index a50137e..1d52e19 100644
--- a/pydv/docs/conf.py
+++ b/pydv/docs/conf.py
@@ -20,7 +20,6 @@
# add these directories to sys.path here. If the directory is relative to the
# documentation root, use os.path.abspath to make it absolute, like shown here.
sys.path.insert(0, os.path.abspath('..'))
-#sys.path.insert(1, '/Users/griffin28/Documents/WCI/ASQ/PDV/pydv3')
# -- General configuration ------------------------------------------------
@@ -51,8 +50,8 @@
# General information about the project.
project = u'PyDV'
-copyright = u'2015-2020, Kevin Griffin, Mason Kwiat, Douglas Miller, Rachael Brooks'
-author = u'Kevin Griffin, Mason Kwiat, Douglas Miller, Rachael Brooks'
+copyright = u'2015-2020, Edward Rusu, Kevin Griffin, Mason Kwiat, Douglas Miller, Rachael Brooks'
+author = u'Edward Rusu, Kevin Griffin, Mason Kwiat, Douglas Miller, Rachael Brooks'
# The version info for the project you're documenting, acts as replacement for
# |version| and |release|, also used in various other places throughout the
@@ -61,7 +60,7 @@
# The short X.Y version.
version = u'3.0'
# The full version, including alpha/beta/rc tags.
-release = u'3.0.6'
+release = u'3.0.7'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
@@ -229,7 +228,7 @@
# author, documentclass [howto, manual, or own class]).
latex_documents = [
(master_doc, 'PyDV.tex', u'PyDV Documentation',
- u'Kevin Griffin, Mason Kwiat, Douglas Miller, Rachael Brooks', 'manual'),
+ u'Edward Rusu, Kevin Griffin, Mason Kwiat, Douglas Miller, Rachael Brooks', 'manual'),
]
# The name of an image file (relative to this directory) to place at the top of
diff --git a/pydv/docs/release_notes.rst b/pydv/docs/release_notes.rst
index 9620acb..fb81bfb 100644
--- a/pydv/docs/release_notes.rst
+++ b/pydv/docs/release_notes.rst
@@ -3,6 +3,12 @@
Release Notes
=============
+3.0.7
+-----
+* Fixed a bug in PyDV internal when using min and max over a range.
+
+
+
3.0.6
-----
* Fixed functions that did not work with curve lists, which were: dupx, del,
diff --git a/pydv/pdv.py b/pydv/pdv.py
index d0b3b65..b89e502 100644
--- a/pydv/pdv.py
+++ b/pydv/pdv.py
@@ -1,7 +1,7 @@
# Copyright (c) 2011-2020, Lawrence Livermore National Security, LLC.
# Produced at the Lawrence Livermore National Laboratory
-# Written by Mason Kwiat, Douglas S. Miller, and Kevin Griffin
-# e-mail: griffin28@llnl.gov
+# Written by Mason Kwiat, Douglas S. Miller, and Kevin Griffin, Edward Rusu
+# e-mail: rusu1@llnl.gov
# LLNL-CODE-507071
# All rights reserved.
@@ -6678,7 +6678,7 @@ def tickFormat(self, axis, logscale, ticks, tickformat):
def console_run(self):
while True:
- self.cmdloop('\n\tPython Data Visualizer 3.0.6 - 12.01.2021\n\tType "help" for more information.\n\n')
+ self.cmdloop('\n\tPython Data Visualizer 3.0.7 - 04.19.2022\n\tType "help" for more information.\n\n')
print('\n Starting Python Console...\n Ctrl-D to return to PyDV\n')
console = code.InteractiveConsole(locals())
console.interact()
diff --git a/pydv/pdvnavbar.py b/pydv/pdvnavbar.py
index c669aeb..04c71fd 100644
--- a/pydv/pdvnavbar.py
+++ b/pydv/pdvnavbar.py
@@ -1,7 +1,7 @@
# Copyright (c) 2011-2020, Lawrence Livermore National Security, LLC.
# Produced at the Lawrence Livermore National Laboratory
-# Written by Mason Kwiat, Douglas S. Miller, and Kevin Griffin
-# e-mail: griffin28@llnl.gov
+# Written by Mason Kwiat, Douglas S. Miller, and Kevin Griffin, Edward Rusu
+# e-mail: rusu1@llnl.gov
# LLNL-CODE-507071
# All rights reserved.
diff --git a/pydv/pdvplot.py b/pydv/pdvplot.py
index 4ed47a9..1fdb774 100644
--- a/pydv/pdvplot.py
+++ b/pydv/pdvplot.py
@@ -1,7 +1,7 @@
# Copyright (c) 2011-2020, Lawrence Livermore National Security, LLC.
# Produced at the Lawrence Livermore National Laboratory
-# Written by Mason Kwiat, Douglas S. Miller, and Kevin Griffin
-# e-mail: griffin28@llnl.gov
+# Written by Mason Kwiat, Douglas S. Miller, and Kevin Griffin, Edward Rusu
+# e-mail: rusu1@llnl.gov
# LLNL-CODE-507071
# All rights reserved.
@@ -114,7 +114,7 @@ def __init__(self, pydvcmd):
here = path.abspath(path.dirname(__file__))
# Setup Application
- self.setWindowTitle('Python Data Visualizer 3.0.6')
+ self.setWindowTitle('Python Data Visualizer 3.0.7')
self.setWindowIcon(QIcon(path.join(here, 'img/app_icon3.png')))
self._pydvcmd = pydvcmd
@@ -431,8 +431,8 @@ def showMenuDialog(self):
def __viewCopyright(self):
msg = self.tr('Copyright © 2011-2020, Lawrence Livermore National Security, LLC. \
Produced at the Lawrence Livermore National Laboratory
\
- Written by Kevin Griffin, Mason Kwiat, and Douglas S. Miller
\
- e-mail: griffin28@llnl.gov or dougmiller@llnl.gov
\
+ Written by Edward Rusu, Kevin Griffin, Mason Kwiat, and Douglas S. Miller
\
+ e-mail: rusu1@llnl.gov
\
LLNL-CODE-507071
\
All rights reserved.
\
This file is part of PyDV. For details, see About PyDV'
- 'version 3.0.6
'
+ 'version 3.0.7
'
'PyDV is a 1D graphics tool, heavily based on the ULTRA plotting tool.
'
'Copyright © 2011-2020, Lawrence Livermore National Security, LLC.
'
- 'Written by: Kevin Griffi, Mason Kwiat, and Douglas S. Miller
'
- 'email: griffin28@llnl.gov
'
+ 'Written by: Edward Rusu, Kevin Griffin, Mason Kwiat, and Douglas S. Miller
'
+ 'email: rusu1@llnl.gov
'
'LLNL-CODE-507071, All rights reserved.
'))
diff --git a/pydv/pdvutil.py b/pydv/pdvutil.py
index b8ddcf2..d61678d 100644
--- a/pydv/pdvutil.py
+++ b/pydv/pdvutil.py
@@ -1,7 +1,7 @@
# Copyright (c) 2011-2020, Lawrence Livermore National Security, LLC.
# Produced at the Lawrence Livermore National Laboratory
-# Written by Mason Kwiat, Douglas S. Miller, and Kevin Griffin
-# e-mail: griffin28@llnl.gov
+# Written by Mason Kwiat, Douglas S. Miller, and Kevin Griffin, Edward Rusu
+# e-mail: rusu1@llnl.gov
# LLNL-CODE-507071
# All rights reserved.
diff --git a/pydv/pydvpy.py b/pydv/pydvpy.py
index 18e16be..c36ac0f 100644
--- a/pydv/pydvpy.py
+++ b/pydv/pydvpy.py
@@ -1,7 +1,7 @@
# Copyright (c) 2011-2020, Lawrence Livermore National Security, LLC.
# Produced at the Lawrence Livermore National Laboratory
-# Written by Mason Kwiat, Douglas S. Miller, and Kevin Griffin
-# e-mail: griffin28@llnl.gov
+# Written by Mason Kwiat, Douglas S. Miller, and Kevin Griffin, Edward Rusu
+# e-mail: rusu1@llnl.gov
# LLNL-CODE-507071
# All rights reserved.
@@ -64,7 +64,7 @@
A python interface for PyDV functionality.
.. module: pydvpy
-.. moduleauthor:: Kevin Griffin
+.. moduleauthor:: Edward Rusu
>>> import pydvpy as pydvif
"""
@@ -3923,10 +3923,10 @@ def __complex_times(ra, ia, rb, ib):
return sa, sb
-def __get_sub_range(x, low=None, high=None):
+def __get_sub_range(x, low, high):
"""
- Returns a tuple with the index of the first x value greater than low and the index of
- the first x value less than high.
+ Returns a tuple with the index of the first value in x greater than low and
+ the index of the first value in x less than high.
:param x: The array of x-values
:type x: array
@@ -3934,31 +3934,14 @@ def __get_sub_range(x, low=None, high=None):
:type low: float
:param high: The upper definite integral interval value
:type high: float
- :return: tuple -- a tuple with the indices of the first value in x that is greater than low and the first value in
- x less than high
+ :return: tuple -- a tuple with the indices of the first value in x that is
+ greater than low and the first value in x less than high.
+ If low or high is not specified, the corresponding return
+ will be None.
"""
- if low is not None:
- min_idx = np.where(x >= low)[0][0]
-
- if high is not None:
- max_idx = np.where(x <= high)[0][-1]
-
+ min_idx = np.where(x >= low)[0][0] if low is not None else None
+ max_idx = np.where(x <= high)[0][-1] if high is not None else None
return min_idx, max_idx
- # min_idx = len(x) - 1
- # min = x[-1]
- # max_idx = 0
- # max = x[0]
- #
- # for i in range(0, len(x)):
- # if min > x[i] >= low:
- # min = x[i]
- # min_idx = i
- #
- # if high >= x[i] > max:
- # max = x[i]
- # max_idx = i
- #
- # return min_idx, max_idx
def __toCurveString(c):
diff --git a/pydv/scripts/date.txt b/pydv/scripts/date.txt
index 93543bc..6ea5148 100644
--- a/pydv/scripts/date.txt
+++ b/pydv/scripts/date.txt
@@ -1 +1 @@
-12.01.2021
\ No newline at end of file
+04.19.2022
\ No newline at end of file
diff --git a/pydv/scripts/version.txt b/pydv/scripts/version.txt
index 8ffc1ad..3a8b971 100644
--- a/pydv/scripts/version.txt
+++ b/pydv/scripts/version.txt
@@ -1 +1 @@
-3.0.6
\ No newline at end of file
+3.0.7
\ No newline at end of file
diff --git a/setup.py b/setup.py
index 0ec91b6..c032eea 100644
--- a/setup.py
+++ b/setup.py
@@ -13,11 +13,11 @@
setup(
name='PyDV',
- version='3.0.6',
+ version='3.0.7',
description='PyDV: Python Data Visualizer',
long_description=long_description,
- author='Kevin Griffin',
- author_email='griffin28@llnl.gov',
+ author='Edward Rusu',
+ author_email='rusu1@llnl.gov',
license='BSD',
url='https://github.com/LLNL/PyDV',
packages=find_packages(),