Skip to content

Commit a363eac

Browse files
tristandijkstrabsipocz
authored andcommitted
Add star catalog code to get_observations
1 parent a20e431 commit a363eac

File tree

1 file changed

+27
-24
lines changed

1 file changed

+27
-24
lines changed

astroquery/mpc/core.py

Lines changed: 27 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -868,6 +868,8 @@ def get_observations_async(self, targetid, *,
868868
+-------------------+--------------------------------------------+
869869
| ``phottype`` (*) | comet photometry type (nuclear/total, str) |
870870
+-------------------+--------------------------------------------+
871+
| ``catalog`` (!) | star catalog used in the observation (str) |
872+
+-------------------+--------------------------------------------+
871873
| ``observatory`` | IAU observatory code (str) |
872874
+-------------------+--------------------------------------------+
873875
@@ -877,29 +879,30 @@ def get_observations_async(self, targetid, *,
877879
(#): Parameters ``Note1`` and ``Note2`` are defined `here
878880
<https://minorplanetcenter.net/iau/info/OpticalObs.html>`_.
879881
882+
(!): Definitions of catalog codes can be found `here
883+
<https://www.minorplanetcenter.net/iau/info/CatalogueCodes.html>`_.
884+
880885
881886
Examples
882887
--------
883888
>>> from astroquery.mpc import MPC
884889
>>> MPC.get_observations(12893) # doctest: +SKIP
885-
<QTable masked=True length=1401>
886-
number desig discovery note1 ... mag band observatory
887-
... mag
888-
int64 str9 str1 str1 ... float64 str1 str3
889-
------ --------- --------- ----- ... ------- ---- -----------
890-
12893 1998 QS55 -- -- ... 0.0 -- 413
891-
12893 1998 QS55 -- -- ... 0.0 -- 413
892-
12893 1998 QS55 * 4 ... 0.0 -- 809
893-
12893 1998 QS55 -- 4 ... 0.0 -- 809
894-
12893 1998 QS55 -- 4 ... 0.0 -- 809
895-
12893 1998 QS55 -- 4 ... 18.4 -- 809
896-
... ... ... ... ... ... ... ...
897-
12893 1998 QS55 -- -- ... 18.63 c T05
898-
12893 1998 QS55 -- -- ... 18.55 c T05
899-
12893 1998 QS55 -- -- ... 18.3 r I41
900-
12893 1998 QS55 -- -- ... 18.3 r I41
901-
12893 1998 QS55 -- -- ... 18.2 r I41
902-
12893 1998 QS55 -- -- ... 18.3 r I41
890+
<QTable length=2772>
891+
number desig discovery note1 ... band catalog observatory
892+
...
893+
int32 str9 str1 str1 ... str1 str1 str3
894+
------ --------- --------- ----- ... ---- ------- -----------
895+
12893 1998 QS55 -- -- ... -- -- 413
896+
12893 1998 QS55 -- -- ... -- -- 413
897+
12893 1998 QS55 * 4 ... -- -- 809
898+
12893 1998 QS55 -- 4 ... -- -- 809
899+
12893 1998 QS55 -- 4 ... -- -- 809
900+
... ... ... ... ... ... ... ...
901+
12893 1998 QS55 -- -- ... o V T05
902+
12893 1998 QS55 -- -- ... o V M22
903+
12893 1998 QS55 -- -- ... o V M22
904+
12893 1998 QS55 -- -- ... o V M22
905+
12893 1998 QS55 -- -- ... o V M22
903906
"""
904907

905908
request_payload = {'table': 'observations'}
@@ -1207,11 +1210,11 @@ def _parse_result(self, result, **kwargs):
12071210
names=('number', 'pdesig', 'discovery',
12081211
'note1', 'note2', 'epoch',
12091212
'RA', 'DEC', 'mag', 'band',
1210-
'observatory'),
1213+
'catalog', 'observatory'),
12111214
col_starts=(0, 5, 12, 13, 14, 15,
1212-
32, 44, 65, 70, 77),
1215+
32, 44, 65, 70, 71, 77),
12131216
col_ends=(4, 11, 12, 13, 14, 31,
1214-
43, 55, 69, 70, 79),
1217+
43, 55, 69, 70, 71, 79),
12151218
fast_reader=False)
12161219

12171220
# convert asteroid designations
@@ -1252,11 +1255,11 @@ def _parse_result(self, result, **kwargs):
12521255
names=('number', 'comettype', 'desig',
12531256
'note1', 'note2', 'epoch',
12541257
'RA', 'DEC', 'mag', 'phottype',
1255-
'observatory'),
1258+
'catalog', 'observatory'),
12561259
col_starts=(0, 4, 5, 13, 14, 15,
1257-
32, 44, 65, 70, 77),
1260+
32, 44, 65, 70, 71, 77),
12581261
col_ends=(3, 4, 12, 13, 14, 31,
1259-
43, 55, 69, 70, 79),
1262+
43, 55, 69, 70, 71, 79),
12601263
fast_reader=False)
12611264

12621265
# convert comet designations

0 commit comments

Comments
 (0)