#60 Merge pull request from deshima-dev/astropenguin/issue59

Release v2024.7.0

CITATION.cff

@@ -3,8 +3,8 @@ message: "If you use this software, please cite it as below."
 
 title: "dems"
 abstract: "DESHIMA measurement set by DataArray"
-version: 0.10.0
-date-released: 2024-07-09
+version: 2024.7.0
+date-released: 2024-07-11
 license: "MIT"
 doi: "10.5281/zenodo.8151950"
 url: "https://github.com/deshima-dev/dems"

README.md

@@ -11,7 +11,7 @@ DESHIMA measurement set by DataArray
 ## Installation
 
 ```shell
-pip install dems
+pip install dems==2024.7.0
 ```
 
 ## Usage
@@ -51,21 +51,21 @@ da = MS.new(
 | Weather information | temperature | Coordinate | Ground atmospheric temperature | K | 0.0 | numpy.ndarray | (time,) | float64 |
 |  | pressure | Coordinate | Ground atmospheric pressure | Pa | 0.0 | numpy.ndarray | (time,) | float64 |
 |  | humidity | Coordinate | Ground relative humidity | 1 | 0.0 | numpy.ndarray | (time,) | float64 |
-|  | wind_speed | Coordinate | Ground wind speed | m/s | 0.0 | numpy.ndarray | (time,) | float64 |
+|  | wind_speed | Coordinate | Ground wind speed | m s^-1 | 0.0 | numpy.ndarray | (time,) | float64 |
 |  | wind_direction | Coordinate | Ground wind direction | deg | 0.0 | numpy.ndarray | (time,) | float64 |
 | Data information | bandwidth | Coordinate | Effective channel bandwidth | Hz | 0.0 | numpy.ndarray | (chan,) | float64 |
 |  | frequency | Coordinate | Channel center frequency | Hz | 0.0 | numpy.ndarray | (chan,) | float64 |
 |  | beam_major | Coordinate | Beam major axis | deg | 0.0 | numpy.ndarray | (chan,) | float64 |
 |  | beam_minor | Coordinate | Beam minor axis | deg | 0.0 | numpy.ndarray | (chan,) | float64 |
 |  | beam_pa | Coordinate | Beam position angle | deg | 0.0 | numpy.ndarray | (chan,) | float64 |
-|  | exposure | Coordinate | Sample exposure time | s | 0.00625 | numpy.ndarray | () | float64 |
-|  | interval | Coordinate | Sample interval time | s | 0.00625 | numpy.ndarray | () | float64 |
+|  | exposure | Coordinate | Sample exposure time | s | 0.0 | numpy.ndarray | () | float64 |
+|  | interval | Coordinate | Sample interval time | s | 0.0 | numpy.ndarray | () | float64 |
 | Observation information | observation | Attribute | Observation name | - | "" | str | - | - |
 |  | observer | Attribute | Observer name | - | "" | str | - | - |
 |  | project | Attribute | Project name | - | "" | str | - | - |
 |  | object | Attribute | Object name | - | "" | str | - | - |
-|  | telescope_name | Attribute | Telescope name | - | "ASTE" | str | - | - |
-|  | telescope_diameter | Attribute | Telescope dish diameter | m | 10.0 | float | - | - |
+|  | telescope_name | Attribute | Telescope name | - | "" | str | - | - |
+|  | telescope_diameter | Attribute | Telescope dish diameter | m | 0.0 | float | - | - |
 |  | telescope_coordinates | Attribute | Telescope ITRS coordinates | m | (0.0, 0.0, 0.0) | "tuple[float, float, float]" | - | - |
 | ASTE specific | aste_cabin_temperature | Coordinate | [ASTE] Cabin temperature | K | 0.0 | numpy.ndarray | (time,) | float64 |
 |  | aste_obs_group | Attribute | [ASTE] Observation group | - | "" | str | - | - |
@@ -83,12 +83,12 @@ da = MS.new(
 |  | aste_misti_lat | Coordinate | [ASTE] MiSTI sky latitude | deg | 0.0 | numpy.ndarray | (time,) | float64 |
 |  | aste_misti_pwv | Coordinate | [ASTE] MiSTI measured PWV | mm | 0.0 | numpy.ndarray | (time,) | float64 |
 |  | aste_misti_frame | Coordinate | [ASTE] MiSTI sky coordinate frame | - | "altaz" | numpy.ndarray | () | str (<U16) |
-| DESHIMA 2.0 specific | d2_mkid_type | Coordinate | [DESHIMA 2.0] MKID type | - | "" | numpy.ndarray | (chan,) | str (<U16) |
+| DESHIMA 2.0 specific | d2_mkid_id | Coordinate | [DESHIMA 2.0] MKID master ID (= chan) | - | "" | numpy.ndarray | (chan,) | int64 |
+|  | d2_mkid_type | Coordinate | [DESHIMA 2.0] MKID type | - | "" | numpy.ndarray | (chan,) | str (<U16) |
 |  | d2_mkid_frequency | Coordinate | [DESHIMA 2.0] MKID center frequency | Hz | 0.0 | numpy.ndarray | (chan,) | float64 |
 |  | d2_mkid_q | Coordinate | [DESHIMA 2.0] MKID quality factor | - | 0.0 | numpy.ndarray | (chan,) | float64 |
 |  | d2_resp_fwd | Coordinate | [DESHIMA 2.0] Forward efficiency | - | 0.0 | numpy.ndarray | (chan,) | float64 |
 |  | d2_resp_p0 | Coordinate | [DESHIMA 2.0] Proportional coefficient of responsivity | K^-0.5 | 0.0 | numpy.ndarray | (chan,) | float64 |
-|  | d2_resp_t0 | Coordinate | [DESHIMA 2.0] Correction temperature of responsivity | K | 0.0 | numpy.ndarray | (chan,) | float64 |
 |  | d2_roomchopper_isblocking | Coordinate | [DESHIMA 2.0] Whether room chopper is blocking sensor | - | False | numpy.ndarray | (time,) | bool |
 |  | d2_skychopper_isblocking | Coordinate | [DESHIMA 2.0] Whether sky chopper is blocking sensor | - | False | numpy.ndarray | (time,) | bool |
 |  | d2_ddb_version | Attribute | [DESHIMA 2.0] DDB version | - | "" | str | - | - |

dems/__init__.py

@@ -1,5 +1,5 @@
 __all__ = ["d1", "d2"]
-__version__ = "0.10.0"
+__version__ = "2024.7.0"
 
 
 # submodules

dems/d2.py

@@ -25,11 +25,6 @@
 
 
 # constants
-ASTE_ITRS_COORDS = (
-    +2230817.2140945992,
-    -5440188.022176585,
-    -2475718.801708271,
-)
 CUBE_DIMS = "chan", "lat", "lon"
 MS_DIMS = "time", "chan"
 
@@ -151,7 +146,7 @@ class Humidity:
 class WindSpeed:
     data: Data[Ti, float]
     long_name: Attr[str] = "Ground wind speed"
-    units: Attr[str] = "m/s"
+    units: Attr[str] = "m s^-1"
 
 
 @dataclass
@@ -286,6 +281,12 @@ class AsteMistiFrame:
     long_name: Attr[str] = "[ASTE] MiSTI sky coordinate frame"
 
 
+@dataclass
+class D2MkidId:
+    data: Data[Ch, int]
+    long_name: Attr[str] = "[DESHIMA 2.0] MKID master ID"
+
+
 @dataclass
 class D2MkidType:
     data: Data[Ch, Literal["U16"]]
@@ -318,13 +319,6 @@ class D2RespP0:
     units: Attr[str] = "K^-0.5"
 
 
-@dataclass
-class D2RespT0:
-    data: Data[Ch, float]
-    long_name: Attr[str] = "[DESHIMA 2.0] Correction temperature of responsivity"
-    units: Attr[str] = "K"
-
-
 @dataclass
 class D2RoomchopperIsblocking:
     data: Data[Ti, bool]
@@ -373,16 +367,16 @@ class MS(AsDataArray):
     beam_major: Coordof[BeamMajor] = 0.0
     beam_minor: Coordof[BeamMinor] = 0.0
     beam_pa: Coordof[BeamPa] = 0.0
-    exposure: Coordof[Exposure] = 0.00625
-    interval: Coordof[Interval] = 0.00625
+    exposure: Coordof[Exposure] = 0.0
+    interval: Coordof[Interval] = 0.0
     # observation information
     observation: Attr[str] = ""
     observer: Attr[str] = ""
     project: Attr[str] = ""
     object: Attr[str] = ""
-    telescope_name: Attr[str] = "ASTE"
-    telescope_diameter: Attr[float] = 10.0
-    telescope_coordinates: Attr[Tuple[float, float, float]] = ASTE_ITRS_COORDS
+    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_cabin_temperature: Coordof[AsteCabinTemperature] = 0.0
     aste_obs_group: Attr[str] = ""
@@ -401,12 +395,12 @@ class MS(AsDataArray):
     aste_misti_pwv: Coordof[AsteMistiPwv] = 0.0
     aste_misti_frame: Coordof[AsteMistiFrame] = "altaz"
     # DESHIMA 2.0 specific
+    d2_mkid_id: Coordof[D2MkidId] = 0
     d2_mkid_type: Coordof[D2MkidType] = ""
     d2_mkid_frequency: Coordof[D2MkidFrequency] = 0.0
     d2_mkid_q: Coordof[D2MkidQ] = 0.0
     d2_resp_fwd: Coordof[D2RespFwd] = 0.0
     d2_resp_p0: Coordof[D2RespP0] = 0.0
-    d2_resp_t0: Coordof[D2RespT0] = 0.0
     d2_roomchopper_isblocking: Coordof[D2RoomchopperIsblocking] = False
     d2_skychopper_isblocking: Coordof[D2SkychopperIsblocking] = False
     d2_ddb_version: Attr[str] = ""
@@ -452,12 +446,12 @@ class Cube(AsDataArray):
     aste_obs_table: Attr[str] = ""
     aste_obs_user: Attr[str] = ""
     # DESHIMA 2.0 specific
+    d2_mkid_id: Coordof[D2MkidId] = 0
     d2_mkid_type: Coordof[D2MkidType] = ""
     d2_mkid_frequency: Coordof[D2MkidFrequency] = 0.0
     d2_mkid_q: Coordof[D2MkidQ] = 0.0
     d2_resp_fwd: Coordof[D2RespFwd] = 0.0
     d2_resp_p0: Coordof[D2RespP0] = 0.0
-    d2_resp_t0: Coordof[D2RespT0] = 0.0
     d2_ddb_version: Attr[str] = ""
     d2_demerge_version: Attr[str] = ""
     d2_dems_version: Attr[str] = ""

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "dems"
-version = "0.10.0"
+version = "2024.7.0"
 description = "DESHIMA measurement set by DataArray"
 authors = ["Akio Taniguchi <taniguchi@a.phys.nagoya-u.ac.jp>"]
 license = "MIT"