From 63b892b2a50c056edcad103a66689bdf87db2525 Mon Sep 17 00:00:00 2001
From: pcain-usgs <pcain@usgs.gov>
Date: Mon, 22 Mar 2021 09:15:00 -0600
Subject: [PATCH] make intervals optional parameters to run methods

---
 geomagio/Controller.py | 41 +++++++++++++++++++++++++++++++++--------
 1 file changed, 33 insertions(+), 8 deletions(-)

diff --git a/geomagio/Controller.py b/geomagio/Controller.py
index 3d2222b3b..ec9b421e4 100644
--- a/geomagio/Controller.py
+++ b/geomagio/Controller.py
@@ -60,13 +60,15 @@ class Controller(object):
         self._inputInterval = inputInterval
         self._outputFactory = outputFactory
         self._outputInterval = outputInterval
-        self._inputFactory.interval = self._inputInterval or self._inputFactory.interval
-        self._outputFactory.interval = (
-            self._outputInterval or self._outputFactory.interval
-        )
 
     def _get_input_timeseries(
-        self, observatory, channels, starttime, endtime, algorithm=None
+        self,
+        observatory,
+        channels,
+        starttime,
+        endtime,
+        algorithm=None,
+        interval=None,
     ):
         """Get timeseries from the input factory for requested options.
 
@@ -106,7 +108,7 @@ class Controller(object):
                 starttime=input_start,
                 endtime=input_end,
                 channels=channels,
-                interval=self._inputInterval,
+                interval=interval or self._inputInterval,
             )
         return timeseries
 
@@ -133,7 +135,14 @@ class Controller(object):
                 t.stats.channel = to_name
         return timeseries
 
-    def _get_output_timeseries(self, observatory, channels, starttime, endtime):
+    def _get_output_timeseries(
+        self,
+        observatory,
+        channels,
+        starttime,
+        endtime,
+        interval=None,
+    ):
         """Get timeseries from the output factory for requested options.
 
         Parameters
@@ -158,7 +167,7 @@ class Controller(object):
                 starttime=starttime,
                 endtime=endtime,
                 channels=channels,
-                interval=self._outputInterval,
+                interval=interval or self._outputInterval,
             )
         return timeseries
 
@@ -228,6 +237,8 @@ class Controller(object):
         input_channels: Optional[List[str]] = None,
         input_timeseries: Optional[Stream] = None,
         output_channels: Optional[List[str]] = None,
+        inputInterval: Optional[str] = None,
+        outputInterval: Optional[str] = None,
         no_trim: bool = False,
         realtime: Union[bool, int] = False,
         rename_input_channel: Optional[List[List[str]]] = None,
@@ -254,6 +265,8 @@ class Controller(object):
         algorithm = algorithm or self._algorithm
         input_channels = input_channels or algorithm.get_input_channels()
         output_channels = output_channels or algorithm.get_output_channels()
+        inputInterval = inputInterval or self._inputInterval
+        outputInterval = outputInterval or self._outputInterval
         next_starttime = algorithm.get_next_starttime()
         starttime = next_starttime or starttime
         # input
@@ -263,6 +276,7 @@ class Controller(object):
             starttime=starttime,
             endtime=endtime,
             channels=input_channels,
+            interval=inputInterval,
         )
         if timeseries.count() == 0:
             # no data to process
@@ -299,6 +313,7 @@ class Controller(object):
             starttime=starttime,
             endtime=endtime,
             channels=output_channels,
+            interval=outputInterval,
         )
 
     def run_as_update(
@@ -310,6 +325,8 @@ class Controller(object):
         algorithm: Optional[Algorithm] = None,
         input_channels: Optional[List[str]] = None,
         output_channels: Optional[List[str]] = None,
+        inputInterval: Optional[str] = None,
+        outputInterval: Optional[str] = None,
         no_trim: bool = False,
         realtime: Union[bool, int] = False,
         rename_input_channel: Optional[List[List[str]]] = None,
@@ -352,6 +369,8 @@ class Controller(object):
             raise AlgorithmException("Stateful algorithms cannot use run_as_update")
         input_channels = input_channels or algorithm.get_input_channels()
         output_channels = output_channels or algorithm.get_output_channels()
+        inputInterval = inputInterval or self._inputInterval
+        outputInterval = outputInterval or self._outputInterval
         print(
             "checking gaps",
             starttime,
@@ -366,6 +385,7 @@ class Controller(object):
             starttime=starttime,
             endtime=endtime,
             channels=output_channels,
+            interval=outputInterval,
         )
         if len(output_timeseries) > 0:
             # find gaps in output, so they can be updated
@@ -388,6 +408,7 @@ class Controller(object):
                 starttime=output_gap[0],
                 endtime=output_gap[1],
                 channels=input_channels,
+                interval=inputInterval,
             )
             if not algorithm.can_produce_data(
                 starttime=output_gap[0], endtime=output_gap[1], stream=input_timeseries
@@ -407,6 +428,8 @@ class Controller(object):
                     endtime=recurse_endtime,
                     input_channels=input_channels,
                     output_channels=output_channels,
+                    inputInterval=inputInterval,
+                    outputInterval=outputInterval,
                     no_trim=no_trim,
                     realtime=realtime,
                     rename_input_channel=rename_input_channel,
@@ -433,6 +456,8 @@ class Controller(object):
                 input_channels=input_channels,
                 input_timeseries=input_timeseries,
                 output_channels=output_channels,
+                inputInterval=inputInterval,
+                outputInterval=outputInterval,
                 no_trim=no_trim,
                 realtime=realtime,
                 rename_input_channel=rename_input_channel,
-- 
GitLab