diff --git a/geomagio/Controller.py b/geomagio/Controller.py index 8dce1fd779ed3bd9497a8e051be6891465fff41d..199ab64e43503b8da174dfde88fa9c8ed05c6bc3 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, diff --git a/geomagio/algorithm/SqDistAlgorithm.py b/geomagio/algorithm/SqDistAlgorithm.py index 4344505404d76f0891ee3a957f33c75807646fc9..4dc5087a230367e817f1dacaa4991d7523455d20 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) diff --git a/geomagio/pcdcp/PCDCPParser.py b/geomagio/pcdcp/PCDCPParser.py index f3108c10d57df0d675e0044a7f6eae595b82e9c9..176b389412730f2b0650b3c2208b65a514be9f50 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 630f452da57250244bae62d10cd4799f7d54df7a..485321836650a7fb85a0ef78073ff3afa4223a9b 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 bfb18f5e6a20bc7e5a6fd57375a0185644a420a8..6ce2dd6472c1cade2b46e516028d9b689f0dfaa9 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):