From 4efc43e05bdb6e8585f305f05af66a49bebd43bd Mon Sep 17 00:00:00 2001 From: Robert David Stein Date: Mon, 20 May 2024 12:15:20 -0700 Subject: [PATCH] Increase dithersize (#69) --- pyproject.toml | 6 +++--- tests/testdata/test_schedule.json | 2 +- wintertoo/data/observing_request_schema.json | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index c4867cc..e85b029 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta" [project] name = "wintertoo" -version = "1.5.1" +version = "1.6.0" description = "" authors = [ {name = "Robert Stein", email = "rdstein@caltech.edu"}, @@ -32,8 +32,8 @@ classifiers = [ ] dependencies = [ "pandas", - "astropy", - "astroplan", + "astropy>=6.0.0", + "astroplan>=0.10", "matplotlib", "numpy", "pytz", diff --git a/tests/testdata/test_schedule.json b/tests/testdata/test_schedule.json index 79813ad..fa15188 100644 --- a/tests/testdata/test_schedule.json +++ b/tests/testdata/test_schedule.json @@ -1 +1 @@ -{"targName":{"0":null,"1":null,"2":null,"3":null},"raDeg":{"0":173.7056754,"1":173.7056754,"2":173.7056754,"3":173.7056754},"decDeg":{"0":11.253441,"1":11.253441,"2":11.253441,"3":11.253441},"fieldID":{"0":999999999,"1":999999999,"2":999999999,"3":999999999},"filter":{"0":"u","1":"g","2":"r","3":"i"},"visitExpTime":{"0":960.0,"1":960.0,"2":960.0,"3":960.0},"singleExpTime":{"0":120.0,"1":120.0,"2":120.0,"3":120.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":8,"1":8,"2":8,"3":8},"ditherStepSize":{"0":30.0,"1":30.0,"2":30.0,"3":30.0},"bestDetector":{"0":true,"1":true,"2":true,"3":true},"obsHistID":{"0":0,"1":1,"2":2,"3":3}} +{"targName":{"0":null,"1":null,"2":null,"3":null},"raDeg":{"0":173.7056754,"1":173.7056754,"2":173.7056754,"3":173.7056754},"decDeg":{"0":11.253441,"1":11.253441,"2":11.253441,"3":11.253441},"fieldID":{"0":999999999,"1":999999999,"2":999999999,"3":999999999},"filter":{"0":"u","1":"g","2":"r","3":"i"},"visitExpTime":{"0":960.0,"1":960.0,"2":960.0,"3":960.0},"singleExpTime":{"0":120.0,"1":120.0,"2":120.0,"3":120.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":8,"1":8,"2":8,"3":8},"ditherStepSize":{"0":90.0,"1":90.0,"2":90.0,"3":90.0},"bestDetector":{"0":true,"1":true,"2":true,"3":true},"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 00b7e67..f1328f6 100644 --- a/wintertoo/data/observing_request_schema.json +++ b/wintertoo/data/observing_request_schema.json @@ -15,7 +15,7 @@ "observed": {"anyOf": [{"type": "boolean", "default": false}, {"type" : "integer", "minimum" : 0, "maximum" : 1}]}, "maxAirmass": {"type": "number", "comment": "Maximum airmass for observation", "default": 2.0}, "ditherNumber": {"type": "integer", "default": 8}, - "ditherStepSize": {"type": "number", "comment": "arcsec", "default": 30.0}, + "ditherStepSize": {"type": "number", "comment": "arcsec", "default": 90.0}, "fieldID": {"type": "integer", "default": 999999999}, "targName": {"type": ["string", "null"], "comment": "Target name e.g. GW170817", "default": null}, "bestDetector": {"type": "boolean", "comment": "Center Ra/Dec of target on best detector", "default": true}