diff --git a/geomagio/Controller.py b/geomagio/Controller.py index 9a197ab37a4f8110cb63ab959dd067200a46462c..65b148d81f925e1218072af34117ac0405e91fbe 100644 --- a/geomagio/Controller.py +++ b/geomagio/Controller.py @@ -7,7 +7,7 @@ from typing import List, Optional, Tuple, Union from obspy.core import Stream, UTCDateTime -from .algorithm import Algorithm, algorithms, AlgorithmException +from .algorithm import Algorithm, algorithms, AlgorithmException, FilterAlgorithm from .DerivedTimeseriesFactory import DerivedTimeseriesFactory from .PlotTimeseriesFactory import PlotTimeseriesFactory from .StreamTimeseriesFactory import StreamTimeseriesFactory @@ -95,6 +95,7 @@ class Controller(object): """ algorithm = algorithm or self._algorithm timeseries = Stream() + for obs in observatory: # get input interval for observatory # do this per observatory in case an @@ -541,7 +542,7 @@ def get_input_factory(args): elif input_type == "fdsn": input_factory = edge.FDSNFactory( base_url=args.fdsn_url, - network=args.fdsn_network, + network=args.network, locationCode=args.locationcode, **input_factory_args, ) @@ -881,7 +882,7 @@ def parse_args(args): help="data network", ) input_group.add_argument( - "--fdsn-network", + "--network", default="NT", help="data network", ) diff --git a/geomagio/edge/FDSNFactory.py b/geomagio/edge/FDSNFactory.py index c1112c92a197d3e45eb121ca323e54db8b95efc9..9de24e5e5f054ad017079ecf8e45a9f84d6c8e83 100644 --- a/geomagio/edge/FDSNFactory.py +++ b/geomagio/edge/FDSNFactory.py @@ -241,7 +241,7 @@ class FDSNFactory(TimeseriesFactory): half_delta = TimeseriesUtility.get_delta_from_interval(interval) / 2 # Rotate the trace into a right handed coordinate frame. - # This will worrk assuming the metadata is reported correctly. + # This will work assuming the metadata is reported correctly. # Channel that require rotations channel_rotations = ["X", "Y", "Z"] @@ -266,6 +266,10 @@ class FDSNFactory(TimeseriesFactory): except FDSNNoDataException: data = Stream() + print( + f"WARNING: An FDSNNoDataException ignored. Please check the following parameters. " + f"NETWORK: {sncl.network}, LOCATION CODE: {sncl.location}, STATION: {sncl.station}, CHANNELS: {sncl.channel}" + ) data.merge() @@ -286,7 +290,6 @@ class FDSNFactory(TimeseriesFactory): return data self._set_metadata(data, observatory, channel, type, interval) - return data def _post_process(