diff --git a/aosstower/level_00/parser.py b/aosstower/level_00/parser.py index 8fc432b124d4f9b0b263cbbccf0b2c3ee56930ea..d30fcef7e2adaf229ef2ed56175431c5c60ca833 100644 --- a/aosstower/level_00/parser.py +++ b/aosstower/level_00/parser.py @@ -45,7 +45,7 @@ import time import logging from datetime import datetime, timedelta -from metobs import data as d +from metobscommon.data.data_time import hhmm_to_offset from aosstower.schema import database LOG = logging.getLogger(__name__) @@ -151,7 +151,7 @@ class ParserV1V2(object): year = int(parts[1]) doy = int(parts[2]) dt = datetime.strptime('{:d}.{:03d}'.format(int(year), int(doy)), '%Y.%j') - secs = d.hhmm_to_offset(parts[3]) + secs = hhmm_to_offset(parts[3]) secs += float(parts[4]) secs -= (secs % 5) dt += timedelta(seconds=secs) diff --git a/aosstower/level_00/rrd.py b/aosstower/level_00/rrd.py index 6d257b9f90d2506cb2ae9837a700012a9b83ee21..2c70f5e0b9546b3f3088c5280a0b9d34ee7bb8ff 100644 --- a/aosstower/level_00/rrd.py +++ b/aosstower/level_00/rrd.py @@ -6,7 +6,8 @@ from datetime import datetime, timedelta import rrdtool -from metobs import data as d +from metobscommon.data.calc import altimeter, dewpoint, wind_vector_components +from metobscommon.data.data_time import to_unix_timestamp from aosstower import station @@ -18,8 +19,8 @@ VARS = {'air_temp', 'rh', 'dewpoint', def add_vector_winds(record): - east, north, spd = d.wind_vector_components(float(record['wind_speed']), - float(record['wind_dir'])) + east, north, spd = wind_vector_components(float(record['wind_speed']), + float(record['wind_dir'])) record['winddir_east'] = '%.3d' % east record['winddir_north'] = '%.3d' % north @@ -27,12 +28,12 @@ def add_vector_winds(record): def add_altimeter(record, elev=station.ELEVATION): - record['altimeter'] = '%.3d' % d.altimeter(float(record['pressure']), elev) + record['altimeter'] = '%.3d' % altimeter(float(record['pressure']), elev) def add_dewpoint(record): - record['dewpoint'] = '%.3d' % d.dewpoint(float(record['air_temp']), - float(record['rh'])) + record['dewpoint'] = '%.3d' % dewpoint(float(record['air_temp']), + float(record['rh'])) def initialize_rrd(filepath, start=None, days=365, data_interval=5): @@ -41,7 +42,7 @@ def initialize_rrd(filepath, start=None, days=365, data_interval=5): assert not os.path.exists(filepath), "DB already exists" start = start or (datetime.utcnow() - timedelta(days=days)) # normalize start to data interval - secs = d.to_unix_timestamp(start) + secs = to_unix_timestamp(start) secs -= secs % data_interval rrdtool.create(filepath,