From 8d37a446d423c226ba6c59c1568816789b4c81ab Mon Sep 17 00:00:00 2001
From: pcain-usgs <pcain@usgs.gov>
Date: Mon, 1 Feb 2021 09:14:50 -0700
Subject: [PATCH 1/3] Change i/o channel parameter names
---
geomagio/Controller.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/geomagio/Controller.py b/geomagio/Controller.py
index 8dce1fd7..199ab64e 100644
--- a/geomagio/Controller.py
+++ b/geomagio/Controller.py
@@ -203,8 +203,8 @@ class Controller(object):
output_observatory=options.output_observatory,
starttime=options.starttime,
endtime=options.endtime,
- input_channels=options.input_channels,
- output_channels=options.output_channels,
+ input_channels=options.inchannels,
+ output_channels=options.outchannels,
no_trim=options.no_trim,
realtime=options.realtime,
rename_input_channel=options.rename_input_channel,
--
GitLab
From 5298693ee4d44910d61868bdbafe7022e8d42902 Mon Sep 17 00:00:00 2001
From: pcain-usgs <pcain@usgs.gov>
Date: Mon, 1 Feb 2021 09:36:13 -0700
Subject: [PATCH 2/3] Remove deprecated np.int
---
geomagio/pcdcp/PCDCPParser.py | 6 +++---
geomagio/temperature/TEMPWriter.py | 2 +-
geomagio/vbf/VBFWriter.py | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/geomagio/pcdcp/PCDCPParser.py b/geomagio/pcdcp/PCDCPParser.py
index f3108c10..176b3894 100644
--- a/geomagio/pcdcp/PCDCPParser.py
+++ b/geomagio/pcdcp/PCDCPParser.py
@@ -4,9 +4,9 @@
import numpy
# values that represent missing data points in PCDCP
-NINES = numpy.int("9999999")
-NINES_RAW = numpy.int("99999990")
-NINES_DEG = numpy.int("9999")
+NINES = int("9999999")
+NINES_RAW = int("99999990")
+NINES_DEG = int("9999")
class PCDCPParser(object):
diff --git a/geomagio/temperature/TEMPWriter.py b/geomagio/temperature/TEMPWriter.py
index 630f452d..48532183 100644
--- a/geomagio/temperature/TEMPWriter.py
+++ b/geomagio/temperature/TEMPWriter.py
@@ -11,7 +11,7 @@ from obspy.core import Stream
class TEMPWriter(object):
"""TEMP writer."""
- def __init__(self, empty_value=numpy.int("9999")):
+ def __init__(self, empty_value=int("9999")):
self.empty_value = empty_value
def write(self, out, timeseries, channels):
diff --git a/geomagio/vbf/VBFWriter.py b/geomagio/vbf/VBFWriter.py
index bfb18f5e..6ce2dd64 100644
--- a/geomagio/vbf/VBFWriter.py
+++ b/geomagio/vbf/VBFWriter.py
@@ -11,7 +11,7 @@ from obspy.core import Stream
class VBFWriter(object):
"""VBF writer."""
- def __init__(self, empty_value=numpy.int("9999999")):
+ def __init__(self, empty_value=int("9999999")):
self.empty_value = empty_value
def write(self, out, timeseries, channels):
--
GitLab
From 7678aeaa5aa2e32f0758e25d1889bf48305a4b6b Mon Sep 17 00:00:00 2001
From: pcain-usgs <pcain@usgs.gov>
Date: Mon, 1 Feb 2021 09:41:43 -0700
Subject: [PATCH 3/3] Remove np.int from sqdist
---
geomagio/algorithm/SqDistAlgorithm.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/geomagio/algorithm/SqDistAlgorithm.py b/geomagio/algorithm/SqDistAlgorithm.py
index 43445054..4dc5087a 100644
--- a/geomagio/algorithm/SqDistAlgorithm.py
+++ b/geomagio/algorithm/SqDistAlgorithm.py
@@ -465,7 +465,7 @@ class SqDistAlgorithm(Algorithm):
ts = np.linspace(
np.max((-m, -3 * np.round(sig))),
np.min((m, 3 * np.round(sig))),
- np.int(np.round(np.min((2 * m, 6 * np.round(sig))) + 1)),
+ int(np.round(np.min((2 * m, 6 * np.round(sig))) + 1)),
)
nts = ts.size
weights = np.exp(-0.5 * (ts / sig) ** 2)
--
GitLab