From fc7cbbee6885036b4b76e48989c5e129071e1a60 Mon Sep 17 00:00:00 2001 From: Richard Hitier Date: Tue, 24 Oct 2023 12:20:20 +0200 Subject: [PATCH] Move orbit parameters to orbit section in config --- config.yml | 5 +++-- web/run.py | 6 ++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/config.yml b/config.yml index 85ab6f2..e06a8c9 100644 --- a/config.yml +++ b/config.yml @@ -235,7 +235,9 @@ targets: title: 'Mars' orbit: models: - - slug: 'mars_orb_all' + - slug: 'mars-orb-all' + parameters: + xy_hee: 'xyz_mars_hee' semimajor: 1.52366231 semiminor: 1.51700011 models: @@ -249,7 +251,6 @@ targets: btan: 'mars_sw_b' brad: 'mars_sw_bx' atse: 'mars_sw_da' - xy_hee: 'xyz_mars_hee' art: - slug: 'tao_mars_swrt' dsc: diff --git a/web/run.py b/web/run.py index ff774e4..ce4d98f 100755 --- a/web/run.py +++ b/web/run.py @@ -877,10 +877,12 @@ def generate_csv_contents(target_slug, input_slug, started_at, stopped_at): def generate_csv_contents_spz(target_slug, input_slug, started_at, stopped_at): target_config = get_target_config(target_slug) - params_dict = target_config['models'][input_slug][0]['parameters'] + plasma_dict = target_config['models'][input_slug][0]['parameters'] + orbit_dict = target_config['orbit']['models'][0]['parameters'] + parameters_dict = plasma_dict+orbit_dict list_df = [] - for _name, _id in params_dict.items(): + for _name, _id in parameters_dict.items(): _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