cloudnetpy 1.79.1__tar.gz → 1.80.0__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cloudnetpy
-Version: 1.79.1
+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.1 → cloudnetpy-1.80.0}/cloudnetpy/instruments/ceilo.py

@@ -4,6 +4,8 @@ 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
@@ -74,36 +76,49 @@ def ceilo2nc(
     range_corrected = site_meta.get("range_corrected", True)
     if range_corrected is False:
         logging.warning("Raw data not range-corrected.")
-    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 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-1.79.1 → cloudnetpy-1.80.0}/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-1.79.1 → cloudnetpy-1.80.0}/cloudnetpy/version.py

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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cloudnetpy
-Version: 1.79.1
+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.1 → cloudnetpy-1.80.0}/cloudnetpy.egg-info/requires.txt

@@ -1,4 +1,4 @@
-ceilopyter
+ceilopyter>=0.2.0
 doppy>=0.5.0
 matplotlib
 mwrpy>=1.3.0

{cloudnetpy-1.79.1 → cloudnetpy-1.80.0}/pyproject.toml

@@ -14,7 +14,7 @@ classifiers = [
   "Topic :: Scientific/Engineering :: Atmospheric Science",
 ]
 dependencies = [
-  "ceilopyter",
+  "ceilopyter>=0.2.0",
   "doppy>=0.5.0",
   "matplotlib",
   "mwrpy>=1.3.0",