doppy 0.3.4__cp310-abi3-win_amd64.whl → 0.3.6__cp310-abi3-win_amd64.whl

doppy/data/cache.py

@@ -1,4 +1,5 @@
 import gzip
+import logging
 import shutil
 from io import BytesIO
 from pathlib import Path
@@ -25,7 +26,12 @@ def cached_record(
         path.parent.mkdir(parents=True, exist_ok=True)
         content = session.get(record["downloadUrl"]).content
         if record["filename"].endswith(".gz"):
-            content = gzip.decompress(content)
+            try:
+                content = gzip.decompress(content)
+            except EOFError:
+                logging.error(f"Failed to recompress {record['filename']}")
+                raise
+
         with path.open("wb") as f:
             f.write(content)
         return BytesIO(content)

doppy/product/wind.py

@@ -129,7 +129,7 @@ class Wind:
         | Sequence[BufferedIOBase],
         options: Options | None = None,
     ) -> Wind:
-        raws = doppy.raw.WindCube.from_vad_srcs(data)
+        raws = doppy.raw.WindCube.from_vad_or_dbs_srcs(data)
 
         if len(raws) == 0:
             raise doppy.exceptions.NoDataError("WindCube data missing")
@@ -140,6 +140,13 @@ class Wind:
             .non_strictly_increasing_timesteps_removed()
             .reindex_scan_indices()
         )
+        # select scans with most frequent elevation angle from range (15,85)
+        raw = raw[(raw.elevation > 15) & (raw.elevation < 85)]
+        elevation_ints = raw.elevation.round().astype(int)
+        unique_elevations, counts = np.unique(elevation_ints, return_counts=True)
+        most_frequent_elevation = unique_elevations[np.argmax(counts)]
+        raw = raw[elevation_ints == most_frequent_elevation]
+
         if len(raw.time) == 0:
             raise doppy.exceptions.NoDataError("No suitable data for the wind product")
 
@@ -168,7 +175,9 @@ class Wind:
         mask = _compute_mask(wind, rmse) | np.any(np.isnan(wind), axis=2)
         if not np.allclose(elevation, elevation[0]):
             raise ValueError("Elevation is expected to stay same")
-        height = np.array(raw.height, dtype=np.float64)
+        if not (raw.height == raw.height[0]).all():
+            raise ValueError("Unexpected heights")
+        height = np.array(raw.height[0], dtype=np.float64)
         return Wind(
             time=time,
             height=height,

doppy/raw/windcube.py

@@ -16,8 +16,8 @@ from doppy.utils import merge_all_equal
 @dataclass
 class WindCube:
     time: npt.NDArray[datetime64]  # dim: (time, )
-    radial_distance: npt.NDArray[np.int64]  # dim: (radial_distance, )
-    height: npt.NDArray[np.int64]  # dim: (radial_distance, )
+    radial_distance: npt.NDArray[np.int64]  # dim: (time, radial_distance)
+    height: npt.NDArray[np.int64]  # dim: (time,radial_distance)
     azimuth: npt.NDArray[np.float64]  # dim: (time, )
     elevation: npt.NDArray[np.float64]  # dim: (time, )
     cnr: npt.NDArray[np.float64]  # dim: (time, radial_distance)
@@ -27,28 +27,28 @@ class WindCube:
     system_id: str
 
     @classmethod
-    def from_vad_srcs(
+    def from_vad_or_dbs_srcs(
         cls,
         data: Sequence[str]
         | Sequence[Path]
         | Sequence[bytes]
         | Sequence[BufferedIOBase],
     ) -> list[WindCube]:
-        return [WindCube.from_vad_src(src) for src in data]
+        return [WindCube.from_vad_or_dbs_src(src) for src in data]
 
     @classmethod
-    def from_vad_src(cls, data: str | Path | bytes | BufferedIOBase) -> WindCube:
+    def from_vad_or_dbs_src(cls, data: str | Path | bytes | BufferedIOBase) -> WindCube:
         data_bytes = _src_to_bytes(data)
         nc = Dataset("inmemory.nc", "r", memory=data_bytes)
-        return _from_vad_src(nc)
+        return _from_vad_or_dbs_src(nc)
 
     @classmethod
     def merge(cls, raws: list[WindCube]) -> WindCube:
         return WindCube(
             scan_index=_merge_scan_index([r.scan_index for r in raws]),
             time=np.concatenate([r.time for r in raws]),
-            height=_merge_range_vars([r.height for r in raws]),
-            radial_distance=_merge_range_vars([r.radial_distance for r in raws]),
+            height=np.concatenate([r.height for r in raws]),
+            radial_distance=np.concatenate([r.radial_distance for r in raws]),
             azimuth=np.concatenate([r.azimuth for r in raws]),
             elevation=np.concatenate([r.elevation for r in raws]),
             radial_velocity=np.concatenate([r.radial_velocity for r in raws]),
@@ -71,8 +71,8 @@ class WindCube:
         if isinstance(index, (int, slice, list, np.ndarray)):
             return WindCube(
                 time=self.time[index],
-                radial_distance=self.radial_distance,
-                height=self.height,
+                radial_distance=self.radial_distance[index],
+                height=self.height[index],
                 azimuth=self.azimuth[index],
                 elevation=self.elevation[index],
                 radial_velocity=self.radial_velocity[index],
@@ -113,13 +113,6 @@ class WindCube:
         return self
 
 
-def _merge_range_vars(vars: list[npt.NDArray[np.int64]]) -> npt.NDArray[np.int64]:
-    var = np.concatenate([v[np.newaxis, :] for v in vars])
-    if not (var[0] == var).all():
-        raise ValueError("Cannot merge unequal range variable")
-    return np.array(var[0], dtype=np.int64)
-
-
 def _merge_scan_index(index_list: list[npt.NDArray[np.int64]]) -> npt.NDArray[np.int64]:
     if len(index_list) == 0:
         raise ValueError("cannot merge empty list")
@@ -150,7 +143,7 @@ def _src_to_bytes(data: str | Path | bytes | BufferedIOBase) -> bytes:
     raise TypeError("Unsupported data type")
 
 
-def _from_vad_src(nc: Dataset) -> WindCube:
+def _from_vad_or_dbs_src(nc: Dataset) -> WindCube:
     scan_index_list = []
     time_list = []
     cnr_list = []
@@ -160,11 +153,14 @@ def _from_vad_src(nc: Dataset) -> WindCube:
     elevation_list = []
     range_list = []
     height_list = []
+    time_reference = (
+        nc["time_reference"][:] if "time_reference" in nc.variables else None
+    )
 
     for i, group in enumerate(
         nc[group] for group in (nc.variables["sweep_group_name"][:])
     ):
-        time_list.append(_extract_datetime64_or_raise(group["time"]))
+        time_list.append(_extract_datetime64_or_raise(group["time"], time_reference))
         radial_wind_speed_list.append(
             _extract_float64_or_raise(group["radial_wind_speed"])
         )
@@ -178,17 +174,11 @@ def _from_vad_src(nc: Dataset) -> WindCube:
         height_list.append(_extract_int64_or_raise(group["measurement_height"]))
         scan_index_list.append(np.full(group["time"][:].shape, i, dtype=np.int64))
 
-    height = np.concatenate(height_list)
-    if not (height == height[0]).all():
-        raise ValueError("Unexpected heights")
-    radial_distance = np.concatenate(range_list)
-    if not (radial_distance == radial_distance[0]).all():
-        raise ValueError("Unexpected range")
     return WindCube(
         scan_index=np.concatenate(scan_index_list),
         time=np.concatenate(time_list),
-        radial_distance=radial_distance[0],
-        height=height[0],
+        radial_distance=np.concatenate(range_list),
+        height=np.concatenate(height_list),
         azimuth=np.concatenate(azimuth_list),
         elevation=np.concatenate(elevation_list),
         radial_velocity=np.concatenate(radial_wind_speed_list),
@@ -198,12 +188,21 @@ def _from_vad_src(nc: Dataset) -> WindCube:
     )
 
 
-def _extract_datetime64_or_raise(nc: Dataset) -> npt.NDArray[np.datetime64]:
+def _extract_datetime64_or_raise(
+    nc: Dataset, time_reference: str | None
+) -> npt.NDArray[np.datetime64]:
     match nc.name:
         case "time":
             if nc.dimensions != ("time",):
                 raise ValueError
-            return np.array(num2date(nc[:], units=nc.units), dtype="datetime64[us]")
+
+            units = nc.units
+            if "time_reference" in nc.units:
+                if time_reference is not None:
+                    units = nc.units.replace("time_reference", time_reference)
+                else:
+                    raise ValueError("Unknown time_reference")
+            return np.array(num2date(nc[:], units=units), dtype="datetime64[us]")
         case _:
             raise ValueError(f"Unexpected variable name {nc.name}")
 

{doppy-0.3.4.dist-info → doppy-0.3.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: doppy
-Version: 0.3.4
+Version: 0.3.6
 Classifier: Development Status :: 4 - Beta
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.10
@@ -131,7 +131,7 @@ raws_bg = doppy.raw.HaloBg.from_srcs(LIST_OF_BACKGROUND_FILES)
 raw_system_params = doppy.raw.HaloSysParams.from_src(SYSTEM_PARAMS_FILENAME)
 
 # Windcube WLS200S
-raws_wls200s = doppy.raw.WindCube.from_vad_srcs(LIST_OF_VAD_NETCDF_FILES)
+raws_wls200s = doppy.raw.WindCube.from_vad_or_dbs_srcs(LIST_OF_VAD_NETCDF_FILES)
 
 # Windcube WLS70
 raws_wls70 = doppy.raw.Wls70.from_srcs(LIST_OF_RTD_FILES)

{doppy-0.3.4.dist-info → doppy-0.3.6.dist-info}/RECORD

@@ -1,10 +1,10 @@
-doppy-0.3.4.dist-info/METADATA,sha256=WXh04XFnBQcfDpb0B9J0lUyLE5j5R0QymYWrsKb0794,4274
-doppy-0.3.4.dist-info/WHEEL,sha256=kQSgRz4wLs1NoHeP8cPfiUAbi-20athsJLkIuWHUegk,95
-doppy-0.3.4.dist-info/entry_points.txt,sha256=9b_Ca7vJoh6AwL3W8qAPh_UmJ_1Pa6hi-TDfCTDjvSk,43
-doppy-0.3.4.dist-info/licenses/LICENSE,sha256=RIAxFjJLTw0wQ3_SM73JoTeppoD99DJJ72cjvVuRrW4,1110
+doppy-0.3.6.dist-info/METADATA,sha256=F4AoXQLWbJE9kzRAF9H5dDOwUWJEFZrC1RSXHZ9Cy1o,4281
+doppy-0.3.6.dist-info/WHEEL,sha256=Tw0ve9H4Xzdrn3r_TkwGVW_TehY5JI5yM2urT-BkFf4,95
+doppy-0.3.6.dist-info/entry_points.txt,sha256=9b_Ca7vJoh6AwL3W8qAPh_UmJ_1Pa6hi-TDfCTDjvSk,43
+doppy-0.3.6.dist-info/licenses/LICENSE,sha256=RIAxFjJLTw0wQ3_SM73JoTeppoD99DJJ72cjvVuRrW4,1110
 doppy/bench.py,sha256=fLN2iS5mmoYH4qZjD80Vl1h9lp3C-KDfhj9fteWRPtM,260
 doppy/data/api.py,sha256=c3zbZI3IV7HnzhyFzJpUPOFT20eYFuQlJ5K_1ZEe1Pg,1921
-doppy/data/cache.py,sha256=VNPB3XsWGwY2bNXBs1r_sEWF4qBq_U7sJSlSmt1Rxm8,1033
+doppy/data/cache.py,sha256=ERFzH-KjLLXV8fCePsewTepKZXmLwtXxeazmHiFdA80,1203
 doppy/data/exceptions.py,sha256=JOyekvUO-Ew4ZVezf3_IxZOrPN0IksfUILd8R2YcSts,95
 doppy/data/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 doppy/defaults.py,sha256=nhxcZcFd2jyDVbq0azwtekEJEjiz8k21MZmXFlSXAjo,40
@@ -13,17 +13,17 @@ doppy/netcdf.py,sha256=W5YPbsv6CQ2Ycy4sFaIyjfn9YjvDgygczm8j9E1_uAg,4054
 doppy/options.py,sha256=uyIKM_G2GtbmV6Gve8o13eIShQqUwsnYZ41mhX2ypGE,218
 doppy/product/stare.py,sha256=ipZuRO8Bc5jWDlPYAxDZQ91gR8OMmnK-D7mNiKo2E7I,23322
 doppy/product/stare_depol.py,sha256=D0bVRZT4EP-pYHE84lioUxiuB3a2Cl6LvOgCE-YPJZY,9938
-doppy/product/wind.py,sha256=da2ZHksxH1A-pN0qbbKx3NkwlooaGfyKlXeTuS92VQQ,16525
+doppy/product/wind.py,sha256=lGkvGf_QeOXtfT5kQEq5GuxKuSsLxTGVwRzoioF525o,17061
 doppy/product/__init__.py,sha256=xoBEXuhid-bvoof5Ogzpt1dKIhJgNMRyrAinCqUOUUI,241
 doppy/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 doppy/raw/halo_bg.py,sha256=TrqJDUXa1atW2w4UDN9PPx2Mzrc7D9Q2Ndph0yB65p0,5988
 doppy/raw/halo_hpl.py,sha256=VF8JQ_5N8adLsGNJOlhvKwz0LtNd4oCU76hETe5Vuhk,19007
 doppy/raw/halo_sys_params.py,sha256=nT9r4F-H0Rf5njee5rYzzLTCm7vm3N_pdJqrW6RtyK4,4041
-doppy/raw/windcube.py,sha256=XZEocaAM836ODcx5ZAvJWMWu-hOLDiy68oEGHv39rww,10262
+doppy/raw/windcube.py,sha256=3HU8J5oKtNGRyK38d3y5dNzGsRQc_IxfsVq2MVvWvS8,10211
 doppy/raw/wls70.py,sha256=2OhjmQ1SoAmjN4npOKFH0eFLyo9RssO7sr-gOtxjAho,7622
 doppy/raw/__init__.py,sha256=J06q7iykSAWIif4XAxI1jOszkARvLFBR1eU-B9yUXMw,235
 doppy/utils.py,sha256=lENDTzMVjCOA15Va9WZ6cou-foL5bGbNt4-NbDcnXpc,223
 doppy/__init__.py,sha256=Af7_8p3oN1nTqS9fo0mVKVuiKf5CAEK69uQa32CSFBA,197
 doppy/__main__.py,sha256=38hIWWfanILuBBGorQiAaleSC4qYJoIxuzVBkxf7Dng,371
-doppy/rs.pyd,sha256=xjawDfh3xMkWLqbcN9pDVB9LBM_iUK5IqMLY6WnwSI0,2100736
-doppy-0.3.4.dist-info/RECORD,,
+doppy/rs.pyd,sha256=37LOV4oBENi0N_Ahk39EHsWaGzuZZ-lr69HTqnNMZUQ,2128896
+doppy-0.3.6.dist-info/RECORD,,

{doppy-0.3.4.dist-info → doppy-0.3.6.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: maturin (1.7.1)
+Generator: maturin (1.7.4)
 Root-Is-Purelib: false
 Tag: cp310-abi3-win_amd64