diff --git a/CITATION.cff b/CITATION.cff index 4a68f21..098ef13 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -28,5 +28,5 @@ keywords: - spectroscopy - submillimeter license: MIT -version: 2025.6.0 -date-released: '2025-06-16' +version: 2025.6.1 +date-released: '2025-06-17' diff --git a/README.md b/README.md index 507840f..a2a83c4 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ DESHIMA measurement set by DataArray ## Installation ```shell -pip install dems==2025.6.0 +pip install dems==2025.6.1 ``` ## Usage diff --git a/dems/__init__.py b/dems/__init__.py index 8117dd2..b2e28a3 100644 --- a/dems/__init__.py +++ b/dems/__init__.py @@ -1,5 +1,5 @@ __all__ = ["d1", "d2"] -__version__ = "2025.6.0" +__version__ = "2025.6.1" # submodules diff --git a/dems/d2.py b/dems/d2.py index e61ffab..c1c0631 100644 --- a/dems/d2.py +++ b/dems/d2.py @@ -69,6 +69,18 @@ class Weight: long_name: Attr[str] = "Data weights" +@dataclass +class CubeMask: + data: Data[Tuple[Ch, Lt, Ln], bool] + long_name: Attr[str] = "Data masks" + + +@dataclass +class CubeWeight: + data: Data[Tuple[Ch, Lt, Ln], float] + long_name: Attr[str] = "Data weights" + + @dataclass class Observation: data: Data[Ti, Literal["U16"]] @@ -450,6 +462,8 @@ class Cube(AsDataArray): # data data: Data[Tuple[Ch, Lt, Ln], Any] + mask: Coordof[CubeMask] = False + weight: Coordof[CubeWeight] = 1.0 long_name: Attr[str] = "Brightness" units: Attr[str] = "K" name: Name[str] = "Cube" @@ -457,8 +471,9 @@ class Cube(AsDataArray): chan: Coordof[Chan_] = 0 lon: Coordof[Lon_] = 0.0 lat: Coordof[Lat_] = 0.0 - # data information + # telescope pointing frame: Coordof[Frame] = "altaz" + # data information bandwidth: Coordof[Bandwidth] = 0.0 frequency: Coordof[Frequency] = 0.0 beam_major: Coordof[BeamMajor] = 0.0 @@ -468,6 +483,9 @@ class Cube(AsDataArray): observer: Attr[str] = "" project: Attr[str] = "" object: Attr[str] = "" + telescope_name: Attr[str] = "" + telescope_diameter: Attr[float] = 0.0 + telescope_coordinates: Attr[Tuple[float, float, float]] = 0.0, 0.0, 0.0 # ASTE specific aste_obs_group: Attr[str] = "" aste_obs_id: Attr[str] = "" diff --git a/pyproject.toml b/pyproject.toml index 32398ca..adafa15 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "dems" -version = "2025.6.0" +version = "2025.6.1" description = "DESHIMA Measurement Set" readme = "README.md" keywords = [ @@ -35,7 +35,12 @@ homepage = "https://github.com/deshima-dev/dems" repository = "https://github.com/deshima-dev/dems" [dependency-groups] -dev = ["black>=24.4", "ipython>=8.18", "pyright>=1.1", "pytest>=8.2"] +dev = [ + "black>=25,<26", + "ipython>=8,<10", + "pyright>=1,<2", + "pytest>=8,<9", +] [build-system] requires = ["hatchling"] diff --git a/uv.lock b/uv.lock index 304b7be..bd23df5 100644 --- a/uv.lock +++ b/uv.lock @@ -108,7 +108,7 @@ wheels = [ [[package]] name = "dems" -version = "2024.7.2" +version = "2025.6.1" source = { editable = "." } dependencies = [ { name = "xarray-dataclasses" }, @@ -129,10 +129,10 @@ requires-dist = [{ name = "xarray-dataclasses", specifier = ">=1.8,<2.0" }] [package.metadata.requires-dev] dev = [ - { name = "black", specifier = ">=24.4" }, - { name = "ipython", specifier = ">=8.18" }, - { name = "pyright", specifier = ">=1.1" }, - { name = "pytest", specifier = ">=8.2" }, + { name = "black", specifier = ">=25,<26" }, + { name = "ipython", specifier = ">=8,<10" }, + { name = "pyright", specifier = ">=1,<2" }, + { name = "pytest", specifier = ">=8,<9" }, ] [[package]]