diff --git a/geomagio/Controller.py b/geomagio/Controller.py index ec9b421e437bd6346badd56c270b0ac906c1bee7..4342bd856db72ec76959f369520faa6d1058ea01 100644 --- a/geomagio/Controller.py +++ b/geomagio/Controller.py @@ -237,8 +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, + input_interval: Optional[str] = None, + output_interval: Optional[str] = None, no_trim: bool = False, realtime: Union[bool, int] = False, rename_input_channel: Optional[List[List[str]]] = None, @@ -254,6 +254,8 @@ class Controller(object): input_channels: list of channels to read input_timeseries: used by run_as_update, which has already read input. output_channels: list of channels to write + input_interval: input data interval + output_interval: output data interval no_trim: whether to trim output to starttime/endtime interval realtime: number of seconds in realtime interval rename_input_channel: list of input channel renames @@ -265,8 +267,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 + input_interval = input_interval or self._inputInterval + output_interval = output_interval or self._outputInterval next_starttime = algorithm.get_next_starttime() starttime = next_starttime or starttime # input @@ -276,7 +278,7 @@ class Controller(object): starttime=starttime, endtime=endtime, channels=input_channels, - interval=inputInterval, + interval=input_interval, ) if timeseries.count() == 0: # no data to process @@ -313,7 +315,7 @@ class Controller(object): starttime=starttime, endtime=endtime, channels=output_channels, - interval=outputInterval, + interval=output_interval, ) def run_as_update( @@ -325,8 +327,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, + input_interval: Optional[str] = None, + output_interval: Optional[str] = None, no_trim: bool = False, realtime: Union[bool, int] = False, rename_input_channel: Optional[List[List[str]]] = None, @@ -345,6 +347,8 @@ class Controller(object): input_channels: list of channels to read input_timeseries: used by run_as_update, which has already read input. output_channels: list of channels to write + input_interval: input data interval + output_interval: output data interval no_trim: whether to trim output to starttime/endtime interval realtime: number of seconds in realtime interval rename_input_channel: list of input channel renames @@ -369,8 +373,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 + input_interval = input_interval or self._inputInterval + output_interval = output_interval or self._outputInterval print( "checking gaps", starttime, @@ -385,7 +389,7 @@ class Controller(object): starttime=starttime, endtime=endtime, channels=output_channels, - interval=outputInterval, + interval=output_interval, ) if len(output_timeseries) > 0: # find gaps in output, so they can be updated @@ -408,7 +412,7 @@ class Controller(object): starttime=output_gap[0], endtime=output_gap[1], channels=input_channels, - interval=inputInterval, + interval=input_interval, ) if not algorithm.can_produce_data( starttime=output_gap[0], endtime=output_gap[1], stream=input_timeseries @@ -428,8 +432,8 @@ class Controller(object): endtime=recurse_endtime, input_channels=input_channels, output_channels=output_channels, - inputInterval=inputInterval, - outputInterval=outputInterval, + input_interval=input_interval, + output_interval=output_interval, no_trim=no_trim, realtime=realtime, rename_input_channel=rename_input_channel, @@ -456,8 +460,8 @@ class Controller(object): input_channels=input_channels, input_timeseries=input_timeseries, output_channels=output_channels, - inputInterval=inputInterval, - outputInterval=outputInterval, + input_interval=input_interval, + output_interval=output_interval, no_trim=no_trim, realtime=realtime, rename_input_channel=rename_input_channel,