Skip to content
Snippets Groups Projects
Commit 8a9da540 authored by Shavers, Nicholas H's avatar Shavers, Nicholas H
Browse files

necessary tweaks: urlInterval brought back, remove need for cdf extension on input-file

parent b4123eb1
No related branches found
No related tags found
1 merge request!368Imagcdf factory mvp
...@@ -7,8 +7,6 @@ from typing import List, Optional, Tuple, Union ...@@ -7,8 +7,6 @@ from typing import List, Optional, Tuple, Union
from obspy.core import Stream, UTCDateTime from obspy.core import Stream, UTCDateTime
from geomagio.imagcdf.ImagCDFFactory import ImagCDFFactory
from .algorithm import Algorithm, algorithms, AlgorithmException, FilterAlgorithm from .algorithm import Algorithm, algorithms, AlgorithmException, FilterAlgorithm
from .DerivedTimeseriesFactory import DerivedTimeseriesFactory from .DerivedTimeseriesFactory import DerivedTimeseriesFactory
from .PlotTimeseriesFactory import PlotTimeseriesFactory from .PlotTimeseriesFactory import PlotTimeseriesFactory
...@@ -504,8 +502,10 @@ def get_input_factory(args): ...@@ -504,8 +502,10 @@ def get_input_factory(args):
input_factory_args["output"] = args.output input_factory_args["output"] = args.output
# stream/url arguments # stream/url arguments
if args.input_file is not None: if args.input_file is not None:
if input_type in ["netcdf", "miniseed", "imagcdf"]: if input_type in ["netcdf", "miniseed"]:
input_stream = open(args.input_file, "rb") input_stream = open(args.input_file, "rb")
elif input_type in ["imagcdf"]:
input_factory_args["inputFile"] = args.input_file #imagcdf file is binary but lib used accepts a file path
else: else:
input_stream = open(args.input_file, "r") input_stream = open(args.input_file, "r")
elif args.input_stdin: elif args.input_stdin:
......
...@@ -54,6 +54,7 @@ class ImagCDFFactory(TimeseriesFactory): ...@@ -54,6 +54,7 @@ class ImagCDFFactory(TimeseriesFactory):
urlTemplate="file://{obs}_{dt}_{t}.cdf", urlTemplate="file://{obs}_{dt}_{t}.cdf",
inputFile: Optional[str] = None, inputFile: Optional[str] = None,
output: Optional[str] = "iaga2002", output: Optional[str] = "iaga2002",
urlInterval: int= -1
): ):
""" """
Initialize the ImagCDFFactory with default parameters. Initialize the ImagCDFFactory with default parameters.
...@@ -73,6 +74,7 @@ class ImagCDFFactory(TimeseriesFactory): ...@@ -73,6 +74,7 @@ class ImagCDFFactory(TimeseriesFactory):
type=type, type=type,
interval=interval, interval=interval,
urlTemplate=urlTemplate, urlTemplate=urlTemplate,
urlInterval=urlInterval
) )
self.inputFile = inputFile self.inputFile = inputFile
self.output = ( self.output = (
......
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