From ec483087d3e7b669cd89d259c1baccb5a96ee536 Mon Sep 17 00:00:00 2001 From: Richard Hitier Date: Wed, 25 Oct 2023 14:09:08 +0200 Subject: [PATCH] Fix dict merging --- web/run.py | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/web/run.py b/web/run.py index ce4d98f..180beea 100755 --- a/web/run.py +++ b/web/run.py @@ -100,6 +100,8 @@ CACHE_DIR = get_path('../cache') # The order matters. If you change this you also need to change the # innermost loop of `get_data_for_target`. # The javascript knows the targets' properties under these names. +# PROPERTIES = ('time', 'vrad', 'vtan', 'vtot', 'btan', 'brad', 'temp', 'pdyn', 'dens', +# 'atse', 'xhee', 'yhee') PROPERTIES = ('time', 'vrad', 'vtan', 'vtot', 'btan', 'temp', 'pdyn', 'dens', 'atse', 'xhee', 'yhee') @@ -130,6 +132,14 @@ PARAMETERS = { 'active': False, 'position': 30, }, + # 'brad': { + # 'slug': 'brad', + # 'name': 'B Radial', + # 'title': 'B Radial.', + # 'units': 'nT', + # 'active': False, + # 'position': 35, + # }, 'temp': { 'slug': 'temp', 'name': 'Temperature', @@ -879,10 +889,12 @@ def generate_csv_contents_spz(target_slug, input_slug, started_at, stopped_at): target_config = get_target_config(target_slug) plasma_dict = target_config['models'][input_slug][0]['parameters'] orbit_dict = target_config['orbit']['models'][0]['parameters'] - parameters_dict = plasma_dict+orbit_dict + parameters_dict = {**plasma_dict, **orbit_dict} + log.info(f"Aggregating dataframes speazy parameters for {input_slug} to {target_slug}" ) list_df = [] for _name, _id in parameters_dict.items(): + log.debug(f"Parameter {_name}: {_id}") _df = amda.get_data(_id, started_at, stopped_at).to_dataframe() if _name == 'xy_v': _df = _df.rename(columns={_df.columns[0]: 'vrad', _df.columns[1]: 'vtan'}) -- libgit2 0.21.2