From 89b6428edad82b6beee047428fc0791b80042928 Mon Sep 17 00:00:00 2001 From: Peter Yoachim Date: Fri, 19 Jan 2024 16:27:24 -0800 Subject: [PATCH] update unit test to use new basis fucntion --- .../scheduler/basis_functions/mask_basis_funcs.py | 7 ++++--- tests/scheduler/test_baseline.py | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/rubin_scheduler/scheduler/basis_functions/mask_basis_funcs.py b/rubin_scheduler/scheduler/basis_functions/mask_basis_funcs.py index e74ea1a5..40781820 100644 --- a/rubin_scheduler/scheduler/basis_functions/mask_basis_funcs.py +++ b/rubin_scheduler/scheduler/basis_functions/mask_basis_funcs.py @@ -12,7 +12,7 @@ "AltAzShadowMaskBasisFunction", ) -from warnings import warn +import warnings import healpy as hp import matplotlib.pylab as plt @@ -304,8 +304,9 @@ def __init__( penalty=np.nan, site="LSST", ): - warn.DeprecationWarning( - "Deprecating ZenithShadowMaskBasisFunction in favor of AltAzShadowMaskBasisFunction." + warnings.warn( + "Deprecating ZenithShadowMaskBasisFunction in favor of AltAzShadowMaskBasisFunction.", + DeprecationWarning, ) super(ZenithShadowMaskBasisFunction, self).__init__(nside=nside) diff --git a/tests/scheduler/test_baseline.py b/tests/scheduler/test_baseline.py index cac53e48..7fd86340 100644 --- a/tests/scheduler/test_baseline.py +++ b/tests/scheduler/test_baseline.py @@ -81,7 +81,7 @@ def gen_greedy_surveys(nside): bfs.append(bf.StrictFilterBasisFunction(filtername=filtername)) # Masks, give these 0 weight bfs.append(bf.AvoidDirectWind(nside=nside)) - bfs.append(bf.ZenithShadowMaskBasisFunction(nside=nside, shadow_minutes=60.0, max_alt=76.0)) + bfs.append(bf.AltAzShadowMaskBasisFunction(nside=nside, shadow_minutes=60.0, max_alt=76.0)) bfs.append(bf.MoonAvoidanceBasisFunction(nside=nside, moon_distance=30.0)) bfs.append(bf.CloudedOutBasisFunction()) @@ -144,7 +144,7 @@ def gen_blob_surveys(nside): bfs.append(bf.StrictFilterBasisFunction(filtername=filtername)) # Masks, give these 0 weight bfs.append(bf.AvoidDirectWind(nside=nside)) - bfs.append(bf.ZenithShadowMaskBasisFunction(nside=nside, shadow_minutes=60.0, max_alt=76.0)) + bfs.append(bf.AltAzShadowMaskBasisFunction(nside=nside, shadow_minutes=60.0, max_alt=76.0)) bfs.append(bf.MoonAvoidanceBasisFunction(nside=nside, moon_distance=30.0)) bfs.append(bf.CloudedOutBasisFunction()) # feasibility basis fucntions. Also give zero weight.