Skip to content
Snippets Groups Projects
Commit d46ef71f authored by Erin (Josh) Rigler's avatar Erin (Josh) Rigler
Browse files

Only EdgeFactory and MiniSeedFactory use scale_factor and sncl_mode:

I knew this in the previous commit, but I thought their parent class, TimeseriesFactory, could handle arbitrary keywords (i.e., it had a kwargs argument to vacuum up unrecognized keywords). I was mistaken.
parent c54f184f
No related branches found
No related tags found
1 merge request!394Add sncl_mode and scale_factor options to controller:
...@@ -491,8 +491,6 @@ def get_input_factory(args): ...@@ -491,8 +491,6 @@ def get_input_factory(args):
# standard arguments # standard arguments
input_factory_args = {} input_factory_args = {}
input_factory_args["interval"] = args.input_interval or args.interval input_factory_args["interval"] = args.input_interval or args.interval
input_factory_args["scale_factor"] = args.input_scale_factor or args.scale_factor
input_factory_args["sncl_mode"] = args.input_sncl_mode or args.sncl_mode
input_factory_args["observatory"] = args.observatory input_factory_args["observatory"] = args.observatory
input_factory_args["type"] = args.type input_factory_args["type"] = args.type
input_type = args.input input_type = args.input
...@@ -519,6 +517,8 @@ def get_input_factory(args): ...@@ -519,6 +517,8 @@ def get_input_factory(args):
host=args.input_host, host=args.input_host,
port=args.input_port, port=args.input_port,
locationCode=args.locationcode, locationCode=args.locationcode,
scale_factor=args.input_scale_factor or args.scale_factor,
sncl_mode=args.input_sncl_mode or args.sncl_mode,
**input_factory_args, **input_factory_args,
) )
elif input_type == "goes": elif input_type == "goes":
...@@ -564,6 +564,8 @@ def get_input_factory(args): ...@@ -564,6 +564,8 @@ def get_input_factory(args):
port=args.input_port, port=args.input_port,
locationCode=args.locationcode, locationCode=args.locationcode,
convert_channels=args.convert_voltbin, convert_channels=args.convert_voltbin,
scale_factor=args.input_scale_factor or args.scale_factor,
sncl_mode=args.input_sncl_mode or args.sncl_mode,
**input_factory_args, **input_factory_args,
) )
elif input_type == "xml": elif input_type == "xml":
...@@ -602,8 +604,6 @@ def get_output_factory(args): ...@@ -602,8 +604,6 @@ def get_output_factory(args):
# standard arguments # standard arguments
output_factory_args = {} output_factory_args = {}
output_factory_args["interval"] = args.output_interval or args.interval output_factory_args["interval"] = args.output_interval or args.interval
output_factory_args["scale_factor"] = args.output_scale_factor or args.scale_factor
output_factory_args["sncl_mode"] = args.ouput_sncl_mode or args.sncl_mode
output_factory_args["observatory"] = args.output_observatory output_factory_args["observatory"] = args.output_observatory
output_factory_args["type"] = args.type output_factory_args["type"] = args.type
# stream/url arguments # stream/url arguments
...@@ -632,6 +632,8 @@ def get_output_factory(args): ...@@ -632,6 +632,8 @@ def get_output_factory(args):
locationCode=locationcode, locationCode=locationcode,
tag=args.output_edge_tag, tag=args.output_edge_tag,
forceout=args.output_edge_forceout, forceout=args.output_edge_forceout,
scale_factor=args.input_scale_factor or args.scale_factor,
sncl_mode=args.input_sncl_mode or args.sncl_mode,
**output_factory_args, **output_factory_args,
) )
elif output_type == "plot": elif output_type == "plot":
...@@ -662,6 +664,8 @@ def get_output_factory(args): ...@@ -662,6 +664,8 @@ def get_output_factory(args):
port=args.output_read_port, port=args.output_read_port,
write_port=args.output_port, write_port=args.output_port,
locationCode=locationcode, locationCode=locationcode,
scale_factor=args.input_scale_factor or args.scale_factor,
sncl_mode=args.input_sncl_mode or args.sncl_mode,
**output_factory_args, **output_factory_args,
) )
elif output_type == "xml": elif output_type == "xml":
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment