From 60240fe0223cbedc8f5f1337ae9b24d6172e2539 Mon Sep 17 00:00:00 2001 From: Robert Stein Date: Mon, 28 Aug 2023 21:38:25 -0700 Subject: [PATCH] Put targname in schedule --- tests/testdata/test_schedule.json | 2 +- wintertoo/data/observing_request_schema.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/testdata/test_schedule.json b/tests/testdata/test_schedule.json index 450afc0..45a9d6b 100644 --- a/tests/testdata/test_schedule.json +++ b/tests/testdata/test_schedule.json @@ -1 +1 @@ -{"raDeg":{"0":173.60947,"1":173.60947,"2":173.60947,"3":173.60947},"decDeg":{"0":11.16715,"1":11.16715,"2":11.16715,"3":11.16715},"fieldID":{"0":244641,"1":244641,"2":244641,"3":244641},"filter":{"0":"u","1":"g","2":"r","3":"i"},"visitExpTime":{"0":30.0,"1":30.0,"2":30.0,"3":30.0},"priority":{"0":50.0,"1":50.0,"2":50.0,"3":50.0},"progPI":{"0":"Stein","1":"Stein","2":"Stein","3":"Stein"},"progName":{"0":"2021A000","1":"2021A000","2":"2021A000","3":"2021A000"},"progID":{"0":1,"1":1,"2":1,"3":1},"validStart":{"0":62721.1894969287,"1":62721.1894969287,"2":62721.1894969287,"3":62721.1894969287},"validStop":{"0":62722.1894969452,"1":62722.1894969452,"2":62722.1894969452,"3":62722.1894969452},"observed":{"0":false,"1":false,"2":false,"3":false},"maxAirmass":{"0":2.0,"1":2.0,"2":2.0,"3":2.0},"ditherNumber":{"0":1,"1":1,"2":1,"3":1},"ditherStepSize":{"0":600.0,"1":600.0,"2":600.0,"3":600.0},"obsHistID":{"0":0,"1":1,"2":2,"3":3}} +{"raDeg":{"0":173.60947,"1":173.60947,"2":173.60947,"3":173.60947},"decDeg":{"0":11.16715,"1":11.16715,"2":11.16715,"3":11.16715},"fieldID":{"0":244641,"1":244641,"2":244641,"3":244641},"filter":{"0":"u","1":"g","2":"r","3":"i"},"visitExpTime":{"0":30.0,"1":30.0,"2":30.0,"3":30.0},"priority":{"0":50.0,"1":50.0,"2":50.0,"3":50.0},"progPI":{"0":"Stein","1":"Stein","2":"Stein","3":"Stein"},"progName":{"0":"2021A000","1":"2021A000","2":"2021A000","3":"2021A000"},"progID":{"0":1,"1":1,"2":1,"3":1},"validStart":{"0":62721.1894969287,"1":62721.1894969287,"2":62721.1894969287,"3":62721.1894969287},"validStop":{"0":62722.1894969452,"1":62722.1894969452,"2":62722.1894969452,"3":62722.1894969452},"observed":{"0":false,"1":false,"2":false,"3":false},"maxAirmass":{"0":2.0,"1":2.0,"2":2.0,"3":2.0},"ditherNumber":{"0":1,"1":1,"2":1,"3":1},"ditherStepSize":{"0":600.0,"1":600.0,"2":600.0,"3":600.0},"targName":{"0":null,"1":null,"2":null,"3":null},"obsHistID":{"0":0,"1":1,"2":2,"3":3}} diff --git a/wintertoo/data/observing_request_schema.json b/wintertoo/data/observing_request_schema.json index 7ba7b2f..b9fb1d1 100644 --- a/wintertoo/data/observing_request_schema.json +++ b/wintertoo/data/observing_request_schema.json @@ -17,7 +17,7 @@ "ditherNumber": {"type": "integer", "default": 1}, "ditherStepSize": {"type": "number", "comment": "arcsec", "default": 600.0}, "fieldID": {"type": "integer", "default": 999999999}, - "targName": {"type": "string", "comment": "Target name e.g. GW170817", "default": null} + "targName": {"type": ["string", "null"], "comment": "Target name e.g. GW170817", "default": null} }, "required": [ "obsHistID",