cloudnetpy 1.80.0__tar.gz → 1.80.2__tar.gz

{cloudnetpy-1.80.0/cloudnetpy.egg-info → cloudnetpy-1.80.2}/PKG-INFO

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

{cloudnetpy-1.80.0 → cloudnetpy-1.80.2}/cloudnetpy/categorize/categorize.py

@@ -145,10 +145,11 @@ def generate_categorize(
         return utils.time_grid(), data.radar.height
 
     def _close_all() -> None:
-        for field in fields(data):
-            obj = getattr(data, field.name)
-            if isinstance(obj, DataSource):
-                obj.close()
+        if "data" in locals():
+            for field in fields(data):
+                obj = getattr(data, field.name)
+                if isinstance(obj, DataSource):
+                    obj.close()
 
     try:
         radar = Radar(input_files["radar"])

{cloudnetpy-1.80.0 → cloudnetpy-1.80.2}/cloudnetpy/instruments/ceilo.py

@@ -121,6 +121,7 @@ def ceilo2nc(
                 ceilo_obj.data["depolarisation"].mask = ceilo_obj.data["beta"].mask
     ceilo_obj.screen_depol()
     ceilo_obj.screen_invalid_values()
+    ceilo_obj.screen_sunbeam()
     ceilo_obj.prepare_data()
     ceilo_obj.data_to_cloudnet_arrays()
     ceilo_obj.add_site_geolocation()

{cloudnetpy-1.80.0 → cloudnetpy-1.80.2}/cloudnetpy/instruments/ceilometer.py

@@ -137,6 +137,24 @@ class Ceilometer:
             msg = f"Invalid beta_raw shape: {beta_raw.shape}"
             raise ValidTimeStampError(msg)
 
+    def screen_sunbeam(self) -> None:
+        high_alt_mask = self.data["range"] > 10000
+        if not np.any(high_alt_mask):
+            return
+
+        is_data = ~self.data["beta"][:, high_alt_mask].mask
+        n_bins = 20
+
+        n_profiles, n_heights = is_data.shape
+        bin_size = n_heights // n_bins
+        reshaped = is_data[:, : bin_size * n_bins].reshape(n_profiles, n_bins, bin_size)
+
+        valid_profiles = np.any(reshaped, axis=2).sum(axis=1) < 15
+
+        for key, value in self.data.items():
+            if key == "time" or (isinstance(value, np.ndarray) and value.ndim == 2):
+                self.data[key] = value[valid_profiles]
+
 
 class NoisyData:
     def __init__(

{cloudnetpy-1.80.0 → cloudnetpy-1.80.2}/cloudnetpy/instruments/radiometrics.py

@@ -122,12 +122,15 @@ class RadiometricsMP:
                             logging.info("Skipping unknown record type %d", record_type)
                             unknown_record_types.add(record_type)
                         continue
+
+                    row_trimmed = [value for value in row if value != ""]
+
                     record = Record(
                         row_number=int(row[0]),
                         timestamp=_parse_datetime(row[1]),
                         block_type=block_type,
                         block_index=block_index,
-                        values=dict(zip(column_names, row[3:], strict=True)),
+                        values=dict(zip(column_names, row_trimmed[3:], strict=True)),
                     )
                     rows.append(record)
 
@@ -157,7 +160,7 @@ class RadiometricsMP:
                 # "LV2 Processor" values "Zenith" and "0.00:90.00" should be OK
                 # but "Angle20(N)" and similar should be skipped.
                 proc = record.values["LV2 Processor"]
-                if proc.startswith("Angle"):
+                if proc.startswith(("Angle", "Zenith26")):
                     skip_procs.add(proc)
                     continue
                 if title == "Temperature (K)":
@@ -204,6 +207,7 @@ class RadiometricsMP:
                 times.append(record.timestamp)
                 lwps.append(float(lwp))
                 iwvs.append(float(iwv))
+
         self.data["time"] = np.array(times, dtype="datetime64[s]")
         self.data["lwp"] = np.array(lwps)  # mm => kg m-2
         self.data["iwv"] = np.array(iwvs) * 10  # cm => kg m-2

{cloudnetpy-1.80.0 → cloudnetpy-1.80.2}/cloudnetpy/version.py

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

{cloudnetpy-1.80.0 → cloudnetpy-1.80.2/cloudnetpy.egg-info}/PKG-INFO

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