cloudnetpy 1.86.1__py3-none-any.whl → 1.86.2__py3-none-any.whl

cloudnetpy/instruments/mira.py

@@ -3,6 +3,7 @@
 import datetime
 import logging
 import os
+import re
 from collections import OrderedDict
 from collections.abc import Sequence
 from os import PathLike
@@ -224,7 +225,7 @@ def _parse_input_files(
                 )
                 raise FileNotFoundError(msg)
 
-            filetypes = list({f.split(".")[-1].lower() for f in valid_files})
+            filetypes = list({_get_suffix(f) for f in valid_files})
 
             if len(filetypes) > 1:
                 err_msg = "Mixed mmclx and znc files. Please use only one filetype."
@@ -241,7 +242,7 @@ def _parse_input_files(
             )
     else:
         input_filename = input_files
-        keymap = _get_keymap(str(input_filename).split(".")[-1])
+        keymap = _get_keymap(_get_suffix(input_filename))
 
     return input_filename, keymap
 
@@ -258,6 +259,13 @@ def _get_ignored_variables(filetype: str) -> list | None:
     return keymaps.get(filetype.lower(), keymaps.get("mmclx"))
 
 
+def _get_suffix(filename: str | PathLike) -> str:
+    m = re.search(r"\.(\w+)(\.\d+)?$", str(filename))
+    if m is None:
+        return ""
+    return m[1].lower()
+
+
 def _get_keymap(filetype: str) -> dict[str, str]:
     """Returns a dictionary mapping the variables in the raw data to the processed
     Cloudnet file.
@@ -284,6 +292,7 @@ def _get_keymap(filetype: str) -> dict[str, str]:
                 ("nave", "nave"),
                 ("prf", "prf"),
                 ("rg0", "rg0"),
+                ("tpow", "tpow"),
             ],
         ),
         "mmclx": OrderedDict(

cloudnetpy/version.py

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

{cloudnetpy-1.86.1.dist-info → cloudnetpy-1.86.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cloudnetpy
-Version: 1.86.1
+Version: 1.86.2
 Summary: Python package for Cloudnet processing
 Author: Simo Tukiainen
 License: MIT License

{cloudnetpy-1.86.1.dist-info → cloudnetpy-1.86.2.dist-info}/RECORD

@@ -9,7 +9,7 @@ cloudnetpy/metadata.py,sha256=qqLXSUVhIi6H_Z1zlfXeEkc9qBqA1XO-UwsCVxjIcfk,7317
 cloudnetpy/output.py,sha256=NpuxmtLk2JLTdubCupdL4rFbx30YqgeU6vwAe_v8thc,15133
 cloudnetpy/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cloudnetpy/utils.py,sha256=9MMYok1A7oJS2XBkIFhaiDWt_MYLo8tLzF3_880masM,34321
-cloudnetpy/version.py,sha256=QtEAE1savq9vVLdajaUQbntR7f8B0XJ7TQqre-v5kTA,72
+cloudnetpy/version.py,sha256=xTNi15DzFrRbaqtjeQYlOEPWmIqgzeFhBlZ_cPtzD-4,72
 cloudnetpy/categorize/__init__.py,sha256=gtvzWr0IDRn2oA6yHBvinEhTGTuub-JkrOv93lBsgrE,61
 cloudnetpy/categorize/atmos_utils.py,sha256=uWc9TABVYPI0sn4H5Az9Jf6NVRaWyEKIi17f0pAJQxE,10679
 cloudnetpy/categorize/attenuation.py,sha256=Y_-fzmQTltWTqIZTulJhovC7a6ifpMcaAazDJcnMIOc,990
@@ -46,7 +46,7 @@ cloudnetpy/instruments/galileo.py,sha256=f_-GkRxhNaQPbI8HpOwSmoKfGqyjmD16A0ZFgwL
 cloudnetpy/instruments/hatpro.py,sha256=TGOqwW0TfoPEYk13MFvFzwgJGzm6MVE5AsPavcIoj3I,10248
 cloudnetpy/instruments/instruments.py,sha256=WZgH7HjzM9Ane1CSnYCSLidbST8hunUeSt2lPntq9As,4999
 cloudnetpy/instruments/lufft.py,sha256=G6KeJOeltLUlGCHHEk8ns2K7WJ9ImAr25rSB2JltawE,4286
-cloudnetpy/instruments/mira.py,sha256=jJ17xJmXwqfvZ7hgJaongRrRxoQpivMEQYssgSQFYbA,12638
+cloudnetpy/instruments/mira.py,sha256=fLDpEdsoq-TArT49s6-YmrntnqsF5bxi01WWdc1tLP4,12831
 cloudnetpy/instruments/mrr.py,sha256=KvhfNIY2ozHE1MRLNYPqtBFThxLGN_YuCpBUGDIR76s,6319
 cloudnetpy/instruments/nc_lidar.py,sha256=PtZauDdI3bX3bv4gIVvV6N53e2Co-ehBL_tByHM9hj8,1713
 cloudnetpy/instruments/nc_radar.py,sha256=XFKxPLKivnhHTgjE5HFrxjWZ0oCifhDUAog051vkMiY,7533
@@ -118,10 +118,10 @@ cloudnetpy/products/lwc.py,sha256=xsNiiG6dGKIkWaFk0xWTabc1bZ4ULf6SqcqHs7itAUk,19
 cloudnetpy/products/mie_lu_tables.nc,sha256=It4fYpqJXlqOgL8jeZ-PxGzP08PMrELIDVe55y9ob58,16637951
 cloudnetpy/products/mwr_tools.py,sha256=MMWnp68U7bv157-CPB2VeTQvaR6zl7sexbBT_kJ_pn8,6734
 cloudnetpy/products/product_tools.py,sha256=eyqIw_0KhlpmmYQE69RpGdRIAOW7JVPlEgkTBp2kdps,11302
-cloudnetpy-1.86.1.dist-info/licenses/LICENSE,sha256=wcZF72bdaoG9XugpyE95Juo7lBQOwLuTKBOhhtANZMM,1094
+cloudnetpy-1.86.2.dist-info/licenses/LICENSE,sha256=wcZF72bdaoG9XugpyE95Juo7lBQOwLuTKBOhhtANZMM,1094
 docs/source/conf.py,sha256=IKiFWw6xhUd8NrCg0q7l596Ck1d61XWeVjIFHVSG9Og,1490
-cloudnetpy-1.86.1.dist-info/METADATA,sha256=jSsYS8WOmfToTJzLKqwqAUh3PCJv6BPRv6lUAryjRtM,5836
-cloudnetpy-1.86.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-cloudnetpy-1.86.1.dist-info/entry_points.txt,sha256=HhY7LwCFk4qFgDlXx_Fy983ZTd831WlhtdPIzV-Y3dY,51
-cloudnetpy-1.86.1.dist-info/top_level.txt,sha256=ibSPWRr6ojS1i11rtBFz2_gkIe68mggj7aeswYfaOo0,16
-cloudnetpy-1.86.1.dist-info/RECORD,,
+cloudnetpy-1.86.2.dist-info/METADATA,sha256=kf1RXoG3IYdfagnVpUBSggxThGxNc8SutPD3XeuzFv8,5836
+cloudnetpy-1.86.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+cloudnetpy-1.86.2.dist-info/entry_points.txt,sha256=HhY7LwCFk4qFgDlXx_Fy983ZTd831WlhtdPIzV-Y3dY,51
+cloudnetpy-1.86.2.dist-info/top_level.txt,sha256=ibSPWRr6ojS1i11rtBFz2_gkIe68mggj7aeswYfaOo0,16
+cloudnetpy-1.86.2.dist-info/RECORD,,