cloudnetpy 1.93.0__tar.gz → 1.93.2__tar.gz

{cloudnetpy-1.93.0/cloudnetpy.egg-info → cloudnetpy-1.93.2}/PKG-INFO

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

{cloudnetpy-1.93.0 → cloudnetpy-1.93.2}/cloudnetpy/cloudnetarray.py

@@ -54,7 +54,7 @@ class CloudnetArray:
             self.data = utils.db2lin(self.data)
             self.units = ""
 
-    def mask_indices(self, ind: list) -> None:
+    def mask_indices(self, ind: list | tuple) -> None:
         """Masks data from given indices."""
         self.data[ind] = ma.masked
 

{cloudnetpy-1.93.0 → cloudnetpy-1.93.2}/cloudnetpy/instruments/weather_radar.py

@@ -45,6 +45,7 @@ def wr2nc(
     wr = WeatherRadar(input_files, site_meta, date)
     wr.sort_and_dedup_timestamps()
     wr.convert_to_cloudnet_arrays()
+    wr.screen_clutter()
     wr.screen_noise()
     wr.add_meta()
     attributes = output.add_time_attribute(ATTRIBUTES, wr.date)
@@ -145,11 +146,25 @@ class WeatherRadar(CloudnetInstrument):
             self.scalars["NEZ"], "calibration_reflectivity_factor"
         )
 
+    def screen_clutter(self) -> None:
+        n_range = len(self.data["range"][:])
+        max_range = 10
+        threshold = -10  # dBZ
+        mean_z = np.mean(self.data["Zh"].data[:, :max_range], axis=0)
+        is_clutter = mean_z > threshold
+        ind_last = np.nonzero(is_clutter)[0][-1]
+        mask = np.zeros(n_range, dtype=np.bool)
+        mask[: ind_last + 1] = True
+        self._screen_indices((slice(None), mask))
+
     def screen_noise(self) -> None:
         is_noise = self.data["SNR"].data < 0
+        self._screen_indices(is_noise)
+
+    def _screen_indices(self, ind: list | tuple) -> None:
         for cloudnet_array in self.data.values():
             if cloudnet_array.data.ndim == 2:
-                cloudnet_array.mask_indices(is_noise)
+                cloudnet_array.mask_indices(ind)
 
 
 class InvalidRangeError(CloudnetException):

{cloudnetpy-1.93.0 → cloudnetpy-1.93.2}/cloudnetpy/model_evaluation/file_handler.py

@@ -110,6 +110,8 @@ def _add_source(
     ]
     root_group.source = "\n".join(filenames)
     root_group.source_file_uuids = output.get_source_uuids([model_obj, obs_obj])
+    if hasattr(obs_obj.dataset, "source_instrument_pids"):
+        root_group.source_instrument_pids = obs_obj.dataset.source_instrument_pids
 
 
 def add_time_attribute(date: datetime) -> dict:

{cloudnetpy-1.93.0 → cloudnetpy-1.93.2}/cloudnetpy/version.py

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

{cloudnetpy-1.93.0 → cloudnetpy-1.93.2/cloudnetpy.egg-info}/PKG-INFO

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