From 18aeb3ebdbf98ea90b35dee25f65f57ebde68f22 Mon Sep 17 00:00:00 2001
From: Hal Simpson <hasimpson@usgs.gov>
Date: Thu, 4 Feb 2016 16:45:21 -0700
Subject: [PATCH] Minor refactor of observatory parameter usage in
get_timeseries.
---
geomagio/imfv283/GOESIMFV283Factory.py | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/geomagio/imfv283/GOESIMFV283Factory.py b/geomagio/imfv283/GOESIMFV283Factory.py
index 8cf569bf7..9529d2dcf 100644
--- a/geomagio/imfv283/GOESIMFV283Factory.py
+++ b/geomagio/imfv283/GOESIMFV283Factory.py
@@ -49,6 +49,7 @@ class GOESIMFV283Factory(IMFV283Factory):
self.server = server
self.user = user
self.observatories = observatory
+ self.observatory = observatory[0]
self.javaerror = 'java.io.IOException: Socket closed'
def get_timeseries(self, starttime, endtime, observatory=None,
@@ -58,12 +59,11 @@ class GOESIMFV283Factory(IMFV283Factory):
Notes: Calls IMFV283Factory.parse_string in place of
IMFV283Factory.get_timeseries.
"""
- self.observatory = observatory or self.observatories
+ observatory = observatory or self.observatory
channels = channels or self.channels
- self.criteria_file_name = self.observatory + '.sc'
+ self.criteria_file_name = observatory + '.sc'
timeseries = Stream()
- output = self._retrieve_goes_messages(starttime, endtime,
- self.observatory)
+ output = self._retrieve_goes_messages(starttime, endtime, observatory)
timeseries += self.parse_string(output)
# merge channel traces for multiple days
timeseries.merge()
--
GitLab