cloudnetpy 1.64.3__py3-none-any.whl → 1.64.4__py3-none-any.whl

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/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/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/version.py

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

{cloudnetpy-1.64.3.dist-info → cloudnetpy-1.64.4.dist-info}/METADATA

@@ -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.dist-info → cloudnetpy-1.64.4.dist-info}/RECORD

@@ -8,7 +8,7 @@ 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=GFFJFnt6oq0KFYsp4WMGGFDc1chnAA92fIy0n5IYMNM,72
+cloudnetpy/version.py,sha256=i_Co9w-oOI_xRZZ9bnCQKB0KyueIqMaA3uFL0Llm6LY,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
@@ -28,15 +28,15 @@ cloudnetpy/categorize/radar.py,sha256=C4R74E_jmLOJqXLrfhdrAitHRHHA79UYuChz9VLxy5
 cloudnetpy/instruments/__init__.py,sha256=_jejVwi_viSZehmAOkEqTNI-0-exGgAJ_bHW1IRRwTI,398
 cloudnetpy/instruments/basta.py,sha256=_OTnySd36ktvxk_swWBzbv_H4AVGlkF_Ce3KtPGD1rE,3758
 cloudnetpy/instruments/campbell_scientific.py,sha256=2WHfBKQjtRSl0AqvtPeX7G8Hdi3Dn0WbvoAppFOMbA8,5270
-cloudnetpy/instruments/ceilo.py,sha256=vmKRY-NLB042BLpmJn4sfufEwK5xAI2vOXLRr7K85bU,8981
-cloudnetpy/instruments/ceilometer.py,sha256=-aPEZs_r0Gxeu53PHeWAkZMB2BUdauS47tkL7RFxo6k,12078
+cloudnetpy/instruments/ceilo.py,sha256=xrI7iYNftKvGZf-3C_ESUNsu-QhXV43iWkDuKp3biZU,9552
+cloudnetpy/instruments/ceilometer.py,sha256=P33UXVQl7hLLWZc3NyNfrz6hvTyUAZRIP-g6H5Dpe9Y,11967
 cloudnetpy/instruments/cl61d.py,sha256=g6DNBFju3wYhLFl32DKmC8pUup7y-EupXoUU0fuoGGA,1990
 cloudnetpy/instruments/cloudnet_instrument.py,sha256=RG5HJxGM6p0F-IGyr85fvOizcMmgx48OeD_XeIsrgSU,3367
 cloudnetpy/instruments/copernicus.py,sha256=nmgqGOjVQFngj7BNbpcuCwA-W3yksvBbqn__iq7MyDk,6469
 cloudnetpy/instruments/galileo.py,sha256=yQBedd7dmDnwuWi1MtXOsg4-RyRx0uRAXumCY4YuH9k,4686
 cloudnetpy/instruments/hatpro.py,sha256=PD2wLmzzbeOticvg44cT3aJzQYsRnLekW9pBPOzjFLc,8514
 cloudnetpy/instruments/instruments.py,sha256=jG5TYnZ8bdCZXnI303ZsaJBEdSKaIjKMbkGtnq6kQX0,3261
-cloudnetpy/instruments/lufft.py,sha256=tip8UPqm1pelvIL-KvVkj9tx4B52gOQZ73lgf6lmd6Q,3630
+cloudnetpy/instruments/lufft.py,sha256=ugXF6pssHAAz1Y_hqPdpKuluAjxxHSR88xBmQuS6RlI,3705
 cloudnetpy/instruments/mira.py,sha256=EyzEBTpWfDlgaspZVuIfaP4l73GYSVnSzEzBZc0lZNg,9333
 cloudnetpy/instruments/mrr.py,sha256=efxqsxy0G-qj4uCWVZztgNwGxYooSxIpI6K2tYF36GA,5833
 cloudnetpy/instruments/nc_lidar.py,sha256=5gQG9PApnNPrHmS9_zanl8HEYIQuGRpbnzC3wfTcOyQ,1705
@@ -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.64.3.dist-info/LICENSE,sha256=wcZF72bdaoG9XugpyE95Juo7lBQOwLuTKBOhhtANZMM,1094
-cloudnetpy-1.64.3.dist-info/METADATA,sha256=RYIRnABCcnD8hAcyoXIvEHxLTJOuTHSmCUaCWaUUTVI,5784
-cloudnetpy-1.64.3.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
-cloudnetpy-1.64.3.dist-info/top_level.txt,sha256=ibSPWRr6ojS1i11rtBFz2_gkIe68mggj7aeswYfaOo0,16
-cloudnetpy-1.64.3.dist-info/RECORD,,
+cloudnetpy-1.64.4.dist-info/LICENSE,sha256=wcZF72bdaoG9XugpyE95Juo7lBQOwLuTKBOhhtANZMM,1094
+cloudnetpy-1.64.4.dist-info/METADATA,sha256=f_OMmWbN7kTFNYGnHhZuyoC2mqK3A_lZjojPxVYyrYc,5784
+cloudnetpy-1.64.4.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
+cloudnetpy-1.64.4.dist-info/top_level.txt,sha256=ibSPWRr6ojS1i11rtBFz2_gkIe68mggj7aeswYfaOo0,16
+cloudnetpy-1.64.4.dist-info/RECORD,,