cloudnetpy 1.59.5__py3-none-any.whl → 1.60.1__py3-none-any.whl

cloudnetpy/categorize/categorize.py

@@ -124,11 +124,12 @@ def generate_categorize(
 
     try:
         is_disdrometer = "disdrometer" in input_files
-        data = {
+
+        data: dict = {
             "radar": Radar(input_files["radar"]),
             "lidar": Lidar(input_files["lidar"]),
             "mwr": Mwr(input_files["mwr"]),
-            "lv0_files": input_files.get("lv0_files", None),
+            "lv0_files": input_files.get("lv0_files"),
             "disdrometer": Disdrometer(input_files["disdrometer"])
             if is_disdrometer
             else None,

cloudnetpy/categorize/radar.py

@@ -124,7 +124,7 @@ class Radar(DataSource):
             return
         n_vertical = self._filter(
             data,
-            1,
+            axis=1,
             min_coverage=0.5,
             z_limit=10,
             distance=4,
@@ -132,7 +132,7 @@ class Radar(DataSource):
         )
         n_horizontal = self._filter(
             data,
-            0,
+            axis=0,
             min_coverage=0.3,
             z_limit=-30,
             distance=3,
@@ -174,6 +174,10 @@ class Radar(DataSource):
                 q3 = np.quantile(n_values, 0.75)
             except IndexError:
                 continue
+
+            if q1 == q3:
+                continue
+
             threshold = distance * (q3 - q1) + q3
 
             indices = np.where(

cloudnetpy/instruments/ceilo.py

@@ -69,7 +69,7 @@ def ceilo2nc(
     """
     snr_limit = 5
     ceilo_obj = _initialize_ceilo(full_path, site_meta, date)
-    calibration_factor = site_meta.get("calibration_factor", None)
+    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()

cloudnetpy/instruments/ceilometer.py

@@ -107,9 +107,12 @@ class Ceilometer:
         self.date = utils.seconds2date(self.data["time"][0], epoch=epoch)[:3]
         self.data["time"] = utils.seconds2hours(self.data["time"])
 
-    def data_to_cloudnet_arrays(self) -> None:
+    def data_to_cloudnet_arrays(self, time_dtype="f4") -> None:
         for key, array in self.data.items():
-            self.data[key] = CloudnetArray(array, key)
+            if key == "time":
+                self.data[key] = CloudnetArray(array, key, data_type=time_dtype)
+            else:
+                self.data[key] = CloudnetArray(array, key)
 
     def screen_depol(self) -> None:
         key = "depolarisation"

cloudnetpy/instruments/hatpro.py

@@ -44,7 +44,7 @@ def hatpro2l1c(
     Returns:
         UUID of the generated file.
     """
-    coeff_files = site_meta.get("coefficientFiles", None)
+    coeff_files = site_meta.get("coefficientFiles")
 
     try:
         hatpro_raw = lev1_to_nc(

cloudnetpy/instruments/pollyxt.py

@@ -56,7 +56,8 @@ def pollyxt2nc(
     polly.calc_screened_products(snr_limit)
     polly.mask_nan_values()
     polly.prepare_data()
-    polly.data_to_cloudnet_arrays()
+    polly.screen_completely_masked_profiles()
+    polly.data_to_cloudnet_arrays(time_dtype="f8")
     attributes = output.add_time_attribute(ATTRIBUTES, polly.date)
     output.update_attributes(polly.data, attributes)
     polly.add_snr_info("beta", snr_limit)
@@ -149,6 +150,12 @@ class PollyXt(Ceilometer):
         self.data["calibration_factor"] = calibration_factors
         return epoch
 
+    def screen_completely_masked_profiles(self) -> None:
+        valid_ind = ~np.all(np.ma.getmaskarray(self.data["beta_raw"]), axis=1)
+        for key, item in self.data.items():
+            if isinstance(item, np.ndarray) and item.shape[0] == len(valid_ind):
+                self.data[key] = item[valid_ind]
+
     def _get_valid_beta_channel(self, files: list) -> str:
         polly_channels = ("1064", "532", "355")
         for channel in polly_channels:

cloudnetpy/instruments/radiometrics.py

@@ -145,9 +145,9 @@ class Radiometrics:
                 continue
             times.append(record.timestamp)
             if lwp is not None:
-                lwps.append(float(lwp) * 1000)  # g / m2
+                lwps.append(float(lwp))  # mm => kg m-2
             if iwv is not None:
-                iwvs.append(float(iwv) * 100)  # g / m2
+                iwvs.append(float(iwv) * 10)  # cm => kg m-2
         self.data["time"] = np.array(times, dtype="datetime64[s]")
         self.data["lwp"] = np.array(lwps, dtype=float)
         self.data["iwv"] = np.array(iwvs, dtype=float)

cloudnetpy/version.py

@@ -1,4 +1,4 @@
 MAJOR = 1
-MINOR = 59
-PATCH = 5
+MINOR = 60
+PATCH = 1
 __version__ = f"{MAJOR}.{MINOR}.{PATCH}"

{cloudnetpy-1.59.5.dist-info → cloudnetpy-1.60.1.dist-info}/METADATA

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

{cloudnetpy-1.59.5.dist-info → cloudnetpy-1.60.1.dist-info}/RECORD

@@ -8,11 +8,11 @@ cloudnetpy/metadata.py,sha256=v_VDo2vbdTxB0zIsfP69IcrwSKiRlLpsGdq6JPI4CoA,5306
 cloudnetpy/output.py,sha256=WoVTNuxni0DUr163vZ-_mDr1brXhY15XSlGMrq9Aoqw,14700
 cloudnetpy/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cloudnetpy/utils.py,sha256=0TlHm71YtSrKXBsRKctitnhQrvZPE-ulEVeAQW-oK58,27398
-cloudnetpy/version.py,sha256=_ZHaJaLkFans6kJwX5yp5Id9JIeZWVMEa3xlhGnpjgI,72
+cloudnetpy/version.py,sha256=aMrw7kVVNAWBsLdFD6ZiaSwL_rHSdG4s5vxmWXFxavU,72
 cloudnetpy/categorize/__init__.py,sha256=gP5q3Vis1y9u9OWgA_idlbjfWXYN_S0IBSWdwBhL_uU,69
 cloudnetpy/categorize/atmos.py,sha256=fWW8ye_8HZASRAiYwURFKWzcGOYIA2RKeVxCq0lVOuM,12389
 cloudnetpy/categorize/atmos_utils.py,sha256=wndpwJxc2-QnNTkV8tc8I11Vs_WkNz9sVMX1fuGgUC4,3777
-cloudnetpy/categorize/categorize.py,sha256=_chLFT0l9ll78y3oaxFwOTBbv2raxxjghCz-_KGdImQ,17476
+cloudnetpy/categorize/categorize.py,sha256=QNSqEtpe1qtFQAKOG1suffPaYEwtOf4KMij9PdW9-Us,17477
 cloudnetpy/categorize/classify.py,sha256=x7aqPfhw4xuER22sqOb9ES9nijwk1E8b7HF7uaFJD7k,9218
 cloudnetpy/categorize/containers.py,sha256=j6oSKPeZcq9vFthYaocAw1m6yReRNNPYUQF5UTDq4YM,4232
 cloudnetpy/categorize/disdrometer.py,sha256=0Z0nvUtoZKDxiUfBZzoYZxUFOVjq-thmYfaCkskeECs,1799
@@ -24,25 +24,25 @@ cloudnetpy/categorize/lidar.py,sha256=LYqXw30sLOYxhKRcO3k5r0uVLGRYmJ5k0KuVOMduY5
 cloudnetpy/categorize/melting.py,sha256=AOq36yLntDXYbeMw5QhZ7kMLwt0INyUbhzv-rSILLyo,6261
 cloudnetpy/categorize/model.py,sha256=xWB6XOSz9p0h4b4m6ImMmzcTImOmz54d093WmsLogdQ,5535
 cloudnetpy/categorize/mwr.py,sha256=-KMoYlch_C79bqgcEiRDCTRCcQf1ZsYxU90GQ8hzMgs,1435
-cloudnetpy/categorize/radar.py,sha256=S3561FVK6J4NUjqPi2S6fKnjnOm0oLwbIC54J64AN4Y,13659
+cloudnetpy/categorize/radar.py,sha256=oaptBCymSPTa1HNYOWURnE0h5oklDOVxQvqAEAbqSQw,13721
 cloudnetpy/instruments/__init__.py,sha256=_jejVwi_viSZehmAOkEqTNI-0-exGgAJ_bHW1IRRwTI,398
 cloudnetpy/instruments/basta.py,sha256=0zUztUJBXT2nrBTAl3-NLowxu_CYwTU5TgdBq4etj7E,3757
 cloudnetpy/instruments/campbell_scientific.py,sha256=2WHfBKQjtRSl0AqvtPeX7G8Hdi3Dn0WbvoAppFOMbA8,5270
-cloudnetpy/instruments/ceilo.py,sha256=eF9Pp3KbYg3I_6gQcgCeobVkHzbbK9T5uH2tUys7RG8,8882
-cloudnetpy/instruments/ceilometer.py,sha256=SVp3Ego8JIjoTFK0FRvc2Xgq7U9a9iM1n-gL0Z90dv0,11928
+cloudnetpy/instruments/ceilo.py,sha256=56zhNSx5cyqV9ToeDUhXzwOUQK32oa9Vng2VsPXLsmM,8876
+cloudnetpy/instruments/ceilometer.py,sha256=-aPEZs_r0Gxeu53PHeWAkZMB2BUdauS47tkL7RFxo6k,12078
 cloudnetpy/instruments/cl61d.py,sha256=ycJGvUqNU2KHhECbrSehtWRnvg1vKFHhvMeQpjpdCI4,1989
 cloudnetpy/instruments/cloudnet_instrument.py,sha256=RG5HJxGM6p0F-IGyr85fvOizcMmgx48OeD_XeIsrgSU,3367
 cloudnetpy/instruments/copernicus.py,sha256=AT0AtMhGSKzPWEqXsfAda6zeaw4g0Jr5dqIyfeu4FP0,6327
 cloudnetpy/instruments/galileo.py,sha256=FyFYh1JhWed1d6yvpsv3rdBzHUTjkfOPw5HEQz4Wssw,4545
-cloudnetpy/instruments/hatpro.py,sha256=tvkLfgC7YRa8aECOeN4_UaxrgX_VTKYTjTbRVo1kxLo,8519
+cloudnetpy/instruments/hatpro.py,sha256=QD7Gn607Q2ASAlSJbY8Fu37TOOHTR1VrAPVfy8ehylg,8513
 cloudnetpy/instruments/instruments.py,sha256=jG5TYnZ8bdCZXnI303ZsaJBEdSKaIjKMbkGtnq6kQX0,3261
 cloudnetpy/instruments/lufft.py,sha256=nozeiMRMz7I6q_FwmlxDGhWeJlqTuNh6ru39-M4K3BI,3629
 cloudnetpy/instruments/mira.py,sha256=TfozpYivQAThZ_rV3gLzZpz2QyJFWOF0RXdzA4521rM,9332
 cloudnetpy/instruments/mrr.py,sha256=hqknXXjJYfjWtyO50vioC3ohmH1GWU7K78-dNHh0Fss,5824
 cloudnetpy/instruments/nc_lidar.py,sha256=Q4sJJwiEPthDz0Zb-laISX32jNYzlUBMafxLJiOAN5c,1704
 cloudnetpy/instruments/nc_radar.py,sha256=cDd20Yz-UeDQp1Gmkk-jGNZ45DangFsCaioeo_kktHQ,6935
-cloudnetpy/instruments/pollyxt.py,sha256=lbxJCKgKfgTxPm_NyYIWzSi2BbN828fNzI-Rux3wT48,8560
-cloudnetpy/instruments/radiometrics.py,sha256=oqsEW65DPYuSah58SaphtVVmt0rZqJ7DwqbOlMB-qHc,7620
+cloudnetpy/instruments/pollyxt.py,sha256=SccV9htZ5MWrK7JEleOr4hbmeTr-lKktUzAt7H9Xkf8,8932
+cloudnetpy/instruments/radiometrics.py,sha256=2ofeZ6KJ_JOWTd3UA-wSzJpM5cjN7R4jZeBLJCQKEYc,7624
 cloudnetpy/instruments/rpg.py,sha256=U8nEOlOI74f2lk2w4C4xKZCrW6AkDZpQZYE3yv7SNHE,17130
 cloudnetpy/instruments/rpg_reader.py,sha256=LAdXL3TmD5QzQbqtPOcemZji_qkXwmw6a6F8NmF6Zg8,11355
 cloudnetpy/instruments/vaisala.py,sha256=GzESZvboOoXzWmmr9dC-y6oM6ogc-M-zT3KmBTaD0LI,14512
@@ -107,8 +107,8 @@ cloudnetpy/products/mie_lu_tables.nc,sha256=It4fYpqJXlqOgL8jeZ-PxGzP08PMrELIDVe5
 cloudnetpy/products/mwr_tools.py,sha256=PRm5aCULccUehU-Byk55wYhhEHseMjoAjGBu5TSyHao,4621
 cloudnetpy/products/product_tools.py,sha256=rhx_Ru9FLlQqCNM-awoiHx18-Aq1eBwL9LiUaQoJs6k,10412
 docs/source/conf.py,sha256=IKiFWw6xhUd8NrCg0q7l596Ck1d61XWeVjIFHVSG9Og,1490
-cloudnetpy-1.59.5.dist-info/LICENSE,sha256=wcZF72bdaoG9XugpyE95Juo7lBQOwLuTKBOhhtANZMM,1094
-cloudnetpy-1.59.5.dist-info/METADATA,sha256=2kp1YrC2F0NLCeOEaCj6Jb1Ev8HhEdgxKIR9y2YZAz0,5784
-cloudnetpy-1.59.5.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-cloudnetpy-1.59.5.dist-info/top_level.txt,sha256=ibSPWRr6ojS1i11rtBFz2_gkIe68mggj7aeswYfaOo0,16
-cloudnetpy-1.59.5.dist-info/RECORD,,
+cloudnetpy-1.60.1.dist-info/LICENSE,sha256=wcZF72bdaoG9XugpyE95Juo7lBQOwLuTKBOhhtANZMM,1094
+cloudnetpy-1.60.1.dist-info/METADATA,sha256=LG0ydnxAUKLn5SypWDIjlWlVYF8QTZwbnyVWD_nlDgc,5784
+cloudnetpy-1.60.1.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+cloudnetpy-1.60.1.dist-info/top_level.txt,sha256=ibSPWRr6ojS1i11rtBFz2_gkIe68mggj7aeswYfaOo0,16
+cloudnetpy-1.60.1.dist-info/RECORD,,