cloudnetpy 1.47.1__tar.gz → 1.47.2__tar.gz

{cloudnetpy-1.47.1/cloudnetpy.egg-info → cloudnetpy-1.47.2}/PKG-INFO

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

{cloudnetpy-1.47.1 → cloudnetpy-1.47.2}/cloudnetpy/instruments/lufft.py

@@ -12,6 +12,8 @@ from cloudnetpy.instruments.nc_lidar import NcLidar
 class LufftCeilo(NcLidar):
     """Class for Lufft chm15k ceilometer."""
 
+    serial_number: str | None
+
     def __init__(
         self, file_name: str, site_meta: dict, expected_date: str | None = None
     ):
@@ -19,12 +21,13 @@ class LufftCeilo(NcLidar):
         self.file_name = file_name
         self.site_meta = site_meta
         self.expected_date = expected_date
-        self.instrument = self._get_chm_model()
+        self.serial_number = None
 
     def read_ceilometer_file(self, calibration_factor: float | None = None) -> None:
         """Reads data and metadata from Jenoptik netCDF file."""
         with netCDF4.Dataset(self.file_name) as dataset:
             self.dataset = dataset
+            self._fetch_attributes()
             self._fetch_range(reference="upper")
             self._fetch_beta_raw(calibration_factor)
             self._fetch_time_and_date()
@@ -77,9 +80,12 @@ class LufftCeilo(NcLidar):
                 return var[0] if utils.isscalar(var) else var[:]
         raise ValueError("Unknown variable")
 
-    def _get_chm_model(self):
-        with netCDF4.Dataset(self.file_name) as nc:
-            source = getattr(nc, "source", "")[:3].lower()
-            if source == "chx":
-                return instruments.CHM15KX
-        return instruments.CHM15K
+    def _fetch_attributes(self):
+        self.serial_number = getattr(self.dataset, "device_name", None)
+        if self.serial_number is None:
+            self.serial_number = getattr(self.dataset, "source")
+        self.instrument = (
+            instruments.CHM15KX
+            if self.serial_number.startswith("CHX")
+            else instruments.CHM15K
+        )

{cloudnetpy-1.47.1 → cloudnetpy-1.47.2}/cloudnetpy/version.py

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

{cloudnetpy-1.47.1 → cloudnetpy-1.47.2/cloudnetpy.egg-info}/PKG-INFO

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

{cloudnetpy-1.47.1 → cloudnetpy-1.47.2}/pyproject.toml

@@ -46,23 +46,7 @@ changelog = "https://github.com/actris-cloudnet/cloudnetpy/blob/main/CHANGELOG.m
 check_untyped_defs = true
 
 [[tool.mypy.overrides]]
-module = "scipy.*"
-ignore_missing_imports = true
-
-[[tool.mypy.overrides]]
-module = "skimage.*"
-ignore_missing_imports = true
-
-[[tool.mypy.overrides]]
-module = "netCDF4.*"
-ignore_missing_imports = true
-
-[[tool.mypy.overrides]]
-module = "matplotlib.*"
-ignore_missing_imports = true
-
-[[tool.mypy.overrides]]
-module = "mpl_toolkits.*"
+module = ["matplotlib.*", "mpl_toolkits.*", "netCDF4.*", "scipy.*", "skimage.*"]
 ignore_missing_imports = true
 
 [tool.setuptools.dynamic]