cloudnetpy 1.79.0__py3-none-any.whl → 1.80.0__py3-none-any.whl

cloudnetpy/instruments/ceilo.py

@@ -1,8 +1,11 @@
 """Module for reading and processing Vaisala / Lufft ceilometers."""
 
+import logging
 from itertools import islice
 
 import netCDF4
+import numpy as np
+from ceilopyter import read_ct25k
 from numpy import ma
 
 from cloudnetpy import output, utils
@@ -71,36 +74,51 @@ def ceilo2nc(
     ceilo_obj = _initialize_ceilo(full_path, site_meta, date)
     calibration_factor = site_meta.get("calibration_factor")
     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 range_corrected is False:
+        logging.warning("Raw data not range-corrected.")
+    if isinstance(ceilo_obj, Ct25k):
+        c_obj = read_ct25k(full_path, calibration_factor, range_corrected)
+        ceilo_obj.data["beta"] = c_obj.beta
+        ceilo_obj.data["beta_raw"] = c_obj.beta_raw
+        ceilo_obj.data["time"] = c_obj.time
+        ceilo_obj.data["range"] = c_obj.range
+        if c_obj.zenith_angle is not None:
+            ceilo_obj.data["zenith_angle"] = np.median(c_obj.zenith_angle)
+        ceilo_obj.data["calibration_factor"] = c_obj.calibration_factor
+        ceilo_obj.sort_time()
+        ceilo_obj.screen_date()
+        ceilo_obj.convert_to_fraction_hour()
+    else:
+        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,
         )
-        and range_corrected
-    ):
-        mask = ceilo_obj.data["beta_smooth"].mask
-        ceilo_obj.data["beta"] = ma.masked_where(mask, ceilo_obj.data["beta_raw"])
-        ceilo_obj.data["beta"][ceilo_obj.data["beta"] <= 0] = ma.masked
-        if "depolarisation" in ceilo_obj.data:
-            ceilo_obj.data["depolarisation"].mask = ceilo_obj.data["beta"].mask
+        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")
+            )
+            and range_corrected
+        ):
+            mask = ceilo_obj.data["beta_smooth"].mask
+            ceilo_obj.data["beta"] = ma.masked_where(mask, ceilo_obj.data["beta_raw"])
+            ceilo_obj.data["beta"][ceilo_obj.data["beta"] <= 0] = ma.masked
+            if "depolarisation" in ceilo_obj.data:
+                ceilo_obj.data["depolarisation"].mask = ceilo_obj.data["beta"].mask
     ceilo_obj.screen_depol()
     ceilo_obj.screen_invalid_values()
     ceilo_obj.prepare_data()

cloudnetpy/instruments/ceilometer.py

@@ -1,5 +1,5 @@
 import logging
-from typing import TYPE_CHECKING, NamedTuple
+from typing import NamedTuple
 
 import numpy as np
 from numpy import ma
@@ -8,11 +8,9 @@ from scipy.ndimage import gaussian_filter
 from cloudnetpy import utils
 from cloudnetpy.cloudnetarray import CloudnetArray
 from cloudnetpy.exceptions import ValidTimeStampError
+from cloudnetpy.instruments.instruments import Instrument
 from cloudnetpy.utils import Epoch
 
-if TYPE_CHECKING:
-    from cloudnetpy.instruments.instruments import Instrument
-
 
 class NoiseParam(NamedTuple):
     """Noise parameters. Values are weakly instrument-dependent."""
@@ -47,6 +45,7 @@ class Ceilometer:
             self.data,
             self.noise_param,
             range_corrected=range_corrected,
+            instrument=self.instrument,
         )
         return noisy_data.screen_data(
             array,
@@ -66,6 +65,7 @@ class Ceilometer:
             self.data,
             self.noise_param,
             range_corrected=range_corrected,
+            instrument=self.instrument,
         )
         beta_raw = ma.copy(self.data["beta_raw"])
         cloud_ind, cloud_values, cloud_limit = _estimate_clouds_from_beta(beta)
@@ -145,10 +145,12 @@ class NoisyData:
         noise_param: NoiseParam,
         *,
         range_corrected: bool = True,
+        instrument: Instrument | None = None,
     ):
         self.data = data
         self.noise_param = noise_param
         self.range_corrected = range_corrected
+        self.instrument = instrument
 
     def screen_data(
         self,
@@ -268,14 +270,17 @@ class NoisyData:
         data[:, ind] = data[:, ind] * self._get_range_squared()[ind]
 
     def _get_altitude_ind(self) -> tuple:
-        if self.range_corrected is False:
-            alt_limit = 2400.0
-            logging.warning(
-                "Raw data not range-corrected, correcting below %s m",
-                alt_limit,
-            )
-        else:
-            alt_limit = 1e12
+        alt_limit = 1e12  # All altitudes
+        if (
+            self.range_corrected is False
+            and self.instrument is not None
+            and self.instrument.model is not None
+        ):
+            model = self.instrument.model.lower()
+            if model == "ct25k":
+                alt_limit = 0.0
+            elif model in ("cl31", "cl51"):
+                alt_limit = 2400.0
         return np.where(self.data["range"] < alt_limit)
 
     def _get_range_squared(self) -> np.ndarray:

cloudnetpy/instruments/vaisala.py

@@ -46,18 +46,18 @@ class VaisalaCeilo(Ceilometer):
         self.data["calibration_factor"] = calibration_factor or 1.0
         self.data["beta_raw"] *= self.data["calibration_factor"]
         self.data["zenith_angle"] = np.median([d.tilt_angle for d in data])
-        self._sort_time()
-        self._screen_date()
-        self._convert_to_fraction_hour()
+        self.sort_time()
+        self.screen_date()
+        self.convert_to_fraction_hour()
         self._store_ceilometer_info()
 
-    def _sort_time(self):
+    def sort_time(self):
         """Sorts timestamps and removes duplicates."""
         time = self.data["time"]
         _time, ind = np.unique(time, return_index=True)
         self._screen_time_indices(ind)
 
-    def _screen_date(self):
+    def screen_date(self):
         time = self.data["time"]
         if self.sane_date is None:
             self.sane_date = time[0].date()
@@ -79,7 +79,7 @@ class VaisalaCeilo(Ceilometer):
             if hasattr(array, "shape") and array.shape[:1] == (n_time,):
                 self.data[key] = self.data[key][valid_indices]
 
-    def _convert_to_fraction_hour(self):
+    def convert_to_fraction_hour(self):
         time = self.data["time"]
         midnight = time[0].replace(hour=0, minute=0, second=0, microsecond=0)
         hour = datetime.timedelta(hours=1)
@@ -113,6 +113,7 @@ class Ct25k(VaisalaCeilo):
 
     def __init__(self, full_path, site_meta, expected_date=None):
         super().__init__(read_ct_file, full_path, site_meta, expected_date)
+        self._store_ceilometer_info()
 
     def _store_ceilometer_info(self):
         self.instrument = instruments.CT25K

cloudnetpy/version.py

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

{cloudnetpy-1.79.0.dist-info → cloudnetpy-1.80.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cloudnetpy
-Version: 1.79.0
+Version: 1.80.0
 Summary: Python package for Cloudnet processing
 Author: Simo Tukiainen
 License: MIT License
@@ -38,7 +38,7 @@ Classifier: Topic :: Scientific/Engineering :: Atmospheric Science
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: ceilopyter
+Requires-Dist: ceilopyter>=0.2.0
 Requires-Dist: doppy>=0.5.0
 Requires-Dist: matplotlib
 Requires-Dist: mwrpy>=1.3.0

{cloudnetpy-1.79.0.dist-info → cloudnetpy-1.80.0.dist-info}/RECORD

@@ -9,7 +9,7 @@ cloudnetpy/metadata.py,sha256=lO7BCbVAzFoH3Nq-VuezYX0f7MnbG1Zp11g5GSiuQwM,6189
 cloudnetpy/output.py,sha256=gupxt4f_-eUrFsWMto8tnknoV-p9QauC9L6CJAqBILU,15988
 cloudnetpy/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cloudnetpy/utils.py,sha256=WczDeGN408XSgGeaRLXFmlLjgAS67lK1osV0YEuKmwo,32027
-cloudnetpy/version.py,sha256=r_RTjOqOnzkut6bsKX5hTeLYlrSoHQYJsg8Ca85nAOQ,72
+cloudnetpy/version.py,sha256=3SiH4gJlcuEOGDz63kQkJlurcgqt5RcwIPvPtt8WVKg,72
 cloudnetpy/categorize/__init__.py,sha256=s-SJaysvVpVVo5kidiruWQO6p3gv2TXwY1wEHYO5D6I,44
 cloudnetpy/categorize/atmos_utils.py,sha256=RcmbKxm2COkE7WEya0mK3yX5rzUbrewRVh3ekm01RtM,10598
 cloudnetpy/categorize/attenuation.py,sha256=Y_-fzmQTltWTqIZTulJhovC7a6ifpMcaAazDJcnMIOc,990
@@ -35,8 +35,8 @@ cloudnetpy/categorize/attenuations/rain_attenuation.py,sha256=qazJzRyXf9vbjJhh4y
 cloudnetpy/instruments/__init__.py,sha256=PEgrrQNoiOuN_ctYilmt4LV2QCLg1likPjJdWtuGlLs,528
 cloudnetpy/instruments/basta.py,sha256=Lb_EhQTI93S5Bd9osDbCE_tC8gZreRsHz7D2_dFOjmE,3793
 cloudnetpy/instruments/bowtie.py,sha256=EyE8HAE8rjO7JelJDbQte_rnwE3VoVJVc6TBpSNK3IU,3930
-cloudnetpy/instruments/ceilo.py,sha256=GnJYW6oadOApyQSKhzNyJXT4PhoQZlCY9QE4QcqLX8I,9559
-cloudnetpy/instruments/ceilometer.py,sha256=ati9-fUQ54K9tvynIPB-nlBYwtvBVaQtUCjVCLNB67w,12059
+cloudnetpy/instruments/ceilo.py,sha256=gHCh8222Csso9JOaE2f9r5ydzq_DJv112M8qMBVBFcI,10442
+cloudnetpy/instruments/ceilometer.py,sha256=XS2hVJ7rn9WOUKq19wpNL5MJr59fKSEWHC_1pOE_Bm4,12323
 cloudnetpy/instruments/cl61d.py,sha256=0QMqXHIy0hn2mksAwTdaKMOaEWjsZmj7QZ8hCbcHwxE,2225
 cloudnetpy/instruments/cloudnet_instrument.py,sha256=SGPsRYYoGPoRoDY7hHJcKUVX0A23X0Telc00Fu01PnY,4495
 cloudnetpy/instruments/copernicus.py,sha256=hCphEKyFCc3f1uLRdjL2435kuh64M5q-V1bI68bzGbA,6528
@@ -55,7 +55,7 @@ cloudnetpy/instruments/rain_e_h3.py,sha256=JEg4Ko7ZdfjAUJwJ1BWdTkm4K7r3s8WKrPb-H
 cloudnetpy/instruments/rpg.py,sha256=m3-xLJ-w2T7Ip7jBveWsGrts4tmNvdc-Lb4HebvHQjQ,17319
 cloudnetpy/instruments/rpg_reader.py,sha256=ThztFuVrWxhmWVAfZTfQDeUiKK1XMTbtv08IBe8GK98,11364
 cloudnetpy/instruments/toa5.py,sha256=CfmmBMv5iMGaWHIGBK01Rw24cuXC1R1RMNTXkmsm340,1760
-cloudnetpy/instruments/vaisala.py,sha256=RKAw_fVry4YOUF0i2_-2jLIc6_H85oL8USA4ji9rh0o,4583
+cloudnetpy/instruments/vaisala.py,sha256=W_yu_f92cOq8RiiqDLj7bswxu9UMS3TITPWzP5xPdvA,4615
 cloudnetpy/instruments/weather_station.py,sha256=pZK7I5bk1USDRoTeIhZoWzbka9ciea5ypA3oIzZX-7g,24549
 cloudnetpy/instruments/disdrometer/__init__.py,sha256=lyjwttWvFvuwYxEkusoAvgRcbBmglmOp5HJOpXUqLWo,93
 cloudnetpy/instruments/disdrometer/common.py,sha256=g52iK2aNp3Z88kovUmGVpC54NZomPa9D871gzO0AmQ4,9267
@@ -117,10 +117,10 @@ cloudnetpy/products/lwc.py,sha256=sl6Al2tuH3KkCBrPbWTmuz3jlD5UQJ4D6qBsn1tt2CQ,18
 cloudnetpy/products/mie_lu_tables.nc,sha256=It4fYpqJXlqOgL8jeZ-PxGzP08PMrELIDVe55y9ob58,16637951
 cloudnetpy/products/mwr_tools.py,sha256=8HPZpQMTojKZP1JS1S83IE0sxmbDE9bxlaWoqmGnUZE,6199
 cloudnetpy/products/product_tools.py,sha256=uu4l6reuGbPcW3TgttbaSrqIKbyYGhBVTdnC7opKvmg,11101
-cloudnetpy-1.79.0.dist-info/licenses/LICENSE,sha256=wcZF72bdaoG9XugpyE95Juo7lBQOwLuTKBOhhtANZMM,1094
+cloudnetpy-1.80.0.dist-info/licenses/LICENSE,sha256=wcZF72bdaoG9XugpyE95Juo7lBQOwLuTKBOhhtANZMM,1094
 docs/source/conf.py,sha256=IKiFWw6xhUd8NrCg0q7l596Ck1d61XWeVjIFHVSG9Og,1490
-cloudnetpy-1.79.0.dist-info/METADATA,sha256=Z5jTV-IAQDqCM5oV-TQuODjFGDm9K0Iy6itew-2qD4g,5796
-cloudnetpy-1.79.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-cloudnetpy-1.79.0.dist-info/entry_points.txt,sha256=HhY7LwCFk4qFgDlXx_Fy983ZTd831WlhtdPIzV-Y3dY,51
-cloudnetpy-1.79.0.dist-info/top_level.txt,sha256=ibSPWRr6ojS1i11rtBFz2_gkIe68mggj7aeswYfaOo0,16
-cloudnetpy-1.79.0.dist-info/RECORD,,
+cloudnetpy-1.80.0.dist-info/METADATA,sha256=fk5uizRi5azdU4nz8DQRzMMuOSvlEbR_ZW19xbXvOvI,5803
+cloudnetpy-1.80.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+cloudnetpy-1.80.0.dist-info/entry_points.txt,sha256=HhY7LwCFk4qFgDlXx_Fy983ZTd831WlhtdPIzV-Y3dY,51
+cloudnetpy-1.80.0.dist-info/top_level.txt,sha256=ibSPWRr6ojS1i11rtBFz2_gkIe68mggj7aeswYfaOo0,16
+cloudnetpy-1.80.0.dist-info/RECORD,,