Skip to content

Commit

Permalink
#58 Merge pull request from deshima-dev/astropenguin/issue57
Browse files Browse the repository at this point in the history
Add DESHIMA-specific filter and response information
  • Loading branch information
astropenguin authored Jul 9, 2024
2 parents 0236a50 + eea9aac commit afbdfdd
Show file tree
Hide file tree
Showing 6 changed files with 43 additions and 5 deletions.
4 changes: 2 additions & 2 deletions CITATION.cff
Original file line number Diff line number Diff line change
Expand Up @@ -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.9.0
date-released: 2023-12-04
version: 0.10.0
date-released: 2024-07-09
license: "MIT"
doi: "10.5281/zenodo.8151950"
url: "https://github.com/deshima-dev/dems"
Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2022-2023 Akio Taniguchi
Copyright (c) 2022-2024 Akio Taniguchi

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,10 @@ da = MS.new(
| | 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) |
| | 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 | - | - |
Expand Down
2 changes: 1 addition & 1 deletion dems/__init__.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
__all__ = ["d1", "d2"]
__version__ = "0.9.0"
__version__ = "0.10.0"


# submodules
Expand Down
34 changes: 34 additions & 0 deletions dems/d2.py
Original file line number Diff line number Diff line change
Expand Up @@ -299,6 +299,32 @@ class D2MkidFrequency:
units: Attr[str] = "Hz"


@dataclass
class D2MkidQ:
data: Data[Ch, float]
long_name: Attr[str] = "[DESHIMA 2.0] MKID quality factor"


@dataclass
class D2RespFwd:
data: Data[Ch, float]
long_name: Attr[str] = "[DESHIMA 2.0] Forward efficiency"


@dataclass
class D2RespP0:
data: Data[Ch, float]
long_name: Attr[str] = "[DESHIMA 2.0] Proportional coefficient of responsivity"
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]
Expand Down Expand Up @@ -377,6 +403,10 @@ class MS(AsDataArray):
# DESHIMA 2.0 specific
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] = ""
Expand Down Expand Up @@ -424,6 +454,10 @@ class Cube(AsDataArray):
# DESHIMA 2.0 specific
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] = ""
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tool.poetry]
name = "dems"
version = "0.9.0"
version = "0.10.0"
description = "DESHIMA measurement set by DataArray"
authors = ["Akio Taniguchi <taniguchi@a.phys.nagoya-u.ac.jp>"]
license = "MIT"
Expand Down

0 comments on commit afbdfdd

Please sign in to comment.