diff --git a/config.yml b/config.yml index c734517..7fbdec2 100644 --- a/config.yml +++ b/config.yml @@ -283,15 +283,18 @@ targets: # Earth has a LOT of data files, compared to the others. models: om: - - slug: 'omni_hour_all' + - slug: 'omni-hour-all' parameters: - pdyn: 'RamP' - - slug: 'ace_swepam_real_1h' - # [u'Time', u'Dens', u'Vel', u'Temp', u'flag', u'StartTime', u'StopTime'] + pdyn: 'omni_sw_ram' +# xy_b: 'omni_imf' + - slug: 'ace-swepam-real-1h' parameters: - dens: 'Dens' - vtot: 'Vel' - temp: 'Temp' + vtot: 'sw_v_real' + temp: 'sw_n_real' + dens: 'sw_t_real' + xy_b: 'imf_real_gse' + #brad: '' + #atse: '' #btan: 'Bgsm' # /!. VECTOR2 (actually, does not exist) sa: - slug: 'omni_hour_all' diff --git a/web/run.py b/web/run.py index ea7fcc7..389510a 100755 --- a/web/run.py +++ b/web/run.py @@ -925,6 +925,9 @@ def generate_csv_contents_spz(target_slug, input_slug, started_at, stopped_at): elif _name == 'xy_hee': _df = _df.drop(_df.columns[2], axis=1) _df = _df.rename(columns={_df.columns[0]: 'xhee', _df.columns[1]: 'yhee'}) + elif _name == 'xy_b': + _df = _df.drop(_df.columns[2], axis=1) + _df = _df.rename(columns={_df.columns[0]: 'brad', _df.columns[1]: 'btan'}) else: _df = _df.rename(columns={_df.columns[0]: _name}) @@ -945,6 +948,11 @@ def generate_csv_contents_spz(target_slug, input_slug, started_at, stopped_at): and 'vrad' in final_df.columns: final_df['vtot'] = final_df.apply(lambda x: sqrt(x.vtan * x.vtan + x.vrad * x.vrad), axis=1) + # Hardcoded earth coordinates + if target_slug == 'earth': + final_df['xhee'] = 1 + final_df['yhee'] = 0 + cols_ordered = ['vrad', 'vtan', 'vtot', 'btan', 'brad', 'temp', 'pdyn', 'dens', 'atse', 'xhee', 'yhee'] cols_ordered = [_c for _c in cols_ordered if _c in final_df.columns] final_df = final_df[cols_ordered] @@ -973,7 +981,7 @@ def generate_csv_file_if_needed(target_slug, input_slug, break # temporary switch while migrating each target to spz - if target_slug in ['mercury', 'venus', 'mars']: + if target_slug in ['mercury', 'venus', 'mars', 'earth']: csv_generator = generate_csv_contents_spz else: csv_generator = generate_csv_contents -- libgit2 0.21.2