cloudnetpy 1.64.3__tar.gz → 1.64.4__tar.gz

{cloudnetpy-1.64.3/cloudnetpy.egg-info → cloudnetpy-1.64.4}/PKG-INFO

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

{cloudnetpy-1.64.3 → cloudnetpy-1.64.4}/cloudnetpy/instruments/ceilo.py

@@ -74,22 +74,28 @@ def ceilo2nc(
     range_corrected = site_meta.get("range_corrected", True)
     ceilo_obj.read_ceilometer_file(calibration_factor)
     ceilo_obj.check_beta_raw_shape()
+    n_negatives = _get_n_negatives(ceilo_obj)
     ceilo_obj.data["beta"] = ceilo_obj.calc_screened_product(
         ceilo_obj.data["beta_raw"],
         snr_limit,
         range_corrected=range_corrected,
+        n_negatives=n_negatives,
     )
     ceilo_obj.data["beta_smooth"] = ceilo_obj.calc_beta_smooth(
         ceilo_obj.data["beta"],
         snr_limit,
         range_corrected=range_corrected,
+        n_negatives=n_negatives,
     )
     if ceilo_obj.instrument is None or ceilo_obj.instrument.model is None:
         msg = "Failed to read ceilometer model"
         raise RuntimeError(msg)
-    if any(
-        model in ceilo_obj.instrument.model.lower()
-        for model in ("cl61", "chm15k", "chm15kx", "cl51", "cl31")
+    if (
+        any(
+            model in ceilo_obj.instrument.model.lower()
+            for model in ("cl61", "chm15k", "chm15kx", "cl51", "cl31")
+        )
+        and range_corrected
     ):
         mask = ceilo_obj.data["beta_smooth"].mask
         ceilo_obj.data["beta"] = ma.masked_where(mask, ceilo_obj.data["beta_raw"])
@@ -107,6 +113,19 @@ def ceilo2nc(
     return output.save_level1b(ceilo_obj, output_file, uuid)
 
 
+def _get_n_negatives(ceilo_obj: ClCeilo | Ct25k | LufftCeilo | Cl61d | Cs135) -> int:
+    is_old_chm_version = (
+        hasattr(ceilo_obj, "is_old_version") and ceilo_obj.is_old_version
+    )
+    is_ct25k = (
+        ceilo_obj.instrument is not None
+        and getattr(ceilo_obj.instrument, "model", "").lower() == "ct25k"
+    )
+    if is_old_chm_version or is_ct25k:
+        return 20
+    return 5
+
+
 def _initialize_ceilo(
     full_path: str,
     site_meta: dict,

{cloudnetpy-1.64.3 → cloudnetpy-1.64.4}/cloudnetpy/instruments/ceilometer.py

@@ -38,6 +38,7 @@ class Ceilometer:
         self,
         array: np.ndarray,
         snr_limit: int = 5,
+        n_negatives: int = 5,
         *,
         range_corrected: bool = True,
     ) -> np.ndarray:
@@ -47,13 +48,6 @@ class Ceilometer:
             self.noise_param,
             range_corrected=range_corrected,
         )
-        if (
-            self.instrument is not None
-            and getattr(self.instrument, "model", "").lower() == "ct25k"
-        ):
-            n_negatives = 20
-        else:
-            n_negatives = 5
         return noisy_data.screen_data(
             array,
             snr_limit=snr_limit,
@@ -64,6 +58,7 @@ class Ceilometer:
         self,
         beta: np.ndarray,
         snr_limit: int = 5,
+        n_negatives: int = 5,
         *,
         range_corrected: bool = True,
     ) -> np.ndarray:
@@ -82,6 +77,7 @@ class Ceilometer:
             beta_raw_smooth,
             is_smoothed=True,
             snr_limit=snr_limit,
+            n_negatives=n_negatives,
         )
 
     def prepare_data(self) -> None:

{cloudnetpy-1.64.3 → cloudnetpy-1.64.4}/cloudnetpy/instruments/lufft.py

@@ -23,6 +23,7 @@ class LufftCeilo(NcLidar):
         self.file_name = file_name
         self.site_meta = site_meta
         self.expected_date = expected_date
+        self.is_old_version = False
 
     def read_ceilometer_file(self, calibration_factor: float | None = None) -> None:
         """Reads data and metadata from Jenoptik netCDF file."""
@@ -42,6 +43,7 @@ class LufftCeilo(NcLidar):
         beta_raw = ma.masked_array(beta_raw)
         old_version = self._get_old_software_version()
         if old_version is not None:
+            self.is_old_version = True
             logging.warning(
                 "Software version %s. Assuming data not range corrected.",
                 old_version,

{cloudnetpy-1.64.3 → cloudnetpy-1.64.4}/cloudnetpy/version.py

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

{cloudnetpy-1.64.3 → cloudnetpy-1.64.4/cloudnetpy.egg-info}/PKG-INFO

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