Fix dict merging

hitier
1 parent 79509300
Showing 1 changed file with 13 additions and 1 deletions Show diff stats
web/run.py
@@ -100,6 +100,8 @@ CACHE_DIR = get_path(&#39;../cache&#39;)
 # 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'})