cloudnetpy 1.47.1__py3-none-any.whl → 1.47.2__py3-none-any.whl

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

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

{cloudnetpy-1.47.1.dist-info → cloudnetpy-1.47.2.dist-info}/METADATA

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

@@ -8,7 +8,7 @@ cloudnetpy/metadata.py,sha256=4stvQT5oxNdxu6Bh7NbT5LH65CIpzhfGA_Cey5Ai6m4,5022
 cloudnetpy/output.py,sha256=Oaj5w_C8rIFQrt2i9WZtvOjliBZgHo9Rm-HO1n6wazQ,13071
 cloudnetpy/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cloudnetpy/utils.py,sha256=Rsh_ojLNMH5ps7fWLKvF74Xd9B1yC9JqL507eRljyDQ,26973
-cloudnetpy/version.py,sha256=EIYmmtcmuhk851D_-2trs7UgNFpD3vOS24xCKrXTOSg,72
+cloudnetpy/version.py,sha256=a1VwkoLwSdAt59hSaL7yzIODKVJxnFcS6tSnZws2z64,72
 cloudnetpy/categorize/__init__.py,sha256=gP5q3Vis1y9u9OWgA_idlbjfWXYN_S0IBSWdwBhL_uU,69
 cloudnetpy/categorize/atmos.py,sha256=-Z1y1Eaju7pG2yOIgUeIf-xH21HRxzWfJ9AOIrVL4A8,12389
 cloudnetpy/categorize/atmos_utils.py,sha256=6WdfGqzOvnaDW7vlMMrZBJIxW_eHQdjH-Xl_iPv1TTI,3716
@@ -34,7 +34,7 @@ cloudnetpy/instruments/copernicus.py,sha256=FDS7Rsunp4ieTPFh_T_LXvreNi5_HTv4ZzR3
 cloudnetpy/instruments/galileo.py,sha256=F_XyoAb9PR-ifGhqhXziKnv0KfyOh-yEBaE1NgRMzNg,4318
 cloudnetpy/instruments/hatpro.py,sha256=ftXVbYx2xtQcRZ2zVF82jUP7R96YV5Wdgcz_PUNZTXM,4824
 cloudnetpy/instruments/instruments.py,sha256=FGiN0369--1z8uYzgDP9_1A7DFLL_Cl4-Ca-OMsjBdI,2824
-cloudnetpy/instruments/lufft.py,sha256=o6sY1L82EgfaBXBwFpomHmIz37cP8WHu0WDoiUROvyQ,3226
+cloudnetpy/instruments/lufft.py,sha256=E2qzvya206gNiML7BSM6vm1lzeOMBePrIuPT81NHPvw,3397
 cloudnetpy/instruments/mira.py,sha256=wtcgTR_nqL_BPZ5yqvBYXpI9Qtwdvc_1v6N_r3hCEPc,4888
 cloudnetpy/instruments/nc_lidar.py,sha256=9FSsInEM8fdyyhgNXb2INBjb5OEGFE5ZaVSowHjzoCA,1386
 cloudnetpy/instruments/nc_radar.py,sha256=hjmtgLuBPnfsyRInOZeKzAw3oZ82WSumrlPpycqBbjk,5530
@@ -103,8 +103,8 @@ cloudnetpy/products/lwc.py,sha256=CqvV7iqxUbk2YekaocBActmZuhF1BhWkfc-y6MDej-0,18
 cloudnetpy/products/mie_lu_tables.nc,sha256=It4fYpqJXlqOgL8jeZ-PxGzP08PMrELIDVe55y9ob58,16637951
 cloudnetpy/products/product_tools.py,sha256=9eKvr-zGEK2ARN2DmJN--KbynKdT08DhfT1GB8Rfoe4,9616
 docs/source/conf.py,sha256=baQlgkkUGJi4952W6NRhLkIBbRtwFgqrIOBuEeSCLfk,1488
-cloudnetpy-1.47.1.dist-info/LICENSE,sha256=wcZF72bdaoG9XugpyE95Juo7lBQOwLuTKBOhhtANZMM,1094
-cloudnetpy-1.47.1.dist-info/METADATA,sha256=94K5u18B84OjvMpZlfJiIGuh8Owp8K-yrQjwJsUH2IU,5638
-cloudnetpy-1.47.1.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
-cloudnetpy-1.47.1.dist-info/top_level.txt,sha256=ibSPWRr6ojS1i11rtBFz2_gkIe68mggj7aeswYfaOo0,16
-cloudnetpy-1.47.1.dist-info/RECORD,,
+cloudnetpy-1.47.2.dist-info/LICENSE,sha256=wcZF72bdaoG9XugpyE95Juo7lBQOwLuTKBOhhtANZMM,1094
+cloudnetpy-1.47.2.dist-info/METADATA,sha256=TdlQti8TZ1wKHHG1coPydiB7fUkj2MrRIDFfSGjXE44,5638
+cloudnetpy-1.47.2.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
+cloudnetpy-1.47.2.dist-info/top_level.txt,sha256=ibSPWRr6ojS1i11rtBFz2_gkIe68mggj7aeswYfaOo0,16
+cloudnetpy-1.47.2.dist-info/RECORD,,