updates to match site scheduler

Author: mmccrackan

src/pages/4_SAT_Schedule_Plan.py

@@ -24,16 +24,12 @@
 # dictionary goes dict[elevation][sun_keepout]
 schedule_files = {
     50 : {
-        45: os.path.join(schedule_base_dir,
-            'SAT-scan-schedules/20250625_d-40,-10_e50_t40_s0.5,0.8_a45_j2025-06-15T12:00+00:00_n365.txt'),
-        49: os.path.join(schedule_base_dir,
-            'SAT-scan-schedules/20250625_d-40,-10_e50_t40_s0.5,0.8_a49_j2025-06-15T12:00+00:00_n365.txt'),
+        45: os.path.join(schedule_base_dir, 'SAT-scan-schedules/20250625_d-40,-10_e50_t40_s0.5,0.8_a45_j2025-06-15T12:00+00:00_n365.txt'),
+        49: os.path.join(schedule_base_dir, 'SAT-scan-schedules/20250625_d-40,-10_e50_t40_s0.5,0.8_a49_j2025-06-15T12:00+00:00_n365.txt'),
     },
     60 : {
-        45: os.path.join(schedule_base_dir,
-            'SAT-scan-schedules/20250625_d-40,-10_e60_t40_s0.5,0.8_a45_j2025-06-15T12:00+00:00_n365.txt'),
-        49: os.path.join(schedule_base_dir,
-            'SAT-scan-schedules/20250625_d-40,-10_e60_t40_s0.5,0.8_a49_j2025-06-15T12:00+00:00_n365.txt'),
+        45: os.path.join(schedule_base_dir, 'SAT-scan-schedules/20250625_d-40,-10_e60_t40_s0.5,0.8_a45_j2025-06-15T12:00+00:00_n365.txt'),
+        49: os.path.join(schedule_base_dir, 'SAT-scan-schedules/20250625_d-40,-10_e60_t40_s0.5,0.8_a49_j2025-06-15T12:00+00:00_n365.txt'),
     }
 }
 
@@ -105,7 +101,8 @@
         **cfg
     )
 
-    seq = policy.init_seqs(t0, t1)
+    seq = policy.init_cmb_seqs(t0, t1)
+    seq = policy.init_cal_seqs(None, None, seq, t0, t1)
     seq = policy.apply(seq)
 
     data = np.zeros( (0,6))

src/pages/6_SAT_Scheduler.py

@@ -227,6 +227,7 @@ def build_table(t0, t1, cfg, seq, cmds, state, platform):
     az_speed = st.number_input("Azimuth Speed (deg/s)", value=0.5)
     az_accel = st.number_input("Azimuth Acceleration (deg/s²)", value=0.25)
     min_hwp_el = st.number_input("Min HWP Elevation (deg)", value=48.0)
+    max_hwp_el = st.number_input("Max HWP Elevation (deg)", value=60.0)
     max_cmb_scan_duration = st.number_input("Max CMB Scan Duration (seconds)", value=3600)
     az_branch_override = st.number_input("Az Branch Override (deg) (Cal Sources)", value=180.0)
 
@@ -238,6 +239,8 @@ def build_table(t0, t1, cfg, seq, cmds, state, platform):
     hwp_override = st.radio("HWP Override", options=["None", "Forward (CCW)", "Reverse (CW)"], index=0)
     st.checkbox("Boresight Override", value=st.session_state.boresight_override, key="boresight_override")
 
+    force_max_hwp_el = st.checkbox("Force Max HWP El", value=True)
+
     if st.session_state.boresight_override:
         boresight = st.number_input("Boresight (deg)", value=0.0)
     else:

src/pages/7_LAT_Scheduler.py

@@ -272,7 +272,8 @@ def toggle_dropdown():
     schedule_file = None
     t0_state_file = None
     cal_anchor_time = None
-    remove_targets = []
+    remove_cmb_targets = []
+    remove_cal_targets = []
     # cal_targets = []
 
     assert platform in ['lat'], (f"{platform} is not an "
@@ -333,7 +334,8 @@ def toggle_dropdown():
         'cryo_stabilization_time': cryo_stabilization_time,
         'corotator_offset': corotator_offset,
         'elevations_under_90' : elevations_under_90,
-        'remove_targets': tuple(remove_targets),
+        'remove_cmb_targets': remove_cmb_targets,
+        'remove_cal_targets': remove_cal_targets,
         'open_shutter': open_shutter,
         'close_shutter': close_shutter,
         'relock_cadence': relock_cadence,