cloudnetpy 1.62.1__py3-none-any.whl → 1.64.0__py3-none-any.whl

cloudnetpy/categorize/categorize.py

@@ -18,6 +18,7 @@ def generate_categorize(
     input_files: dict,
     output_file: str,
     uuid: str | None = None,
+    options: dict | None = None,
 ) -> str:
     """Generates Cloudnet Level 1c categorize file.
 
@@ -33,6 +34,7 @@ def generate_categorize(
             RPG level 0 files.
         output_file: Full path of the output file.
         uuid: Set specific UUID for the file.
+        options: Dictionary containing optional parameters.
 
     Returns:
         UUID of the generated file.
@@ -138,7 +140,7 @@ def generate_categorize(
                 data["disdrometer"] = Disdrometer(input_files["disdrometer"])
             except DisdrometerDataError as err:
                 logging.warning("Unable to use disdrometer: %s", err)
-        data["model"] = Model(input_files["model"], data["radar"].altitude)
+        data["model"] = Model(input_files["model"], data["radar"].altitude, options)
         time, height = _define_dense_grid()
         valid_ind = _interpolate_to_cloudnet_grid()
         if not valid_ind:

cloudnetpy/categorize/containers.py

@@ -74,13 +74,28 @@ class ClassData:
 
     def _find_rain_from_radar_echo(self) -> np.ndarray:
         gate_number = 3
-        threshold = 0
+        threshold = {"z": 3, "v": 0, "ldr": -15}
         z = self.z[:, gate_number]
-        return np.where((~ma.getmaskarray(z)) & (z > threshold), 1, 0)
+        v = self.v[:, gate_number]
+        if hasattr(self, "ldr"):
+            ldr = self.ldr[:, gate_number]
+        elif hasattr(self, "sldr"):
+            ldr = self.sldr[:, gate_number]
+        else:
+            ldr = np.full(self.time.shape, threshold["ldr"] - 1)
+
+        return np.where(
+            (~ma.getmaskarray(z))
+            & (z > threshold["z"])
+            & (v < threshold["v"])
+            & (ldr < threshold["ldr"]),
+            1,
+            0,
+        )
 
     def _find_rain_from_disdrometer(self) -> ma.MaskedArray:
         threshold_mm_h = 0.25  # Standard threshold for drizzle -> rain
-        threshold_particles = 10  # This is arbitrary and should be better tested
+        threshold_particles = 30  # This is arbitrary and should be better tested
         threshold_rate = threshold_mm_h * MM_H_TO_M_S
         try:
             rainfall_rate = self.data["disdrometer"].data["rainfall_rate"].data

cloudnetpy/categorize/insects.py

@@ -148,8 +148,7 @@ def _screen_insects(
         prob[(above_liquid == 1) & (insect_prob_no_ldr > 0)] = 0
 
     def _screen_rainy_profiles() -> None:
-        rain_smoothed = _smooth_rain(obs.time, obs.is_rain)
-        prob[rain_smoothed == 1, :] = 0
+        prob[obs.is_rain == 1, :] = 0
 
     prob = np.copy(insect_prob)
     _screen_liquid_layers()
@@ -157,15 +156,3 @@ def _screen_insects(
     _screen_above_liquid()
     _screen_rainy_profiles()
     return prob
-
-
-def _smooth_rain(time: np.ndarray, is_rain: np.ndarray) -> np.ndarray:
-    is_rain_smoothed = np.copy(is_rain)
-    time_buffer = 5  # minutes
-    n_profiles = len(is_rain)
-    n_steps = utils.n_elements(time, time_buffer, "time")
-    for rain_idx in np.where(is_rain)[0]:
-        idx_start = max(0, rain_idx - n_steps)
-        idx_end = min(rain_idx + n_steps, n_profiles)
-        is_rain_smoothed[idx_start : idx_end + 1] = True
-    return is_rain_smoothed

cloudnetpy/categorize/model.py

@@ -17,6 +17,7 @@ class Model(DataSource):
     Args:
         model_file: File name of the NWP model file.
         alt_site: Altitude of the site above mean sea level (m).
+        options: Dictionary containing optional parameters.
 
     Attributes:
         source_type (str): Model type, e.g. 'gdas1' or 'ecwmf'.
@@ -41,8 +42,9 @@ class Model(DataSource):
     )
     fields_sparse = (*fields_dense, "q", "uwind", "vwind")
 
-    def __init__(self, model_file: str, alt_site: float):
+    def __init__(self, model_file: str, alt_site: float, options: dict | None = None):
         super().__init__(model_file)
+        self.options = options
         self.source_type = _find_model_type(model_file)
         self.model_heights = self._get_model_heights(alt_site)
         self.mean_height = _calc_mean_height(self.model_heights)
@@ -113,7 +115,11 @@ class Model(DataSource):
     def calc_wet_bulb(self) -> None:
         """Calculates wet-bulb temperature in dense grid."""
         wet_bulb_temp = atmos_utils.calc_wet_bulb_temperature(self.data_dense)
+        offset = (self.options or {}).get("temperature_offset", 0)
+        wet_bulb_temp += offset
         self.append_data(wet_bulb_temp, "Tw", units="K")
+        if offset:
+            self.data["Tw"].temperature_correction_applied = offset
 
     def screen_sparse_fields(self) -> None:
         """Removes model fields that we don't want to write in the output."""

cloudnetpy/version.py

@@ -1,4 +1,4 @@
 MAJOR = 1
-MINOR = 62
-PATCH = 1
+MINOR = 64
+PATCH = 0
 __version__ = f"{MAJOR}.{MINOR}.{PATCH}"

{cloudnetpy-1.62.1.dist-info → cloudnetpy-1.64.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cloudnetpy
-Version: 1.62.1
+Version: 1.64.0
 Summary: Python package for Cloudnet processing
 Author: Simo Tukiainen
 License: MIT License

{cloudnetpy-1.62.1.dist-info → cloudnetpy-1.64.0.dist-info}/RECORD

@@ -8,21 +8,21 @@ cloudnetpy/metadata.py,sha256=v_VDo2vbdTxB0zIsfP69IcrwSKiRlLpsGdq6JPI4CoA,5306
 cloudnetpy/output.py,sha256=YkCaxVkG_Mt2hng_IVnhygHteV4UMKzKALkeFZwFJL8,14822
 cloudnetpy/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cloudnetpy/utils.py,sha256=JV0Fawnme1HoZgoiidV3eIzsn6vx0AEjBNmI1CcrBsA,28517
-cloudnetpy/version.py,sha256=wheZa4Kklouj0BjH963Wn0-elHVUt16TN53szDdSzNc,72
+cloudnetpy/version.py,sha256=Vd42PiP_XdZoz_QmRiX6hYj94MB5XO3CY5sRjjHTfPQ,72
 cloudnetpy/categorize/__init__.py,sha256=gP5q3Vis1y9u9OWgA_idlbjfWXYN_S0IBSWdwBhL_uU,69
 cloudnetpy/categorize/atmos.py,sha256=G4DmEJCt1FAPYyt7oXzBH47JTeb5lUOGDakkviOXblE,12390
 cloudnetpy/categorize/atmos_utils.py,sha256=64uenj2uxj3P3Blaq_pBN1pBjcF-X4LYNt-uTOjvevg,3778
-cloudnetpy/categorize/categorize.py,sha256=aoIxbBEwUFO-Xx_oofKM68aL0KEJuGi3OaWMKCCuUK8,17827
+cloudnetpy/categorize/categorize.py,sha256=owM4ebqJCHnCWHDMELv6Qa8zM_7qKcBpzJOfPva1Py0,17929
 cloudnetpy/categorize/classify.py,sha256=a-0bVCtynGfORnDGTsPuzqkuDeOOR_OMz5ai9NsMuic,9870
-cloudnetpy/categorize/containers.py,sha256=aL_55tTDYjICS_TnG1u0FwBeXDS0S4mfDMU0kY_DUbs,4312
+cloudnetpy/categorize/containers.py,sha256=L4UaihDfeMCADZiKdII5NCP49ZNlodCoM9X3yxEfJ_A,4748
 cloudnetpy/categorize/disdrometer.py,sha256=keU3pFvKtk840A0oLwAyNDuqOCswBPJEKf2bV0YWyA8,2004
 cloudnetpy/categorize/droplet.py,sha256=894VHdL9ScaB8f1oxXwM2la4ShXd-uWywQDINoaoiD8,8687
 cloudnetpy/categorize/falling.py,sha256=aI09_6H24x34lYr3vnKIgjWB0wzTkxOA6wE-gkdf6bs,4386
 cloudnetpy/categorize/freezing.py,sha256=c4k5AIgfBpvw64EaVVVYPi2Fx4SpHk1cyfceE1ydD28,3755
-cloudnetpy/categorize/insects.py,sha256=0pHJ-T-j3G9dbDU82xe8gsnVRyww3-ljdZ1SMAP9UKQ,5765
+cloudnetpy/categorize/insects.py,sha256=9J5agmktit8Or66GGNue-bThiaG9rB2SuPNZBXI7FCE,5243
 cloudnetpy/categorize/lidar.py,sha256=YQrM_LOz8NQrrD9l9HyujV1GSGwkQ8LMqXN13bEJRW4,2605
 cloudnetpy/categorize/melting.py,sha256=mYdOKxfTC2InB8NdOPwr_7NpbouQMm-9f2Q1kfTqIJE,6262
-cloudnetpy/categorize/model.py,sha256=hSmE-3hCzbpA26AcMtSeDUVlLHvtmODy_37b2kJO2eA,5536
+cloudnetpy/categorize/model.py,sha256=rLyx9SKz56BmQ809PwwhCnbusshUuYPoqhLJbnZvrt8,5842
 cloudnetpy/categorize/mwr.py,sha256=rTyVYaMotXl7LRgRQBBcrLInsrWGl4sFdZ4pyM4jXMc,1436
 cloudnetpy/categorize/radar.py,sha256=C4R74E_jmLOJqXLrfhdrAitHRHHA79UYuChz9VLxy58,13722
 cloudnetpy/instruments/__init__.py,sha256=_jejVwi_viSZehmAOkEqTNI-0-exGgAJ_bHW1IRRwTI,398
@@ -108,8 +108,8 @@ cloudnetpy/products/mie_lu_tables.nc,sha256=It4fYpqJXlqOgL8jeZ-PxGzP08PMrELIDVe5
 cloudnetpy/products/mwr_tools.py,sha256=3esU5cG5GI2WVmOENqrJ0FbMuxLegADv7q8TB0RorGg,4674
 cloudnetpy/products/product_tools.py,sha256=VNw2diJj30POz68-3qNVkJP7r9AUspT_d1Fp0BbeIx8,10414
 docs/source/conf.py,sha256=IKiFWw6xhUd8NrCg0q7l596Ck1d61XWeVjIFHVSG9Og,1490
-cloudnetpy-1.62.1.dist-info/LICENSE,sha256=wcZF72bdaoG9XugpyE95Juo7lBQOwLuTKBOhhtANZMM,1094
-cloudnetpy-1.62.1.dist-info/METADATA,sha256=3HgHFWQOFDZ4zxvdTjICRhRbGgW2ODI4hxvPJPm9158,5784
-cloudnetpy-1.62.1.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
-cloudnetpy-1.62.1.dist-info/top_level.txt,sha256=ibSPWRr6ojS1i11rtBFz2_gkIe68mggj7aeswYfaOo0,16
-cloudnetpy-1.62.1.dist-info/RECORD,,
+cloudnetpy-1.64.0.dist-info/LICENSE,sha256=wcZF72bdaoG9XugpyE95Juo7lBQOwLuTKBOhhtANZMM,1094
+cloudnetpy-1.64.0.dist-info/METADATA,sha256=FWBF4HeLgWopUcCrb5w4RlFOrmVaNdym-v2dZgVD0Fc,5784
+cloudnetpy-1.64.0.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
+cloudnetpy-1.64.0.dist-info/top_level.txt,sha256=ibSPWRr6ojS1i11rtBFz2_gkIe68mggj7aeswYfaOo0,16
+cloudnetpy-1.64.0.dist-info/RECORD,,