cloudnetpy 1.96.4__tar.gz → 1.96.6__tar.gz

{cloudnetpy-1.96.4/cloudnetpy.egg-info → cloudnetpy-1.96.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cloudnetpy
-Version: 1.96.4
+Version: 1.96.6
 Summary: Python package for Cloudnet processing
 Author: Simo Tukiainen
 License: MIT License

{cloudnetpy-1.96.4 → cloudnetpy-1.96.6}/cloudnetpy/cli.py

@@ -2,6 +2,7 @@ import argparse
 import base64
 import concurrent.futures
 import datetime
+import functools
 import gzip
 import hashlib
 import importlib
@@ -385,9 +386,8 @@ def _process_instrument_product(
     fun: Callable
     match (product, instrument.instrument_id):
         case ("radar", _id) if "mira" in _id:
-            site_meta["range_correction_factor"] = calibration.get(
-                "range_correction_factor"
-            )
+            for key in ("range_correction_factor", "radar_constant"):
+                site_meta[key] = calibration.get(key)
             fun = instruments.mira2nc
         case ("radar", _id) if "rpg" in _id:
             fun = instruments.rpg2nc
@@ -401,7 +401,12 @@ def _process_instrument_product(
         case ("radar", _id) if "galileo" in _id:
             fun = instruments.galileo2nc
         case ("disdrometer", _id) if "parsivel" in _id:
-            fun = instruments.parsivel2nc
+            fun = functools.partial(
+                instruments.parsivel2nc,
+                telegram=calibration.get("telegram"),
+                field_separator=calibration.get("field_separator", ";"),
+                decimal_separator=calibration.get("decimal_separator", "."),
+            )
         case ("disdrometer", _id) if "thies" in _id:
             fun = instruments.thies2nc
         case ("disdrometer", _id) if "rd-80" in _id:

{cloudnetpy-1.96.4 → cloudnetpy-1.96.6}/cloudnetpy/disdronator/process.py

@@ -53,6 +53,11 @@ def process_l2(l1: DisdroL1) -> DisdroL2:
     data_raw = l1.data_raw[time_ind]
     interval = l1.interval[time_ind]
 
+    is_valid = interval > 0
+    time = time[is_valid]
+    data_raw = data_raw[is_valid]
+    interval = interval[is_valid]
+
     n_time = len(time)
     n_diameter = len(l1.diameter)
     n_particles = data_raw.reshape(n_time, -1).sum(axis=1)

{cloudnetpy-1.96.4 → cloudnetpy-1.96.6}/cloudnetpy/instruments/mira.py

@@ -42,7 +42,8 @@ def mira2nc(
         output_file: Output filename.
         site_meta: Dictionary containing information about the site. Required
             key-value pair is `name`. Optional `model` takes `mira-35` (default),
-            `mira-35s`, `mira-35c`, or `mira-10`.
+            `mira-35s`, `mira-35c`, or `mira-10`. Optional `radar_constant` (dB)
+            is used to calculate Zh from SNRg in old files without Zg.
         uuid: Set specific UUID for the file.
         date: Expected date as YYYY-MM-DD of all profiles in the file.
 
@@ -78,8 +79,9 @@ def mira2nc(
                 mira.date = date
             mira.sort_timestamps()
             mira.remove_duplicate_timestamps()
-            mira.linear_to_db(("Zh", "ldr", "SNR"))
             mira.screen_low_power()
+            mira.add_zh_from_snr()
+            mira.linear_to_db(("Zh", "ldr", "SNR"))
 
             if "snr_limit" in site_meta and site_meta["snr_limit"] is not None:
                 snr_limit = site_meta["snr_limit"]
@@ -240,6 +242,58 @@ class Mira(NcRadar):
         self.data["tpow"].data[:] *= 100
         self.data["tpow"].correction_factor = 100
 
+    def add_zh_from_snr(self) -> None:
+        """Calculates unfiltered Zh from SNRg in old mmclx files without Zg.
+
+        Old files contain only Ze, where signal classified as plankton
+        (insects) has been removed. Zh is calculated as
+        SNRg * range^2 * K / tpow, where the radar constant K (dB) is given
+        in `site_meta["radar_constant"]`. Without it, K is estimated from
+        Ze in the file.
+
+        Example case:
+
+        - Lindenberg 2007-06-16: K = -81.61 dB
+        """
+        if "Zg" in self.dataset.variables or "SNR" not in self.data:
+            return
+        if "tpow" not in self.data:
+            logging.warning("Variable tpow missing, can not calculate Zh from SNRg")
+            return
+        radar_constant = self.site_meta.get("radar_constant")
+        if radar_constant is None:
+            radar_constant = self._estimate_radar_constant()
+            if radar_constant is None:
+                logging.warning("Can not estimate radar_constant, using Ze")
+                return
+            logging.warning(
+                "No radar_constant given, using estimate from file: %s dB",
+                radar_constant,
+            )
+        logging.info("Variable Zg missing, calculating Zh from SNRg")
+        snrg = self.data["SNR"][:]
+        range_sq = np.array(self.getvar("range")) ** 2
+        tpow = self.data["tpow"][:]
+        factor = utils.db2lin(float(radar_constant)) / tpow
+        self.append_data(snrg * range_sq * factor[:, np.newaxis], "Zh")
+        self.data["radar_constant"] = CloudnetArray(
+            float(radar_constant), "radar_constant"
+        )
+
+    def _estimate_radar_constant(self) -> float | None:
+        """Estimates radar constant K (dB) from Ze = SNR * range^2 * K / tpow."""
+        try:
+            ze = ma.masked_less_equal(ma.masked_invalid(self.getvar("Ze")), 0)
+            snr = ma.masked_less_equal(ma.masked_invalid(self.getvar("SNR")), 0)
+            tpow = self.getvar("tpow")
+        except KeyError:
+            return None
+        range_sq = np.array(self.getvar("range")) ** 2
+        factor = ma.median(ze / (snr * range_sq), axis=1) * tpow
+        if ma.getmaskarray(factor).all():
+            return None
+        return round(float(utils.lin2db(ma.median(factor))), 2)
+
     def screen_invalid_ldr(self) -> None:
         """Masks LDR in MIRA STSR mode data.
         Is there a better way to identify this mode?
@@ -309,7 +363,8 @@ def _parse_input_files(
 
             keymap = _get_keymap(filetypes[0])
 
-            variables = list(keymap.keys())
+            # SNR and Ze are needed to recover Zh in old files without Zg
+            variables = [*keymap.keys(), "SNR"]
             concat_lib.concatenate_files(
                 valid_files,
                 input_filename,
@@ -418,6 +473,12 @@ ATTRIBUTES = {
     "tpow": MetaData(
         long_name="Average Transmit Power", units="W", dimensions=("time",)
     ),
+    "radar_constant": MetaData(
+        long_name="Radar constant",
+        units="dB",
+        comment="Zh = SNRg * range^2 * radar_constant / tpow",
+        dimensions=None,
+    ),
     "zenith_offset": MetaData(
         long_name="Zenith offset of the instrument",
         units="degrees",

{cloudnetpy-1.96.4 → cloudnetpy-1.96.6}/cloudnetpy/version.py

@@ -1,4 +1,4 @@
 MAJOR = 1
 MINOR = 96
-PATCH = 4
+PATCH = 6
 __version__ = f"{MAJOR}.{MINOR}.{PATCH}"

{cloudnetpy-1.96.4 → cloudnetpy-1.96.6/cloudnetpy.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cloudnetpy
-Version: 1.96.4
+Version: 1.96.6
 Summary: Python package for Cloudnet processing
 Author: Simo Tukiainen
 License: MIT License