cloudnetpy 1.92.2__tar.gz → 1.92.4__tar.gz

{cloudnetpy-1.92.2/cloudnetpy.egg-info → cloudnetpy-1.92.4}/PKG-INFO

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

{cloudnetpy-1.92.2 → cloudnetpy-1.92.4}/cloudnetpy/cli.py

@@ -120,23 +120,34 @@ def _process_epsilon_radar(
 
 def _process_categorize(
     input_files: dict,
-    instrument_prefs: dict[str, str],
+    instrument_prefs: dict[str, list[str]],
     args: argparse.Namespace,
     client: APIClient,
 ) -> str | None:
     cat_filepath = _create_categorize_filepath(args)
 
     def fetch_instrument(product: str) -> tuple[str, str | None]:
-        source = instrument_prefs.get(product)
-        filepath = _fetch_product(args, product, client, source=source)
-        if filepath is None and source:
+        prefs = instrument_prefs.get(product, [])
+        for source in prefs:
+            filepath = _fetch_product(args, product, client, source=source)
+            if filepath is None and product == "lidar":
+                # Doppler lidars (e.g. halo) upload as "doppler-lidar" product,
+                # but categorize can use those files as lidar input.
+                filepath = _fetch_product(args, "doppler-lidar", client, source=source)
+                if filepath:
+                    logging.info(
+                        "Using doppler-lidar product from '%s' as lidar input",
+                        source,
+                    )
+            if filepath:
+                return product, filepath
+        if prefs:
             logging.info(
-                "Preferred instrument '%s' not found for %s, using available",
-                source,
+                "Preferred instruments for %s not found (%s), using available",
                 product,
+                ", ".join(prefs),
             )
-            filepath = _fetch_product(args, product, client)
-        return product, filepath
+        return product, _fetch_product(args, product, client)
 
     def fetch_mwr() -> tuple[str, str | None]:
         try:
@@ -383,17 +394,17 @@ def _filter_by_suffix(meta: list[RawMetadata], product: str) -> list[RawMetadata
 
 
 def _get_source_instruments(
-    products: list[str], instrument_prefs: dict[str, str], client: APIClient
+    products: list[str], instrument_prefs: dict[str, list[str]], client: APIClient
 ) -> dict[str, list[str]]:
     source_instruments = {}
     for product in products:
         prod, model = _parse_instrument(product)
-        if model is None:
-            pref = instrument_prefs.get(prod)
-            if pref is not None and not _is_pid(pref):
-                model = pref
+        if model is not None:
+            models = [model]
+        else:
+            models = [p for p in instrument_prefs.get(prod, []) if not _is_pid(p)]
         all_possible = client.product(prod).source_instrument_ids
-        if all_possible and (match := [i for i in all_possible if i == model]):
+        if all_possible and (match := [m for m in models if m in all_possible]):
             source_instruments[prod] = match
         else:
             source_instruments[prod] = list(all_possible)
@@ -422,11 +433,16 @@ def _get_product_sources(
     return source_products
 
 
-def _parse_instrument_preferences(args: list[str] | None) -> dict[str, str]:
-    """Parses instrument preferences like 'radar:mira-35' into a dict."""
+def _parse_instrument_preferences(args: list[str] | None) -> dict[str, list[str]]:
+    """Parses instrument preferences into ordered preference lists per product.
+
+    Each argument has the form 'product:value' where value is an instrument_id,
+    a PID, or a comma-separated list of these. Repeated flags for the same
+    product accumulate; ordering reflects user preference (first match wins).
+    """
     if not args:
         return {}
-    prefs = {}
+    prefs: dict[str, list[str]] = {}
     for arg in args:
         if ":" not in arg:
             msg = (
@@ -435,7 +451,15 @@ def _parse_instrument_preferences(args: list[str] | None) -> dict[str, str]:
             )
             raise argparse.ArgumentTypeError(msg)
         product, value = arg.split(":", 1)
-        prefs[product] = value
+        values = [v.strip() for v in value.split(",") if v.strip()]
+        for v in values:
+            if ":" in v and not _is_pid(v):
+                msg = (
+                    f"Invalid instrument value '{v}'; did you forget to "
+                    "repeat -i for the next product?"
+                )
+                raise argparse.ArgumentTypeError(msg)
+        prefs.setdefault(product, []).extend(values)
     return prefs
 
 
@@ -450,18 +474,21 @@ def _parse_instrument(s: str) -> tuple[str, str | None]:
 
 
 def _select_instrument(
-    meta: list[RawMetadata], product: str, pref: str | None = None
+    meta: list[RawMetadata], product: str, prefs: list[str] | None = None
 ) -> Instrument | None:
     instruments = _get_unique_instruments(meta)
     if len(instruments) == 0:
         logging.info("No instruments found")
         return None
-    if pref:
-        matches = [i for i in instruments if _instrument_matches(i, pref)]
-        if matches:
-            logging.info("Selected instrument by preference: %s", matches[0].name)
-            return matches[0]
-        logging.info("Preferred instrument '%s' not found, falling back", pref)
+    if prefs:
+        for pref in prefs:
+            matches = [i for i in instruments if _instrument_matches(i, pref)]
+            if matches:
+                logging.info("Selected instrument by preference: %s", matches[0].name)
+                return matches[0]
+        logging.info(
+            "Preferred instruments not found (%s), falling back", ", ".join(prefs)
+        )
     if len(instruments) > 1:
         logging.info("Multiple instruments found for %s", product)
         logging.info("Please specify which one to use")
@@ -557,7 +584,7 @@ def _download_product_file(
 
 
 def _shorten_pid(pid: str) -> str:
-    return pid.split(".")[-1][:8]
+    return pid.rsplit(".", maxsplit=1)[-1][:8]
 
 
 def _check_input(files: list) -> None:
@@ -687,9 +714,11 @@ def main() -> None:
         help=(
             "Preferred instrument for a product, e.g. 'radar:mira-35', "
             "'lidar:cl61d', or 'radar:https://hdl.handle.net/<pid>'. The "
-            "value is either an instrument_id or an instrument PID. Applies "
-            "both to instrument processing and categorize input. Can be "
-            "specified multiple times."
+            "value is either an instrument_id or an instrument PID. Multiple "
+            "preferences can be given as a comma-separated list (first match "
+            "wins), e.g. 'lidar:halo-doppler-lidar,cl61d'. Applies both to "
+            "instrument processing and categorize input. Can be specified "
+            "multiple times."
         ),
         default=None,
     )

{cloudnetpy-1.92.2 → cloudnetpy-1.92.4}/cloudnetpy/disdronator/parsivel.py

@@ -294,7 +294,7 @@ def _read_lines(
 def _expand_spectrum(m: re.Match) -> bytes:
     if m[1] == b"ZERO":
         return b"0;" * 1024
-    return b";".join([x if x else b"0" for x in m[1].split(b";")])
+    return b";".join([x or b"0" for x in m[1].split(b";")])
 
 
 def _read_typ_op4a(content: bytes) -> dict:

{cloudnetpy-1.92.2 → cloudnetpy-1.92.4}/cloudnetpy/instruments/weather_station.py

@@ -78,6 +78,8 @@ def ws2nc(
         ws = ClujWS(weather_station_file, site_meta)
     elif site_meta["name"] == "Falkenberg":
         ws = FalkenbergWS(weather_station_file, site_meta)
+    elif site_meta["name"] == "Potenza":
+        ws = PotenzaWS(weather_station_file, site_meta)
     else:
         msg = "Unsupported site"
         raise ValueError(msg)
@@ -291,6 +293,35 @@ class MaidoWS(PalaiseauWS):
         pass
 
 
+class PotenzaWS(PalaiseauWS):
+    expected_header_identifiers = (
+        "DateTime(yyyy-mm-ddThh:mm:ssZ)",
+        "WindspeedMaximumvalue(m/s)",
+        "WindspeedAveragevalue(m/s)",
+        "Winddirection(degres)",
+        "Airtemperature(°C)",
+        "Relativehumidity(%)",
+        "Pressure(hPa)",
+        "Precipitationrate(mm/min)",
+        "24-hrcumulatedprecipitation(mm)",
+    )
+
+    keys = (
+        "_wind_speed_max",
+        "wind_speed",
+        "wind_direction",
+        "air_temperature",
+        "relative_humidity",
+        "air_pressure",
+        # Skip rainfall as they seem to contain strange values:
+        "_rainfall_rate",
+        "_rainfall_amount",
+    )
+
+    def convert_rainfall_amount(self) -> None:
+        pass
+
+
 class BucharestWS(PalaiseauWS):
     def convert_rainfall_rate(self) -> None:
         rainfall_rate = self.data["rainfall_rate"][:]

{cloudnetpy-1.92.2 → cloudnetpy-1.92.4}/cloudnetpy/model_evaluation/file_handler.py

@@ -87,7 +87,7 @@ def save_downsampled_file(
     dimensions = {"time": len(obj.time), "level": len(obj.data["level"][:])}
     with output.init_file(file_name, dimensions, obj.data, uuid) as root_group:
         _augment_global_attributes(root_group)
-        root_group.cloudnet_file_type = "l3-" + id_mark.split("_")[0]
+        root_group.cloudnet_file_type = "l3-" + id_mark.split("_", maxsplit=1)[0]
         root_group.title = (
             f"Downsampled {id_mark.capitalize().replace('_', ' of ')} "
             f"from {obj.dataset.location}"

{cloudnetpy-1.92.2 → cloudnetpy-1.92.4}/cloudnetpy/output.py

@@ -263,7 +263,7 @@ def merge_history(
     def parse_time(line: str) -> datetime.datetime:
         try:
             return datetime.datetime.strptime(
-                line.split(" - ")[0].strip(), "%Y-%m-%d %H:%M:%S %z"
+                line.split(" - ", maxsplit=1)[0].strip(), "%Y-%m-%d %H:%M:%S %z"
             )
         except ValueError:
             return datetime.datetime.min.replace(

{cloudnetpy-1.92.2 → cloudnetpy-1.92.4}/cloudnetpy/plotting/plot_meta.py

@@ -414,7 +414,6 @@ ATTRIBUTES = {
         "cloud_fraction": PlotMeta(
             cmap="Blues",
             plot_range=(0, 1),
-            mask_zeros=True,
         ),
         "Tw": PlotMeta(
             cmap="RdBu_r",

{cloudnetpy-1.92.2 → cloudnetpy-1.92.4}/cloudnetpy/plotting/plotting.py

@@ -636,6 +636,8 @@ class Plot2D(Plot):
         else:
             min_x, max_x = 0, 24
         self._mark_gaps(figure_data, min_x=min_x, max_x=max_x)
+        if self.sub_plot.variable.name == "cloud_fraction":
+            self._data[self._data == 0] = ma.masked
         if any(
             key in self.sub_plot.variable.name for key in ("status", "classification")
         ):

{cloudnetpy-1.92.2 → cloudnetpy-1.92.4}/cloudnetpy/utils.py

@@ -566,16 +566,16 @@ def l2norm(*args: npt.NDArray | float) -> ma.MaskedArray:
         The l2 norm.
 
     """
-    arg_cpy: float | npt.NDArray
+    arg_copy: float | npt.NDArray
     ss: float | npt.NDArray = 0
     for arg in args:
         if isinstance(arg, ma.MaskedArray):
             # Raise only non-masked values, not sure if this is needed...
-            arg_cpy = ma.copy(arg)
-            arg_cpy[~arg.mask] = arg_cpy[~arg.mask] ** 2
+            arg_copy = ma.copy(arg)
+            arg_copy[~arg.mask] = arg_copy[~arg.mask] ** 2
         else:
-            arg_cpy = arg**2
-        ss = ss + arg_cpy
+            arg_copy = arg**2
+        ss = ss + arg_copy
     return ma.sqrt(ss)
 
 

{cloudnetpy-1.92.2 → cloudnetpy-1.92.4}/cloudnetpy/version.py

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

{cloudnetpy-1.92.2 → cloudnetpy-1.92.4/cloudnetpy.egg-info}/PKG-INFO

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