diff --git a/README.md b/README.md index e0fd903..57c36a7 100644 --- a/README.md +++ b/README.md @@ -34,7 +34,7 @@ ts.data('AOD_550nm')['stations'] # start_times ts.data('AOD_550nm')['start_times'] # stop_times -ts.data('AOD_550nm')['stop_times'] +ts.data('AOD_550nm')['end_times'] # latitudes ts.data('AOD_550nm')['latitudes'] # longitudes @@ -57,7 +57,7 @@ ts.data('AODGT1_550nm')['stations'] # start_times ts.data('AODGT1_550nm')['start_times'] # stop_times -ts.data('AODGT1_550nm')['stop_times'] +ts.data('AODGT1_550nm')['end_times'] # latitudes ts.data('AODGT1_550nm')['latitudes'] # longitudes diff --git a/pyproject.toml b/pyproject.toml index e62713c..d91108d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta" [project] name = "pyaro_readers" -version = "0.0.2" +version = "0.0.3" authors = [{ name = "MET Norway" }] description = "implementations of pyaerocom reading plugings using pyaro as interface'" readme = "README.md" diff --git a/src/pyaro_readers/aeronetsdareader/AeronetSdaTimeseriesReader.py b/src/pyaro_readers/aeronetsdareader/AeronetSdaTimeseriesReader.py index b0fbd1c..b8ab04a 100644 --- a/src/pyaro_readers/aeronetsdareader/AeronetSdaTimeseriesReader.py +++ b/src/pyaro_readers/aeronetsdareader/AeronetSdaTimeseriesReader.py @@ -59,6 +59,13 @@ FILE_MASK = "*.ONEILL_lev*" +TS_TYPE_DIFFS = { + "daily": np.timedelta64(12, "h"), + "instantaneous": np.timedelta64(0, "s"), + "points": np.timedelta64(0, "s"), + "monthly": np.timedelta64(15, "D"), +} + class AeronetSdaTimeseriesReader(AutoFilterReaderEngine.AutoFilterReader): def __init__( @@ -67,6 +74,7 @@ def __init__( filters=[], fill_country_flag: bool = FILL_COUNTRY_FLAG, tqdm_desc: [str, None] = None, + ts_type: str = "daily", ): """open a new csv timeseries-reader @@ -209,8 +217,9 @@ def __init__( day, month, year = row[DATE_NAME].split(":") datestring = "-".join([year, month, day]) datestring = "T".join([datestring, row[TIME_NAME]]) - start = np.datetime64(datestring) - end = start + time_dummy = np.datetime64(datestring) + start = time_dummy - TS_TYPE_DIFFS[ts_type] + end = time_dummy + TS_TYPE_DIFFS[ts_type] ts_dummy_data = {} for variable in DATA_VARS: diff --git a/src/pyaro_readers/aeronetsunreader/AeronetSunTimeseriesReader.py b/src/pyaro_readers/aeronetsunreader/AeronetSunTimeseriesReader.py index f1ea39c..d078ee4 100644 --- a/src/pyaro_readers/aeronetsunreader/AeronetSunTimeseriesReader.py +++ b/src/pyaro_readers/aeronetsunreader/AeronetSunTimeseriesReader.py @@ -48,6 +48,13 @@ FILL_COUNTRY_FLAG = False +TS_TYPE_DIFFS = { + "daily": np.timedelta64(12, "h"), + "instantaneous": np.timedelta64(0, "s"), + "points": np.timedelta64(0, "s"), + "monthly": np.timedelta64(15, "D"), +} + class AeronetSunTimeseriesReader(AutoFilterReaderEngine.AutoFilterReader): def __init__( @@ -56,8 +63,9 @@ def __init__( filters=[], fill_country_flag: bool = FILL_COUNTRY_FLAG, tqdm_desc: [str, None] = None, + ts_type: str = "daily", ): - """open a new csv timeseries-reader + """open a new Aeronet timeseries-reader :param filename: str :param filters: @@ -65,7 +73,7 @@ def __init__( :param tqdm_desc: :param filename_or_obj_or_url: path-like object to csv-file - input file looks like this: + input file looks like this (daily file; times noted are middle times): AERONET Version 3; Cuiaba Version 3: AOD Level 2.0 @@ -157,8 +165,9 @@ def __init__( day, month, year = row[DATE_NAME].split(":") datestring = "-".join([year, month, day]) datestring = "T".join([datestring, row[TIME_NAME]]) - start = np.datetime64(datestring) - end = start + time_dummy = np.datetime64(datestring) + start = time_dummy - TS_TYPE_DIFFS[ts_type] + end = time_dummy + TS_TYPE_DIFFS[ts_type] ts_dummy_data = {} for variable in DATA_VARS: