Merge pull request #511 from gemini-hlsw/SCHED-733

SCHED-733: Change default values for initial conditions
gemini-hlsw · Oct 2, 2024 · c7aaea5 · c7aaea5
2 parents 0a1e7e0 + 24f32d6
commit c7aaea5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/scheduler/core/components/selector/selector.py b/scheduler/core/components/selector/selector.py
@@ -65,8 +65,8 @@ class Selector(SchedulerComponent):
     _wind_spd_bound: ClassVar[Quantity] = 10. * u.m / u.s
 
     # Default values for resetting variants.
-    _default_iq: ClassVar[ImageQuality] = ImageQuality.IQANY
-    _default_cc: ClassVar[CloudCover] = CloudCover.CCANY
+    _default_iq: ClassVar[ImageQuality] = ImageQuality.IQ70
+    _default_cc: ClassVar[CloudCover] = CloudCover.CC70
     _default_wind_dir: ClassVar[Angle] = Angle(0., unit=u.deg)
     _default_wind_spd: ClassVar[Quantity] = 0.0 * (u.m / u.s)
 

diff --git a/scheduler/services/environment/ocs_env_service.py b/scheduler/services/environment/ocs_env_service.py
@@ -111,7 +111,7 @@ def get_initial_conditions(self,
             df_iq = filtered_df[OcsEnvService._iq_col_initial].iloc[0]
             iq = ImageQuality.IQ70 if df_iq == 'na' else (ImageQuality(int(df_iq)/100) if df_iq != 'ANY' else ImageQuality.IQANY)
             df_cc = filtered_df[OcsEnvService._cc_col_initial].iloc[0]
-            cc = CloudCover.CC50 if df_cc == 'na' else (CloudCover(int(df_cc)/100) if df_cc != 'ANY' else CloudCover.CCANY)
+            cc = CloudCover.CC70 if df_cc == 'na' else (CloudCover(int(df_cc)/100) if df_cc != 'ANY' else CloudCover.CCANY)
 
             return VariantSnapshot(iq=iq,
                                    cc=cc,