wintertoo 1.2.0__tar.gz → 1.3.1__tar.gz

{wintertoo-1.2.0 → wintertoo-1.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: wintertoo
-Version: 1.2.0
+Version: 1.3.1
 Author-email: Robert Stein <rdstein@caltech.edu>, Danielle Frostig <frostig@mit.edu>, Viraj Karambelkar <viraj@astro.caltech.edu>
 License: MIT
 Project-URL: homepage, https://github.com/winter-telescope/wintertoo

{wintertoo-1.2.0 → wintertoo-1.3.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "wintertoo"
-version = "1.2.0"
+version = "1.3.1"
 description = ""
 authors = [
     {name = "Robert Stein", email = "rdstein@caltech.edu"},

{wintertoo-1.2.0 → wintertoo-1.3.1}/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":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":30.0,"1":30.0,"2":30.0,"3":30.0},"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":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":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}}

{wintertoo-1.2.0 → wintertoo-1.3.1}/wintertoo/data/observing_request_schema.json

@@ -17,7 +17,8 @@
     "ditherNumber": {"type": "integer", "default": 1},
     "ditherStepSize": {"type": "number", "comment": "arcsec", "default": 30.0},
     "fieldID": {"type": "integer", "default": 999999999},
-    "targName": {"type": ["string", "null"], "comment": "Target name e.g. GW170817", "default": null}
+    "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}
   },
   "required": [
     "obsHistID",

{wintertoo-1.2.0 → wintertoo-1.3.1}/wintertoo/models/image.py

@@ -31,13 +31,13 @@ class ProgramImageQuery(BaseModel):
     )
     start_date: int = Field(
         title="Start date for images",
-        le=get_date(Time.now()),
+        le=get_date(Time.now() + 1 * u.day),
         default=get_date(Time.now() - 30.0 * u.day),
         examples=[get_date(Time.now() - 30.0 * u.day), "20230601"],
     )
     end_date: int = Field(
         title="End date for images",
-        le=get_date(Time.now()),
+        le=get_date(Time.now() + 1 * u.day),
         default=get_date(Time.now()),
         examples=[get_date(Time.now() - 30.0 * u.day), get_date(Time.now())],
     )

{wintertoo-1.2.0 → wintertoo-1.3.1}/wintertoo/models/too.py

@@ -64,6 +64,10 @@ class ToORequest(BaseModel):
         le=5,
         title="Allowed airmass range",
     )
+    use_best_detector: bool = Field(
+        default=get_default_value("bestDetector"),
+        title="Place ra/dec at the center of the best detector",
+    )
 
     @model_validator(mode="after")
     def validate_end_time(self):
@@ -127,6 +131,19 @@ class ObsWithRaDec(BaseModel):
         default=False,
     )
 
+    @model_validator(mode="after")
+    def validate_field_best_detector(self):
+        """
+        Field validator to ensure that the end time is greater than the start time
+
+        :return: validated field value
+        """
+        if self.use_best_detector & self.use_field_grid:
+            raise WinterValidationError(
+                "Cannot use both use_best_detector and use_field_grid"
+            )
+        return self
+
 
 class ObsWithField(BaseModel):
     """

{wintertoo-1.2.0 → wintertoo-1.3.1}/wintertoo/schedule.py

@@ -61,6 +61,7 @@ def make_schedule(
                     "maxAirmass": too.max_airmass,
                     "ditherNumber": too.n_dither,
                     "ditherStepSize": too.dither_distance,
+                    "bestDetector": too.use_best_detector,
                 }
                 all_entries.append(new)
 

{wintertoo-1.2.0 → wintertoo-1.3.1}/wintertoo.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: wintertoo
-Version: 1.2.0
+Version: 1.3.1
 Author-email: Robert Stein <rdstein@caltech.edu>, Danielle Frostig <frostig@mit.edu>, Viraj Karambelkar <viraj@astro.caltech.edu>
 License: MIT
 Project-URL: homepage, https://github.com/winter-telescope/wintertoo