update config to match latest scheduler

simonsobs · Oct 25, 2023 · ea23a5f · ea23a5f
1 parent 31efc28
commit ea23a5f
Show file tree

Hide file tree

Showing 2 changed files with 66 additions and 43 deletions.
diff --git a/src/scheduler_server/configs/flex.py b/src/scheduler_server/configs/flex.py
@@ -1,41 +1,67 @@
 config = """
-blocks:
-  moon: !source moon
-
-rules:
-  - !rule
-    name: sun-avoidance
-    min_angle_az: 6
-    min_angle_alt: 6
-    time_step: 10
-    n_buffer: 3
-  - !rule
-    name: min-duration
-    min_duration: 300
-  - !rule
-    name: make-source-plan
-    specs:
-      - bounds_x:
-        - -0.5
-        - 0.5
-        bounds_y:
-        - -0.5
-        - 0.5
-    spec_shape: ellipse
-    max_obs_length: 6000
-  - !rule
-    name: make-source-scan
-    preferred_length: 1800
-  - !rule
-    name: alt-range
-    alt_range:
-      - 20
-      - 90
-
-merge_order:
-  - moon
-post_rules:
-  - !rule
-    name: min-duration
-    min_duration: 600
+    blocks:
+        calibration:
+            saturn: 
+              type: source 
+              name: saturn
+            moon: 
+              type: source
+              name: moon
+    rules:
+        - name: sun-avoidance
+          min_angle_az: 45
+          min_angle_alt: 45
+          time_step: 30
+          n_buffer: 10
+        - name: make-drift-scan
+          block_query: calibration
+          array_query: full
+          el_bore: 50
+          drift: true
+    post_rules:
+        - name: min-duration
+          min_duration: 600
+    merge_order:
+        - moon
+        - saturn
+    geometries:
+      full:
+        left:
+          ws6:
+            center:
+            - -10.9624
+            - 6.46363
+            radius: 6
+          ws5:
+            center:
+            - -10.9624
+            - -6.46363
+            radius: 6
+        middle:
+          ws1:
+            center: 
+            - 0 
+            - 12.634
+            radius: 6
+          ws0:
+            center: 
+            - 0 
+            - 0 
+            radius: 6
+          ws4:
+            center: 
+            - 0 
+            - -12.634
+            radius: 6
+        right:
+          ws2:
+            center:
+            - 10.9624
+            - 6.46363
+            radius: 6
+          ws3:
+            center:
+            - 10.9624
+            - -6.46363
+            radius: 6
 """
diff --git a/tests/test_handler.py b/tests/test_handler.py
@@ -14,7 +14,4 @@ def test_basic():
 def test_flex():
     t0 = datetime(2023, 1, 1, 0, 0, 0, tzinfo=timezone.utc)
     t1 = datetime(2023, 1, 10, 0, 0, 10, tzinfo=timezone.utc)
-    cmds = handler.flex_policy(t0, t1, configs.get_default_config('flex'))
-    print(cmds)
-    raise
-
+    cmds = handler.flex_policy(t0, t1, configs.get_default_config('flex'))