CDPP / HELIOPROPA

Commit fc7cbbee6885036b4b76e48989c5e129071e1a60

Authored by hitier
1 parent 0c776ee3
Exists in rhitier-dev

Move orbit parameters to orbit section in config

Showing 2 changed files with 7 additions and 4 deletions   Show diff stats
Inline Side-by-side
@@ -235,7 +235,9 @@ targets: @@ -235,7 +235,9 @@ targets:
235 title: 'Mars' 235 title: 'Mars'
236 orbit: 236 orbit:
237 models: 237 models:
238 - - slug: 'mars_orb_all' 238 + - slug: 'mars-orb-all'
  239 + parameters:
  240 + xy_hee: 'xyz_mars_hee'
239 semimajor: 1.52366231 241 semimajor: 1.52366231
240 semiminor: 1.51700011 242 semiminor: 1.51700011
241 models: 243 models:
@@ -249,7 +251,6 @@ targets: @@ -249,7 +251,6 @@ targets:
249 btan: 'mars_sw_b' 251 btan: 'mars_sw_b'
250 brad: 'mars_sw_bx' 252 brad: 'mars_sw_bx'
251 atse: 'mars_sw_da' 253 atse: 'mars_sw_da'
252 - xy_hee: 'xyz_mars_hee'  
253 art: 254 art:
254 - slug: 'tao_mars_swrt' 255 - slug: 'tao_mars_swrt'
255 dsc: 256 dsc:
@@ -877,10 +877,12 @@ def generate_csv_contents(target_slug, input_slug, started_at, stopped_at): @@ -877,10 +877,12 @@ def generate_csv_contents(target_slug, input_slug, started_at, stopped_at):
877 877
878 def generate_csv_contents_spz(target_slug, input_slug, started_at, stopped_at): 878 def generate_csv_contents_spz(target_slug, input_slug, started_at, stopped_at):
879 target_config = get_target_config(target_slug) 879 target_config = get_target_config(target_slug)
880 - params_dict = target_config['models'][input_slug][0]['parameters'] 880 + plasma_dict = target_config['models'][input_slug][0]['parameters']
  881 + orbit_dict = target_config['orbit']['models'][0]['parameters']
  882 + parameters_dict = plasma_dict+orbit_dict
881 883
882 list_df = [] 884 list_df = []
883 - for _name, _id in params_dict.items(): 885 + for _name, _id in parameters_dict.items():
884 _df = amda.get_data(_id, started_at, stopped_at).to_dataframe() 886 _df = amda.get_data(_id, started_at, stopped_at).to_dataframe()
885 if _name == 'xy_v': 887 if _name == 'xy_v':
886 _df = _df.rename(columns={_df.columns[0]: 'vrad', _df.columns[1]: 'vtan'}) 888 _df = _df.rename(columns={_df.columns[0]: 'vrad', _df.columns[1]: 'vtan'})