From fa69b3a430b54302664c3d5fee14edcdd96f9314 Mon Sep 17 00:00:00 2001 From: Lynne Jones Date: Tue, 10 Dec 2024 22:25:15 -0800 Subject: [PATCH] Remove m5 diff basis function; limit 40/70 alt --- .../maintel/fbs_config_sit_survey_block_t345.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/Scheduler/feature_scheduler/maintel/fbs_config_sit_survey_block_t345.py b/Scheduler/feature_scheduler/maintel/fbs_config_sit_survey_block_t345.py index c4459ab2..33a7e900 100644 --- a/Scheduler/feature_scheduler/maintel/fbs_config_sit_survey_block_t345.py +++ b/Scheduler/feature_scheduler/maintel/fbs_config_sit_survey_block_t345.py @@ -20,7 +20,7 @@ # along with this program. If not, see . import numpy as np -from rubin_scheduler.scheduler import detailers, example, features +from rubin_scheduler.scheduler import basis_functions, detailers, example, features from rubin_scheduler.scheduler.schedulers import CoreScheduler from rubin_scheduler.scheduler.surveys import BlobSurvey from rubin_scheduler.scheduler.utils import CurrentAreaMap, Footprint @@ -53,8 +53,8 @@ def get_scheduler(): # Erik says to make wind speed minor so set limit high wind_speed_maximum=50.0, # I think these are the values appropriate for alt limits now? - min_alt=30, - max_alt=80, + min_alt=40, + max_alt=70, min_az=0, max_az=360, # Avoid going into avoidance regions 30 minutes into the future @@ -119,6 +119,12 @@ def get_scheduler(): reward_functions = [(i[0], i[1]) for i in rf1 if i[1] > 0] + [ (i[0], i[1]) for i in rf2 if i[1] > 0 ] + # Remove the M5Diff basis functions as unusable at present + reward_functions = [ + (bf, weight) + for (bf, weight) in reward_functions + if not isinstance(bf, basis_functions.M5DiffBasisFunction) + ] # unpack the basis functions and weights reward_basis_functions_weights = [val[1] for val in reward_functions]