Skip to content

Commit d03ba07

Browse files
astropenguinastropenguin
authored
#60 Merge pull request from deshima-dev/astropenguin/issue59
Release v2024.7.0
2 parents afbdfdd + 97c6a10 commit d03ba07

5 files changed

Lines changed: 26 additions & 32 deletions

File tree

‎CITATION.cff‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ message: "If you use this software, please cite it as below."
33

44
title: "dems"
55
abstract: "DESHIMA measurement set by DataArray"
6-
version: 0.10.0
7-
date-released: 2024-07-09
6+
version: 2024.7.0
7+
date-released: 2024-07-11
88
license: "MIT"
99
doi: "10.5281/zenodo.8151950"
1010
url: "https://github.com/deshima-dev/dems"

‎README.md‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ DESHIMA measurement set by DataArray
1111
## Installation
1212

1313
```shell
14-
pip install dems
14+
pip install dems==2024.7.0
1515
```
1616

1717
## Usage
@@ -51,21 +51,21 @@ da = MS.new(
5151
| Weather information | temperature | Coordinate | Ground atmospheric temperature | K | 0.0 | numpy.ndarray | (time,) | float64 |
5252
| | pressure | Coordinate | Ground atmospheric pressure | Pa | 0.0 | numpy.ndarray | (time,) | float64 |
5353
| | humidity | Coordinate | Ground relative humidity | 1 | 0.0 | numpy.ndarray | (time,) | float64 |
54-
| | wind_speed | Coordinate | Ground wind speed | m/s | 0.0 | numpy.ndarray | (time,) | float64 |
54+
| | wind_speed | Coordinate | Ground wind speed | m s^-1 | 0.0 | numpy.ndarray | (time,) | float64 |
5555
| | wind_direction | Coordinate | Ground wind direction | deg | 0.0 | numpy.ndarray | (time,) | float64 |
5656
| Data information | bandwidth | Coordinate | Effective channel bandwidth | Hz | 0.0 | numpy.ndarray | (chan,) | float64 |
5757
| | frequency | Coordinate | Channel center frequency | Hz | 0.0 | numpy.ndarray | (chan,) | float64 |
5858
| | beam_major | Coordinate | Beam major axis | deg | 0.0 | numpy.ndarray | (chan,) | float64 |
5959
| | beam_minor | Coordinate | Beam minor axis | deg | 0.0 | numpy.ndarray | (chan,) | float64 |
6060
| | beam_pa | Coordinate | Beam position angle | deg | 0.0 | numpy.ndarray | (chan,) | float64 |
61-
| | exposure | Coordinate | Sample exposure time | s | 0.00625 | numpy.ndarray | () | float64 |
62-
| | interval | Coordinate | Sample interval time | s | 0.00625 | numpy.ndarray | () | float64 |
61+
| | exposure | Coordinate | Sample exposure time | s | 0.0 | numpy.ndarray | () | float64 |
62+
| | interval | Coordinate | Sample interval time | s | 0.0 | numpy.ndarray | () | float64 |
6363
| Observation information | observation | Attribute | Observation name | - | "" | str | - | - |
6464
| | observer | Attribute | Observer name | - | "" | str | - | - |
6565
| | project | Attribute | Project name | - | "" | str | - | - |
6666
| | object | Attribute | Object name | - | "" | str | - | - |
67-
| | telescope_name | Attribute | Telescope name | - | "ASTE" | str | - | - |
68-
| | telescope_diameter | Attribute | Telescope dish diameter | m | 10.0 | float | - | - |
67+
| | telescope_name | Attribute | Telescope name | - | "" | str | - | - |
68+
| | telescope_diameter | Attribute | Telescope dish diameter | m | 0.0 | float | - | - |
6969
| | telescope_coordinates | Attribute | Telescope ITRS coordinates | m | (0.0, 0.0, 0.0) | "tuple[float, float, float]" | - | - |
7070
| ASTE specific | aste_cabin_temperature | Coordinate | [ASTE] Cabin temperature | K | 0.0 | numpy.ndarray | (time,) | float64 |
7171
| | aste_obs_group | Attribute | [ASTE] Observation group | - | "" | str | - | - |
@@ -83,12 +83,12 @@ da = MS.new(
8383
| | aste_misti_lat | Coordinate | [ASTE] MiSTI sky latitude | deg | 0.0 | numpy.ndarray | (time,) | float64 |
8484
| | aste_misti_pwv | Coordinate | [ASTE] MiSTI measured PWV | mm | 0.0 | numpy.ndarray | (time,) | float64 |
8585
| | aste_misti_frame | Coordinate | [ASTE] MiSTI sky coordinate frame | - | "altaz" | numpy.ndarray | () | str (<U16) |
86-
| DESHIMA 2.0 specific | d2_mkid_type | Coordinate | [DESHIMA 2.0] MKID type | - | "" | numpy.ndarray | (chan,) | str (<U16) |
86+
| DESHIMA 2.0 specific | d2_mkid_id | Coordinate | [DESHIMA 2.0] MKID master ID (= chan) | - | "" | numpy.ndarray | (chan,) | int64 |
87+
| | d2_mkid_type | Coordinate | [DESHIMA 2.0] MKID type | - | "" | numpy.ndarray | (chan,) | str (<U16) |
8788
| | d2_mkid_frequency | Coordinate | [DESHIMA 2.0] MKID center frequency | Hz | 0.0 | numpy.ndarray | (chan,) | float64 |
8889
| | d2_mkid_q | Coordinate | [DESHIMA 2.0] MKID quality factor | - | 0.0 | numpy.ndarray | (chan,) | float64 |
8990
| | d2_resp_fwd | Coordinate | [DESHIMA 2.0] Forward efficiency | - | 0.0 | numpy.ndarray | (chan,) | float64 |
9091
| | d2_resp_p0 | Coordinate | [DESHIMA 2.0] Proportional coefficient of responsivity | K^-0.5 | 0.0 | numpy.ndarray | (chan,) | float64 |
91-
| | d2_resp_t0 | Coordinate | [DESHIMA 2.0] Correction temperature of responsivity | K | 0.0 | numpy.ndarray | (chan,) | float64 |
9292
| | d2_roomchopper_isblocking | Coordinate | [DESHIMA 2.0] Whether room chopper is blocking sensor | - | False | numpy.ndarray | (time,) | bool |
9393
| | d2_skychopper_isblocking | Coordinate | [DESHIMA 2.0] Whether sky chopper is blocking sensor | - | False | numpy.ndarray | (time,) | bool |
9494
| | d2_ddb_version | Attribute | [DESHIMA 2.0] DDB version | - | "" | str | - | - |

‎dems/__init__.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
__all__ = ["d1", "d2"]
2-
__version__ = "0.10.0"
2+
__version__ = "2024.7.0"
33

44

55
# submodules

‎dems/d2.py‎

Lines changed: 14 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,6 @@
2525

2626

2727
# constants
28-
ASTE_ITRS_COORDS = (
29-
+2230817.2140945992,
30-
-5440188.022176585,
31-
-2475718.801708271,
32-
)
3328
CUBE_DIMS = "chan", "lat", "lon"
3429
MS_DIMS = "time", "chan"
3530

@@ -151,7 +146,7 @@ class Humidity:
151146
class WindSpeed:
152147
data: Data[Ti, float]
153148
long_name: Attr[str] = "Ground wind speed"
154-
units: Attr[str] = "m/s"
149+
units: Attr[str] = "m s^-1"
155150

156151

157152
@dataclass
@@ -286,6 +281,12 @@ class AsteMistiFrame:
286281
long_name: Attr[str] = "[ASTE] MiSTI sky coordinate frame"
287282

288283

284+
@dataclass
285+
class D2MkidId:
286+
data: Data[Ch, int]
287+
long_name: Attr[str] = "[DESHIMA 2.0] MKID master ID"
288+
289+
289290
@dataclass
290291
class D2MkidType:
291292
data: Data[Ch, Literal["U16"]]
@@ -318,13 +319,6 @@ class D2RespP0:
318319
units: Attr[str] = "K^-0.5"
319320

320321

321-
@dataclass
322-
class D2RespT0:
323-
data: Data[Ch, float]
324-
long_name: Attr[str] = "[DESHIMA 2.0] Correction temperature of responsivity"
325-
units: Attr[str] = "K"
326-
327-
328322
@dataclass
329323
class D2RoomchopperIsblocking:
330324
data: Data[Ti, bool]
@@ -373,16 +367,16 @@ class MS(AsDataArray):
373367
beam_major: Coordof[BeamMajor] = 0.0
374368
beam_minor: Coordof[BeamMinor] = 0.0
375369
beam_pa: Coordof[BeamPa] = 0.0
376-
exposure: Coordof[Exposure] = 0.00625
377-
interval: Coordof[Interval] = 0.00625
370+
exposure: Coordof[Exposure] = 0.0
371+
interval: Coordof[Interval] = 0.0
378372
# observation information
379373
observation: Attr[str] = ""
380374
observer: Attr[str] = ""
381375
project: Attr[str] = ""
382376
object: Attr[str] = ""
383-
telescope_name: Attr[str] = "ASTE"
384-
telescope_diameter: Attr[float] = 10.0
385-
telescope_coordinates: Attr[Tuple[float, float, float]] = ASTE_ITRS_COORDS
377+
telescope_name: Attr[str] = ""
378+
telescope_diameter: Attr[float] = 0.0
379+
telescope_coordinates: Attr[Tuple[float, float, float]] = 0.0, 0.0, 0.0
386380
# ASTE specific
387381
aste_cabin_temperature: Coordof[AsteCabinTemperature] = 0.0
388382
aste_obs_group: Attr[str] = ""
@@ -401,12 +395,12 @@ class MS(AsDataArray):
401395
aste_misti_pwv: Coordof[AsteMistiPwv] = 0.0
402396
aste_misti_frame: Coordof[AsteMistiFrame] = "altaz"
403397
# DESHIMA 2.0 specific
398+
d2_mkid_id: Coordof[D2MkidId] = 0
404399
d2_mkid_type: Coordof[D2MkidType] = ""
405400
d2_mkid_frequency: Coordof[D2MkidFrequency] = 0.0
406401
d2_mkid_q: Coordof[D2MkidQ] = 0.0
407402
d2_resp_fwd: Coordof[D2RespFwd] = 0.0
408403
d2_resp_p0: Coordof[D2RespP0] = 0.0
409-
d2_resp_t0: Coordof[D2RespT0] = 0.0
410404
d2_roomchopper_isblocking: Coordof[D2RoomchopperIsblocking] = False
411405
d2_skychopper_isblocking: Coordof[D2SkychopperIsblocking] = False
412406
d2_ddb_version: Attr[str] = ""
@@ -452,12 +446,12 @@ class Cube(AsDataArray):
452446
aste_obs_table: Attr[str] = ""
453447
aste_obs_user: Attr[str] = ""
454448
# DESHIMA 2.0 specific
449+
d2_mkid_id: Coordof[D2MkidId] = 0
455450
d2_mkid_type: Coordof[D2MkidType] = ""
456451
d2_mkid_frequency: Coordof[D2MkidFrequency] = 0.0
457452
d2_mkid_q: Coordof[D2MkidQ] = 0.0
458453
d2_resp_fwd: Coordof[D2RespFwd] = 0.0
459454
d2_resp_p0: Coordof[D2RespP0] = 0.0
460-
d2_resp_t0: Coordof[D2RespT0] = 0.0
461455
d2_ddb_version: Attr[str] = ""
462456
d2_demerge_version: Attr[str] = ""
463457
d2_dems_version: Attr[str] = ""

‎pyproject.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[tool.poetry]
22
name = "dems"
3-
version = "0.10.0"
3+
version = "2024.7.0"
44
description = "DESHIMA measurement set by DataArray"
55
authors = ["Akio Taniguchi <taniguchi@a.phys.nagoya-u.ac.jp>"]
66
license = "MIT"

0 commit comments

Comments
 (0)