Skip to content
Snippets Groups Projects
Commit 630e6856 authored by JOSSOUD Olivier's avatar JOSSOUD Olivier
Browse files

PicarroProvider. Better manage case when Picarro data are unavailable.

parent 42ceed25
No related branches found
No related tags found
No related merge requests found
......@@ -116,8 +116,8 @@ class Dataset:
picarro_df = self.picarro_prvd.get_df(self.first_data_datetime,
self.last_data_datetime,
["H2O", "Delta_D_H", "Delta_18_16"])
except:
print("Failed to get Picarro data")
except ValueError as e:
print("Failed to get Picarro data: " + str(e))
return
picarro_df.to_csv(path_or_buf=self.full_directory_name + "/" + picarro_filename,
......@@ -340,7 +340,8 @@ class InstrumentPeriodicLog(InstrumentLog):
def __get_df__(self) -> pd.DataFrame:
df = pd.read_csv(self.full_file_name, sep="\t", parse_dates=["datetime"])
df["datetime"] = df["datetime"].dt.tz_localize('UTC')
if not df.empty:
df["datetime"] = df["datetime"].dt.tz_localize('UTC')
return df
def get_variables(self):
......
......@@ -2,6 +2,7 @@ import pandas as pd
import numpy as np
import datetime
import os
import utils
import re
from config import Config
......@@ -38,6 +39,9 @@ class PicarroProvider:
picarro_df["datetime"] = pd.to_datetime(picarro_df["DATE"] + " " + picarro_df["TIME"]).dt.tz_localize('UTC')
picarro_df = picarro_df.drop(columns=["DATE", "TIME"])
picarro_df = picarro_df[(picarro_df["datetime"] >= first_datetime) & (picarro_df["datetime"] <= last_datetime)]
if picarro_df.empty:
raise ValueError("No Picarro data available between " + first_datetime.strftime(utils.datetime_format) +
" and " + last_datetime.strftime(utils.datetime_format))
picarro_df = picarro_df.sort_values(by=['datetime'])
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment