From 2d075a2e14515b8f276912548145f93d1d0145a7 Mon Sep 17 00:00:00 2001 From: Lynne Jones Date: Fri, 13 Sep 2024 19:19:11 -0700 Subject: [PATCH] Update sunAltBasisFunction + test_nside --- .../scheduler/basis_functions/feasibility_funcs.py | 2 +- tests/scheduler/test_baseline.py | 12 +++++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/rubin_scheduler/scheduler/basis_functions/feasibility_funcs.py b/rubin_scheduler/scheduler/basis_functions/feasibility_funcs.py index fac39ab..d2ed510 100644 --- a/rubin_scheduler/scheduler/basis_functions/feasibility_funcs.py +++ b/rubin_scheduler/scheduler/basis_functions/feasibility_funcs.py @@ -681,6 +681,6 @@ def __init__(self, alt_limit=-12.1): def check_feasibility(self, conditions): result = True - if conditions.sunAlt > self.alt_limit: + if conditions.sun_alt > self.alt_limit: result = False return result diff --git a/tests/scheduler/test_baseline.py b/tests/scheduler/test_baseline.py index a76055b..6d33f90 100644 --- a/tests/scheduler/test_baseline.py +++ b/tests/scheduler/test_baseline.py @@ -6,6 +6,7 @@ import rubin_scheduler.utils as utils from rubin_scheduler.data import get_data_dir from rubin_scheduler.scheduler import sim_runner +from rubin_scheduler.scheduler.basis_functions import SunAltLimitBasisFunction from rubin_scheduler.scheduler.example import example_scheduler, simple_greedy_survey, simple_pairs_survey from rubin_scheduler.scheduler.model_observatory import ModelObservatory from rubin_scheduler.scheduler.schedulers import CoreScheduler @@ -93,12 +94,17 @@ def test_nside(self): """ mjd_start = utils.survey_start_mjd() nside = 64 - survey_length = 3.0 # days + survey_length = 2.0 # days + # Add an avoidance of twilight+ for the pairs surveys - + # this ensures greedy survey will have some time to operate pairs_surveys = [ simple_pairs_survey(filtername="g", filtername2="r", nside=nside), simple_pairs_survey(filtername="i", filtername2="z", nside=nside), ] + for survey in pairs_surveys: + survey.basis_functions.append(SunAltLimitBasisFunction(alt_limit=-22)) + survey.basis_weights.append(0) greedy_surveys = [ simple_greedy_survey(filtername="z", nside=nside), ] @@ -113,9 +119,9 @@ def test_nside(self): assert "simple pair 30, iz, a" in observations["scheduler_note"] assert "simple pair 30, iz, b" in observations["scheduler_note"] # Make sure some greedy executed - assert "greedy z" in observations["scheduler_note"] + assert "simple greedy z" in observations["scheduler_note"] # Make sure lots of observations executed - assert observations.size > 1000 + assert observations.size > 800 # Make sure nothing tried to look through the earth assert np.min(observations["alt"]) > 0