From d74b10a60e7921990cfe4be8b14b17f9636075e0 Mon Sep 17 00:00:00 2001 From: rettigl Date: Mon, 3 Feb 2025 10:42:00 +0100 Subject: [PATCH] correct time stamp formatting --- src/specsscan/helpers.py | 8 ++------ src/specsscan/metadata.py | 12 ++++++++++-- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/src/specsscan/helpers.py b/src/specsscan/helpers.py index 8980d7c..7a026fd 100644 --- a/src/specsscan/helpers.py +++ b/src/specsscan/helpers.py @@ -423,12 +423,8 @@ def handle_meta( ts_from = dt.datetime.timestamp(datetime_list[0]) # POSIX timestamp ts_to = dt.datetime.timestamp(datetime_list[-1]) # POSIX timestamp metadata["timing"] = { - "acquisition_start": dt.datetime.fromtimestamp(ts_from, dt.timezone.utc) - .replace(tzinfo=dt.timezone.utc) - .isoformat(), - "acquisition_stop": dt.datetime.fromtimestamp(ts_to, dt.timezone.utc) - .replace(tzinfo=dt.timezone.utc) - .isoformat(), + "acquisition_start": dt.datetime.fromtimestamp(ts_from, dt.timezone.utc).isoformat(), + "acquisition_stop": dt.datetime.fromtimestamp(ts_to, dt.timezone.utc).isoformat(), "acquisition_duration": int(ts_to - ts_from), "collection_time": float(ts_to - ts_from), } diff --git a/src/specsscan/metadata.py b/src/specsscan/metadata.py index fb8c56a..6e1f062 100644 --- a/src/specsscan/metadata.py +++ b/src/specsscan/metadata.py @@ -315,8 +315,16 @@ def get_archiver_data( Returns: tuple[np.ndarray, np.ndarray]: The extracted time stamps and corresponding data """ - iso_from = datetime.datetime.fromtimestamp(ts_from, datetime.timezone.utc).isoformat() - iso_to = datetime.datetime.fromtimestamp(ts_to, datetime.timezone.utc).isoformat() + iso_from = ( + datetime.datetime.fromtimestamp(ts_from, datetime.timezone.utc) + .replace(tzinfo=None) + .isoformat() + ) + iso_to = ( + datetime.datetime.fromtimestamp(ts_to, datetime.timezone.utc) + .replace(tzinfo=None) + .isoformat() + ) req_str = archiver_url + archiver_channel + "&from=" + iso_from + "Z&to=" + iso_to + "Z" with urlopen(req_str) as req: data = json.load(req)