Merge pull request #115 from nansencenter/argo_syntool_config

Adjust argo syntool conversion config
nansencenter · Sep 30, 2024 · aa38da1 · aa38da1
2 parents 821ce05 + a5879ad
commit aa38da1
Showing 1 changed file with 14 additions and 12 deletions.
diff --git a/geospaas_processing/converters/syntool/converter.py b/geospaas_processing/converters/syntool/converter.py
@@ -156,19 +156,21 @@ class BasicSyntoolConverter(SyntoolConverter):
             converter_type='amsr_sea_ice_conc',
             ingest_parameter_files='ingest_geotiff_3411_raster'),
         ParameterSelector(
-            matches=lambda d: d.source.platform.short_name == 'Argo float',
+            matches=lambda d: d.entry_id.startswith('argo_profile_'),
             converter_type=None,
-            ingest_parameter_files=(
-                ParameterSelector(matches=lambda p: p.name.startswith('ArgoFloats_'),
-                                  ingest_file='ingest_erddap_json_3413_argo_profile'),
-                ParameterSelector(matches=lambda p: p.name.startswith('ArgoFloats_'),
-                                  ingest_file='ingest_erddap_json_3413_argo_trajectory'),
-                ParameterSelector(
-                    matches=lambda p: p.name.startswith('ArgoFloats-synthetic-BGC_'),
-                    ingest_file='ingest_erddap_json_3413_bioargo_profile'),
-                ParameterSelector(
-                    matches=lambda p: p.name.startswith('ArgoFloats-synthetic-BGC_'),
-                    ingest_file='ingest_erddap_json_3413_bioargo_trajectory'))),
+            ingest_parameter_files='ingest_erddap_json_3413_argo_profile'),
+        ParameterSelector(
+            matches=lambda d: d.entry_id.startswith('argo_trajectory_'),
+            converter_type=None,
+            ingest_parameter_files='ingest_erddap_json_3413_argo_trajectory'),
+        ParameterSelector(
+            matches=lambda d: d.entry_id.startswith('bioargo_profile_'),
+            converter_type=None,
+            ingest_parameter_files='ingest_erddap_json_3413_bioargo_profile'),
+        ParameterSelector(
+            matches=lambda d: d.entry_id.startswith('bioargo_trajectory_'),
+            converter_type=None,
+            ingest_parameter_files='ingest_erddap_json_3413_bioargo_trajectory'),
     )
 
     def __init__(self, **kwargs):