cloudnetpy 1.62.1__tar.gz → 1.64.0__tar.gz

{cloudnetpy-1.62.1/cloudnetpy.egg-info → cloudnetpy-1.64.0}/PKG-INFO

@@ -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 → cloudnetpy-1.64.0}/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-1.62.1 → cloudnetpy-1.64.0}/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-1.62.1 → cloudnetpy-1.64.0}/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-1.62.1 → cloudnetpy-1.64.0}/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-1.62.1 → cloudnetpy-1.64.0}/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 → cloudnetpy-1.64.0/cloudnetpy.egg-info}/PKG-INFO

@@ -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