From 160bc0823bdfd4e1fc038f9067f6c20ba937f001 Mon Sep 17 00:00:00 2001
From: Richard Hitier <hitier.richard@gmail.com>
Date: Mon, 30 Oct 2023 15:04:47 +0100
Subject: [PATCH] Set 3 main probes amda parameters

---
 config.yml | 109 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----------------
 web/run.py |  11 ++++++-----
 2 files changed, 98 insertions(+), 22 deletions(-)

diff --git a/config.yml b/config.yml
index 7edf111..7272d09 100644
--- a/config.yml
+++ b/config.yml
@@ -658,15 +658,40 @@ targets:
     title: 'BepiColombo'
     orbit:
       models:
-        - slug: 'bepi_cruise_all'
-    #             - slug: 'mercury_orb_all'
+        - slug: 'bepi-cruise-all'
+          parameters:
+            xy_hee: 'bepi_xyz_hee'
     models:
       om:
-        - slug: 'tao_bepi_sw'
+        - slug: 'tao-bepi-sw'
+          parameters:
+            dens: 'bepi_sw_n'
+            xy_v: 'bepi_sw_v'
+            temp: 'bepi_sw_t'
+            pdyn: 'bepi_sw_pdyn'
+            btan: 'bepi_sw_b'
+            brad: 'bepi_sw_bx'
+            atse: 'bepi_sw_da'
       art:
-        - slug: 'tao_bepi_swrt'
+        - slug: 'tao-bepi-swrt'
+          parameters:
+            dens: 'bepi_swrt_n'
+            xy_v: 'bepi_swrt_v'
+            temp: 'bepi_swrt_t'
+            pdyn: 'bepi_swrt_pdyn'
+            btan: 'bepi_swrt_b'
+            brad: 'bepi_swrt_bx'
+            atse: 'bepi_swrt_da'
       sa:
-        - slug: 'tao_bepi_sta'
+        - slug: 'tao-bepi-sta'
+          parameters:
+            dens: 'bepi_sta_n'
+            xy_v: 'bepi_sta_v'
+            temp: 'bepi_sta_t'
+            pdyn: 'bepi_sta_pdyn'
+            btan: 'bepi_sta_b'
+            brad: 'bepi_sta_bx'
+            atse: 'bepi_sta_da'
     locked: false
     default: false
   - type: 'probe'
@@ -675,15 +700,30 @@ targets:
     title: 'SolarOrbiter'
     orbit:
       models:
-        - slug: 'so_orb_all'
-    #             - slug: 'earth_orb_all'
+        - slug: 'so-orb-all'
+          parameters:
+            xy_hee: 'so_xyz_hee'
     models:
       om:
-        - slug: 'tao_so_sw'
-      art:
-        - slug: 'tao_so_swrt'
-    #          sa:
-    #              - slug: 'tao_so_sw'
+        - slug: 'tao-so-sw'
+          parameters:
+            dens: 'so_sw_n'
+            xy_v: 'so_sw_v'
+            temp: 'so_sw_t'
+            pdyn: 'so_sw_pdyn'
+            btan: 'so_sw_b'
+            brad: 'so_sw_bx'
+            atse: 'so_sw_da'
+      dsc:
+        - slug: 'tao-so-dsc'
+          parameters:
+            dens: 'so_dsc_n'
+            xy_v: 'so_dsc_v'
+            temp: 'so_dsc_t'
+            pdyn: 'so_dsc_pdyn'
+            btan: 'so_dsc_b'
+            brad: 'so_dsc_bx'
+            atse: 'so_dsc_da'
     locked: false
     default: false
   - type: 'probe'
@@ -692,15 +732,50 @@ targets:
     title: 'Parker Solar Probe'
     orbit:
       models:
-        - slug: 'psp_orb_all'
-    #             - slug: 'earth_orb_all'
+        - slug: 'psp-orb-all'
+          parameters:
+            xy_hee: 'psp_xyz_hee'
     models:
       om:
-        - slug: 'tao_psp_sw'
+        - slug: 'tao-psp-sw'
+          parameters:
+            dens: 'psp_sw_n'
+            xy_v: 'psp_sw_v'
+            temp: 'psp_sw_t'
+            pdyn: 'psp_sw_pdyn'
+            btan: 'psp_sw_b'
+            brad: 'psp_sw_bx'
+            atse: 'psp_sw_da'
+      dsc:
+        - slug: 'tao-psp-dsc'
+          parameters:
+            dens: 'psp_dsc_n'
+            xy_v: 'psp_dsc_v'
+            temp: 'psp_dsc_t'
+            pdyn: 'psp_dsc_pdyn'
+            btan: 'psp_dsc_b'
+            brad: 'psp_dsc_bx'
+            atse: 'psp_dsc_da'
       art:
-        - slug: 'tao_psp_swrt'
+        - slug: 'tao-psp-swrt'
+          parameters:
+            dens: 'psp_swrt_n'
+            xy_v: 'psp_swrt_v'
+            temp: 'psp_swrt_t'
+            pdyn: 'psp_swrt_pdyn'
+            btan: 'psp_swrt_b'
+            brad: 'psp_swrt_bx'
+            atse: 'psp_swrt_da'
       sa:
-        - slug: 'tao_psp_sta'
+        - slug: 'tao-psp-sta'
+          parameters:
+            dens: 'psp_sta_n'
+            xy_v: 'psp_sta_v'
+            temp: 'psp_sta_t'
+            pdyn: 'psp_sta_pdyn'
+            btan: 'psp_sta_b'
+            brad: 'psp_sta_bx'
+            atse: 'psp_sta_da'
     locked: false
     default: false
   - type: 'probe'
diff --git a/web/run.py b/web/run.py
index 42ec14c..96ac575 100755
--- a/web/run.py
+++ b/web/run.py
@@ -904,7 +904,8 @@ 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):
     now = datetime.datetime.now()
-    hp_logger.debug(f"Generating csv content with Speasy for {target_slug}/{input_slug} between {stopped_at} {stopped_at}")
+    hp_logger.debug(
+        f"Generating csv content with Speasy for {target_slug}/{input_slug} between {stopped_at} {stopped_at}")
     target_config = get_target_config(target_slug)
     plasma_params = {}
     for plasma_struct in target_config['models'][input_slug]:
@@ -961,7 +962,7 @@ def generate_csv_contents_spz(target_slug, input_slug, started_at, stopped_at):
     final_df.index.name = 'time'
 
     then = datetime.datetime.now()
-    hp_logger.debug(f"Took {then-now} to generate")
+    hp_logger.debug(f"Took {then - now} to generate")
 
     return final_df.to_csv(date_format='%Y-%m-%dT%H:%M:%S+00:00', float_format="%.5f",
                            header=True,
@@ -987,10 +988,10 @@ 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', 'earth', 'jupiter', 'saturn', 'uranus', 'neptune']:
-        csv_generator = generate_csv_contents_spz
-    else:
+    if target_slug in ['rosetta', 'juno', 'p67']:
         csv_generator = generate_csv_contents
+    else:
+        csv_generator = generate_csv_contents_spz
 
     if generate:
         hp_logger.info("Generating CSV '%s'..." % local_csv_file)
--
libgit2 0.21.2