diff --git a/code.json b/code.json index a130d5d54430813c3f78d93a217ad67c0d6a0116..5c7fac86f64750e04a068ae0da9a9fe85914eca1 100644 --- a/code.json +++ b/code.json @@ -3,7 +3,7 @@ "name": "geomag-algorithms", "organization": "U.S. Geological Survey", "description": "Library for processing Geomagnetic timeseries data.", - "version": "1.13.2", + "version": "1.13.3", "status": "Development", "permissions": { "usageType": "openSource", @@ -35,7 +35,7 @@ "email": "gs-haz_dev_team_group@usgs.gov" }, "date": { - "metadataLastUpdated": "2025-02-27" + "metadataLastUpdated": "2025-03-04" } } ] \ No newline at end of file diff --git a/geomagio/Controller.py b/geomagio/Controller.py index 7895fc5400dfb930b42c62ba3db0c248063e07c6..1380c34b025f5cd109a86729655ef59b65991a29 100644 --- a/geomagio/Controller.py +++ b/geomagio/Controller.py @@ -517,6 +517,8 @@ def get_input_factory(args): host=args.input_host, port=args.input_port, 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, ) elif input_type == "goes": @@ -562,6 +564,8 @@ def get_input_factory(args): port=args.input_port, locationCode=args.locationcode, 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, ) elif input_type == "xml": @@ -628,6 +632,8 @@ def get_output_factory(args): locationCode=locationcode, tag=args.output_edge_tag, 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, ) elif output_type == "plot": @@ -658,6 +664,8 @@ def get_output_factory(args): port=args.output_read_port, write_port=args.output_port, 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, ) elif output_type == "xml": @@ -878,6 +886,17 @@ def parse_args(args): metavar="PORT", type=int, ) + input_group.add_argument( + "--input-scale-factor", + default=None, + help="Override default factory scale_factor (divide on read; multiply on write)", + ) + input_group.add_argument( + "--input-sncl-mode", + default=None, + help="Override default factory sncl_mode", + choices=["geomag", "legacy", "fdsn"], + ) input_group.add_argument( "--input-stdin", action="store_true", @@ -969,6 +988,17 @@ def parse_args(args): metavar=("FROM", "TO"), nargs=2, ) + input_group.add_argument( + "--scale-factor", + default=None, + help="Override default factory scale_factor (divide on read; multiply on write)", + ) + input_group.add_argument( + "--sncl-mode", + default=None, + help="Override default factory sncl_mode", + choices=["geomag", "legacy", "fdsn"], + ) input_group.add_argument( "--type", default="variation", @@ -1102,6 +1132,17 @@ def parse_args(args): metavar="PORT", type=int, ) + output_group.add_argument( + "--output-scale-factor", + default=None, + help="Override default factory scale_factor (divide on read; multiply on write)", + ) + output_group.add_argument( + "--output-sncl-mode", + default=None, + help="Override default factory sncl_mode ()", + choices=["geomag", "legacy", "fdsn"], + ) output_group.add_argument( "--output-stdout", action="store_true", diff --git a/pyproject.toml b/pyproject.toml index 3205b459ebe6bc779e827763ac2b2747928bdd01..36c1a304e3363dd1e4b81b66321400b83b3301f7 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -17,7 +17,7 @@ packages = [ {include = "geomagio" } ] repository="https://code.usgs.gov/ghsc/geomag/geomag-algorithms" -version = "1.13.2" +version = "1.13.3" [tool.poetry.dependencies]