diff --git a/geomagio/processing/adjusted.py b/geomagio/processing/adjusted.py index 6a1988896a806b7e0c6b410de802392b372eff90..97aa9629e9c4f3ce610c1d282777609ff0c24550 100644 --- a/geomagio/processing/adjusted.py +++ b/geomagio/processing/adjusted.py @@ -13,10 +13,10 @@ def main(): def generate_matrix( observatory: str, - starttime: UTCDateTime, - endtime: UTCDateTime, - readings_starttime: UTCDateTime, - readings_endtime: UTCDateTime, + starttime: str, + endtime: str, + readings_starttime: str, + readings_endtime: str, output_file: str, input_factory: str = "webabsolutes", spreadsheet_directory: Optional[str] = None, @@ -29,22 +29,22 @@ def generate_matrix( base_directory=spreadsheet_directory ).get_readings( observatory=observatory, - starttime=readings_starttime, - endtime=readings_endtime, + starttime=UTCDateTime(readings_starttime), + endtime=UTCDateTime(readings_endtime), ) elif input_factory == "webabsolutes": readings = WebAbsolutesFactory(url=webabsolutes_url).get_readings( observatory=observatory, - starttime=readings_starttime, - endtime=readings_endtime, + starttime=UTCDateTime(readings_starttime), + endtime=UTCDateTime(readings_endtime), ) else: readings = [] result = Affine( observatory=observatory, - starttime=starttime, - endtime=endtime, + starttime=UTCDateTime(starttime), + endtime=UTCDateTime(endtime), ).calculate(readings=readings)[0] result.matrix = result.matrix.tolist() diff --git a/setup.py b/setup.py index de1bec63c330ec0a053108278f5802cca37fac3e..8f1ff47f4d8290489c96edf7283b8e9c5dc3f873 100644 --- a/setup.py +++ b/setup.py @@ -27,7 +27,7 @@ setuptools.setup( "console_scripts": [ "magproc-prepfiles=geomagio.processing.magproc:main", "filter-realtime=geomagio.processing.obsrio:main", - "generate-matrix:geomagio.processing.adjusted:main", + "generate-matrix=geomagio.processing.adjusted:main", ], }, )