#136 Merge pull request from deshima-dev/astropenguin/issue135

Get observation table name from SET DES OBS_FILE
deshima-dev · Jul 6, 2024 · 5270d3d · 5270d3d
2 parents 6703b5b + 38929e5
commit 5270d3d
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/CITATION.cff b/CITATION.cff
@@ -31,5 +31,5 @@ keywords:
   - spectroscopy
   - deshima
 license: MIT
-version: 3.0.3
-date-released: '2024-07-05'
+version: 3.0.4
+date-released: '2024-07-06'
diff --git a/README.md b/README.md
@@ -11,7 +11,7 @@ DESHIMA merge code for observed datasets
 ## Installation
 
 ```shell
-pip install demerge==3.0.3
+pip install demerge==3.0.4
 ```
 
 ## Command line interface

diff --git a/demerge/__init__.py b/demerge/__init__.py
@@ -1,5 +1,5 @@
 __all__ = ["demerge", "merge", "reduce"]
-__version__ = "3.0.3"
+__version__ = "3.0.4"
 
 
 # standard library

diff --git a/demerge/merge/utils.py b/demerge/merge/utils.py
@@ -83,8 +83,8 @@ def load_obsinst(obsinst: Path) -> dict[str, Any]:
         for line in f:
             if "SET ANTENNA_G EPOCH" in line:
                 epoch = line.split()[-1].strip("'JB")
-            elif "% OBS=" in line:
-                obs = line.split("=")[-1].strip()
+            elif "SET DES OBS_FILE" in line:
+                obs_file = line.split()[-1].strip("'")
             elif "SET DES OBS_USER" in line:
                 obs_user = line.split()[-1].strip("'")
             elif "SET DES PROJECT" in line:
@@ -102,7 +102,7 @@ def load_obsinst(obsinst: Path) -> dict[str, Any]:
         ra, dec = 0.0, 0.0
 
     return {
-        "observation": obs,
+        "observation": obs_file,
         "observer": obs_user,
         "project": project,
         "object": src_name,

diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "demerge"
-version = "3.0.3"
+version = "3.0.4"
 description = "DESHIMA merge code for observed datasets"
 authors = [
     "Tatsuya Takekoshi <tatsuya.takekoshi@gmail.com>",