cloudnetpy 1.59.5__tar.gz → 1.60.1__tar.gz

{cloudnetpy-1.59.5/cloudnetpy.egg-info → cloudnetpy-1.60.1}/PKG-INFO

@@ -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 → cloudnetpy-1.60.1}/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-1.59.5 → cloudnetpy-1.60.1}/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-1.59.5 → cloudnetpy-1.60.1}/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-1.59.5 → cloudnetpy-1.60.1}/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-1.59.5 → cloudnetpy-1.60.1}/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-1.59.5 → cloudnetpy-1.60.1}/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-1.59.5 → cloudnetpy-1.60.1}/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-1.59.5 → cloudnetpy-1.60.1}/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 → cloudnetpy-1.60.1/cloudnetpy.egg-info}/PKG-INFO

@@ -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