Merge pull request #30 from AugustinMortier/0.10.5

0.10.5
AugustinMortier · Oct 25, 2024 · d4ccb9f · d4ccb9f
2 parents 1d21f8c + 1df07ab
commit d4ccb9f
Show file tree

Hide file tree

Showing 6 changed files with 59 additions and 47 deletions.
diff --git a/aprofiles/cli/config/cfg.json b/aprofiles/cli/config/cfg.json
@@ -7,6 +7,7 @@
             "inversion": {
                 "method": "forward",
                 "apriori": {
+                    "var": "lr",
                     "cfg": "aer_ifs.json"
                 }
             }
@@ -15,6 +16,7 @@
             "inversion": {
                 "method": "forward",
                 "apriori": {
+                    "var": "lr",
                     "cfg": "aer_ifs.json"
                 }
             }
@@ -23,6 +25,7 @@
             "inversion": {
                 "method": "forward",
                 "apriori": {
+                    "var": "lr",
                     "cfg": "aer_ifs.json"
                 }
             }

diff --git a/aprofiles/cli/utils/workflow.py b/aprofiles/cli/utils/workflow.py
@@ -2,6 +2,8 @@
 # @desc A-Profiles - Standard workflow
 
 import aprofiles as apro
+from pathlib import Path
+import json
 import warnings
 
 
@@ -31,15 +33,44 @@ def workflow(path, instruments_types, base_dir, CFG, verbose=False):
         # 1. default: forward, 50sr
         method = "forward"
         apriori = {
-            "lr": 50
+            "lr": 50,
+            "use_cfg": False
         }
         # 2. if exist, overwrite with CFG["parameters"]
+        var_apriori = CFG["parameters"][profiles.data.instrument_type]["inversion"]["apriori"]["var"]
         if profiles.data.instrument_type in CFG["parameters"]:
+            if 'cfg' in CFG["parameters"][profiles.data.instrument_type]["inversion"]["apriori"]:
+                cfg_path = CFG["parameters"][profiles.data.instrument_type]["inversion"]["apriori"]["cfg"]
+                # open config 
+                f = open(Path(Path(__file__).parent, '..', '..', cfg_path))
+                aer_ifs = json.load(f)
+                f.close()
+                station_id = f'{profiles._data.attrs["wigos_station_id"]}-{profiles._data.attrs["instrument_id"]}'
+                if station_id in aer_ifs:
+                    apriori = {
+                        var_apriori: aer_ifs[station_id][var_apriori],
+                        "use_cfg": 'True',
+                        "cfg": {
+                            "data": aer_ifs[station_id]["data"],
+                            "use_default": 'False',
+                            "attributes": aer_ifs["attributes"],
+                            "path": cfg_path
+                        } 
+                    } 
+                else:
+                    apriori = {
+                        var_apriori: aer_ifs["attributes"]["default"][var_apriori],
+                        "use_cfg": 'True',
+                        "cfg": {
+                            "use_default": 'True',
+                            "attributes": aer_ifs["attributes"],
+                            "path": cfg_path
+                        }
+                    }
+
             if "inversion" in CFG["parameters"][profiles.data.instrument_type]:
                 if "method" in CFG["parameters"][profiles.data.instrument_type]["inversion"]:
                     method = CFG["parameters"][profiles.data.instrument_type]["inversion"]["method"]
-                if "apriori" in CFG["parameters"][profiles.data.instrument_type]["inversion"]:
-                    apriori = CFG["parameters"][profiles.data.instrument_type]["inversion"]["apriori"]
 
         profiles.inversion(zmin=4000., zmax=6000., remove_outliers=True, method=method, apriori=apriori, verbose=verbose)
         profiles.write(base_dir)
diff --git a/aprofiles/config/aer_ifs.json b/aprofiles/config/aer_ifs.json
@@ -1,14 +1,21 @@
 {
+    "0-528-0-06218-A": {
+        "l0_wavelength": 1064.0,
+        "data": {
+            "od550aer": 0.1,
+            "od550aerbc": 0.1,
+            "od550aerdust": 0.2
+        },
+        "lr": 42
+    },
     "0-20000-0-00203-A": {
         "l0_wavelength": 1064.0,
         "data": {
             "od550aer": 0.1,
             "od550aerbc": 0.1,
             "od550aerdust": 0.2
         },
-        "apriori": {
-            "lr": 42
-        }
+        "lr": 42
     },
     "0-20000-0-01492-A": {
         "l0_wavelength": 1064.0,
@@ -17,21 +24,12 @@
             "od550aerbc": 0.1,
             "od550aerdust": 0.2
         },
-        "apriori": {
-            "lr": 42
-        }
+        "lr": 42
     },
     "attributes": {
         "default": {
-            "apriori": {
-                "lr": 48
-            }
+            "lr": 48
         },
-        "files": [
-            "od550.nc",
-            "od550bc.nc",
-            "..."
-        ],
         "date": "26-09-2024T09:20:00"
     }
 }
diff --git a/aprofiles/retrieval/extinction.py b/aprofiles/retrieval/extinction.py
@@ -245,21 +245,6 @@ def inversion(
     rayleigh = apro.rayleigh.RayleighData(
         altitude, T0=298, P0=1013, wavelength=wavelength
     )
-
-    # apriori definition
-    if 'cfg' in apriori:
-        cfg_path = apriori['cfg']
-        # open config 
-        f = open(Path(Path(__file__).parent, '..', cfg_path))
-        cfg = json.load(f)
-        f.close()
-        station_id = f'{profiles._data.attrs["wigos_station_id"]}-{profiles._data.attrs["instrument_id"]}'
-        if station_id in cfg:
-            apriori = cfg[station_id]["apriori"]
-        else:
-            apriori = cfg["attributes"]["default"]["apriori"]
-    else:
-        cfg = None
 
     # aerosol inversion
     ext, lr, aod, z_ref = [], [], [], []
@@ -330,22 +315,12 @@ def inversion(
     profiles.data["lidar_ratio"] = ('time', lr)
     profiles.data["lidar_ratio"] = profiles.data.lidar_ratio.assign_attrs({
         'long_name': f"Lidar Ratio @ {int(wavelength)} nm",
-        'units': 'sr'
+        'units': 'sr',
+        'use_cfg': apriori['use_cfg']
     })
-    if cfg is not None:
-        profiles.data["lidar_ratio"] = profiles.data.lidar_ratio.assign_attrs({
-            'use_cfg': 'True',
-            'cfg_file': cfg_path,
-            'use_default': str(not station_id in cfg),
-            'cfg_attributes': str(cfg.get('attributes'))
-        })
-        if cfg.get(station_id):
-            profiles.data["lidar_ratio"] = profiles.data.lidar_ratio.assign_attrs({
-                f'cfg_{station_id}': str(cfg.get(station_id)),
-            })
-    else:
+    if 'cfg' in apriori:
         profiles.data["lidar_ratio"] = profiles.data.lidar_ratio.assign_attrs({
-            'use_cfg': 'False'
+            'cfg': str(apriori['cfg'])
         })
 
     profiles.data["z_ref"] = ('time', z_ref)

diff --git a/docs/changelog.md b/docs/changelog.md
@@ -2,6 +2,11 @@
 
 :material-history:{ style="text-align: center; font-size: xx-large; display: block" }
 
+## 0.10.5
+Oct 25, 2024
+
+- change `aer_ifs.json` structure
+
 ## 0.10.4
 Oct 19, 2024
 

diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "aprofiles"
-version = "0.10.4"
+version = "0.10.5"
 description = "Analysis of atmospheric profilers measurements"
 authors = ["augustinm <augustinm@met.no>"]
 license = "GPL-3.0"