Merge branch 'develop'

Author: tribeiro

conda/meta.yaml

@@ -15,14 +15,14 @@ build:
 test:
   requires:
     - ts-conda-build =0.3
-    - {{ pin_compatible('rubin-sim',  min_pin='x') }}
+    - {{ pin_compatible('rubin-scheduler',  min_pin='x') }}
   source_files:
     - python
     - tests
     - setup.cfg
     - pyproject.toml
   commands:
-    - rs_download_data
+    - scheduler_download_data --update
     - pytest -vsx tests/
 
 requirements:
@@ -32,14 +32,14 @@ requirements:
     - pip
     - setuptools_scm
     - setuptools
-    - rubin-sim =1
+    - rubin-scheduler
   build:
     - python {{ python }}
     - numpy {{ numpy }}
     - setuptools
     - setuptools_scm
     - ts-conda-build
-    - rubin-sim =1
+    - rubin-scheduler
   run:
     - python {{ python }}
-    - {{ pin_compatible('rubin-sim', min_pin='x') }}
+    - {{ pin_compatible('rubin-scheduler', min_pin='x') }}

doc/version_history.rst

@@ -4,6 +4,19 @@
 Version History
 ===============
 
+v0.9.0
+------
+* Move imports from rubin_sim to rubin_scheduler where applicable.
+* Update and extend conda dependencies.
+
+v0.8.0
+------
+
+* In ``auxtel/basis_functions.py``, add m5diff basis function to cwfs survey.
+* Add MaskAzimuthBasisFucntion to maintel blob and DD surveys.
+* Update maintel survey to use ``FieldSurvey`` class instead of ``DeepDrillingSurvey``.
+* Add an "anytime" survey to the maintel scheduler to allow using it anytime in the day.
+
 v0.7.3
 ------
 

python/lsst/ts/fbs/utils/auxtel/basis_functions.py

@@ -27,7 +27,7 @@
 
 import typing
 
-from rubin_sim.scheduler import basis_functions
+from rubin_scheduler.scheduler import basis_functions
 
 
 def get_basis_functions_image_survey(
@@ -150,6 +150,7 @@ def get_basis_functions_cwfs_survey(
 
     return [
         basis_functions.NotTwilightBasisFunction(sun_alt_limit=sun_alt_limit),
+        basis_functions.M5DiffBasisFunction(nside=nside),
         basis_functions.SlewtimeBasisFunction(nside=nside, filtername="g"),
         basis_functions.SlewtimeBasisFunction(nside=nside, filtername="r"),
         basis_functions.SlewtimeBasisFunction(nside=nside, filtername="i"),

python/lsst/ts/fbs/utils/auxtel/make_scheduler.py

@@ -27,9 +27,9 @@
 
 from astropy import units
 from astropy.coordinates import Angle
-from rubin_sim.scheduler.detailers import BaseDetailer
-from rubin_sim.scheduler.schedulers import CoreScheduler
-from rubin_sim.scheduler.surveys import BaseSurvey
+from rubin_scheduler.scheduler.detailers import BaseDetailer
+from rubin_scheduler.scheduler.schedulers import CoreScheduler
+from rubin_scheduler.scheduler.surveys import BaseSurvey
 
 from .. import AssertSurvey, Target, Tiles, get_auxtel_tiles
 from .surveys import (

python/lsst/ts/fbs/utils/auxtel/surveys.py

@@ -23,9 +23,9 @@
 
 import astropy.units as u
 import numpy as np
-from rubin_sim.scheduler.detailers import BaseDetailer
-from rubin_sim.scheduler.surveys import BaseSurvey, FieldSurvey, GreedySurvey
-from rubin_sim.scheduler.utils import empty_observation
+from rubin_scheduler.scheduler.detailers import BaseDetailer
+from rubin_scheduler.scheduler.surveys import BaseSurvey, FieldSurvey, GreedySurvey
+from rubin_scheduler.scheduler.utils import empty_observation
 
 from ..target import Target
 from .basis_functions import (

python/lsst/ts/fbs/utils/maintel/basis_functions.py

@@ -44,9 +44,11 @@
     "get_basis_functions_star_tracker_survey",
     "get_basis_functions_blob_survey",
     "get_basis_functions_ddf_survey",
+    "get_basis_functions_anytime_survey",
 ]
 
-from rubin_sim.scheduler import basis_functions
+from rubin_scheduler.scheduler import basis_functions
+from rubin_scheduler.scheduler.utils import EuclidOverlapFootprint
 
 
 def get_basis_functions_star_tracker_survey(
@@ -155,6 +157,9 @@ def get_basis_functions_blob_survey(
         ),
         basis_functions.SlewtimeBasisFunction(nside=nside, filtername="r"),
         basis_functions.VisitRepeatBasisFunction(nside=nside),
+        basis_functions.MaskAzimuthBasisFunction(
+            nside=nside, az_min=160.0, az_max=200.0
+        ),
     ]
 
 
@@ -200,4 +205,47 @@ def get_basis_functions_ddf_survey(
             wind_speed_maximum=wind_speed_maximum, nside=nside
         ),
         basis_functions.VisitGap(note=survey_name, gap_min=gap_min),
+        basis_functions.MaskAzimuthBasisFunction(
+            nside=nside, az_min=160.0, az_max=200.0
+        ),
+    ]
+
+
+def get_basis_functions_anytime_survey(
+    nside: int,
+) -> list[basis_functions.BaseBasisFunction]:
+    """Get basis functions for the anytime survey.
+
+    Parameters
+    ----------
+    nside : `int`
+        The healpix map resolution.
+
+    Returns
+    -------
+    `list`[ `basis_functions.BaseBasisFunction` ]
+        List of basis functions.
+    """
+    sky = EuclidOverlapFootprint()
+    footprints, labels = sky.return_maps()
+    target_map = footprints["r"]
+
+    bfs = [
+        basis_functions.HaMaskBasisFunction(
+            ha_min=-1.5,
+            ha_max=1.5,
+            nside=nside,
+        ),
+        basis_functions.ZenithShadowMaskBasisFunction(
+            min_alt=40.0,
+            max_alt=82.0,
+            nside=nside,
+        ),
+        basis_functions.SlewtimeBasisFunction(filtername="r", nside=nside),
+        basis_functions.TargetMapBasisFunction(target_map=target_map),
+        basis_functions.MaskAzimuthBasisFunction(
+            nside=nside, az_min=160.0, az_max=200.0
+        ),
     ]
+
+    return bfs

python/lsst/ts/fbs/utils/maintel/make_scheduler.py

@@ -47,13 +47,18 @@
 
 from astropy import units
 from astropy.coordinates import Angle
-from rubin_sim.scheduler.detailers import BaseDetailer
-from rubin_sim.scheduler.schedulers import CoreScheduler
-from rubin_sim.scheduler.surveys import BaseSurvey
-from rubin_sim.scheduler.utils import Footprint
+from rubin_scheduler.scheduler.detailers import BaseDetailer
+from rubin_scheduler.scheduler.schedulers import CoreScheduler
+from rubin_scheduler.scheduler.surveys import BaseSurvey
+from rubin_scheduler.scheduler.utils import Footprint
 
 from .. import Target, Tiles, get_maintel_tiles
-from .surveys import generate_blob_survey, generate_ddf_surveys, generate_image_survey
+from .surveys import (
+    generate_anytime_survey,
+    generate_blob_survey,
+    generate_ddf_surveys,
+    generate_image_survey,
+)
 
 
 class SurveyType(enum.IntEnum):
@@ -73,6 +78,7 @@ def get_scheduler(
         wind_speed_maximum: float,
         survey_type: SurveyType,
         image_tiles: list[Tiles],
+        survey_name: str = "SIT",
         survey_detailers: list[BaseDetailer] | None = None,
     ) -> tuple[int, CoreScheduler]:
         """Construct feature based scheduler.
@@ -113,9 +119,9 @@ def get_scheduler(
                         target=target,
                         wind_speed_maximum=wind_speed_maximum,
                         nfields=len(image_targets),
-                        survey_detailers=survey_detailers
-                        if survey_detailers is not None
-                        else [],
+                        survey_detailers=(
+                            survey_detailers if survey_detailers is not None else []
+                        ),
                     )
                 )
 
@@ -135,18 +141,20 @@ def get_scheduler(
             footprints=footprints,
             wind_speed_maximum=wind_speed_maximum,
             filter_names="r",
-            survey_name="SIT",
+            survey_name=survey_name,
         )
 
         ddf_surveys = generate_ddf_surveys(
             nside=nside,
             wind_speed_maximum=wind_speed_maximum,
             gap_min=60.0,
-            survey_base_name="SIT",
+            survey_base_name=survey_name,
         )
 
+        anytime_survey = generate_anytime_survey(nside=nside, survey_name=survey_name)
+
         surveys = (
-            [ddf_surveys, [blob_survey]]
+            [ddf_surveys, [blob_survey], [anytime_survey]]
             if survey_type == SurveyType.SIT
             else [image_survey]
         )

python/lsst/ts/fbs/utils/maintel/surveys.py

@@ -44,18 +44,19 @@
 
 import astropy.units as u
 import numpy as np
-from rubin_sim.scheduler.detailers import BaseDetailer
-from rubin_sim.scheduler.surveys import (
+from rubin_scheduler.scheduler.detailers import BaseDetailer
+from rubin_scheduler.scheduler.surveys import (
     BaseSurvey,
     BlobSurvey,
-    DeepDrillingSurvey,
     FieldSurvey,
+    GreedySurvey,
 )
-from rubin_sim.scheduler.utils import empty_observation
-from rubin_sim.utils import ddf_locations
+from rubin_scheduler.scheduler.utils import empty_observation
+from rubin_scheduler.utils import ddf_locations
 
 from ..target import Target
 from .basis_functions import (
+    get_basis_functions_anytime_survey,
     get_basis_functions_blob_survey,
     get_basis_functions_ddf_survey,
     get_basis_functions_star_tracker_survey,
@@ -224,7 +225,7 @@ def generate_ddf_surveys(
         gap_min=gap_min,
     )
 
-    ddf_survey_1 = DeepDrillingSurvey(
+    ddf_survey_1 = FieldSurvey(
         basis_functions,
         ra,
         dec,
@@ -252,7 +253,7 @@ def generate_ddf_surveys(
         gap_min=gap_min,
     )
 
-    ddf_survey_2 = DeepDrillingSurvey(
+    ddf_survey_2 = FieldSurvey(
         basis_functions,
         ra,
         dec,
@@ -267,3 +268,37 @@ def generate_ddf_surveys(
     )
 
     return [ddf_survey_1, ddf_survey_2]
+
+
+def generate_anytime_survey(
+    nside: int,
+    survey_name: str,
+) -> BaseSurvey:
+    """Generate a survey that will produce valid targets at anytime.
+
+    Parameters
+    ----------
+    nside : `int`
+        Healpix map resolution.
+    survey_name : `str`
+        Survey name.
+
+    Returns
+    -------
+    anytime_survey : `GreedySurvey`
+        Greedy survey configured to produce targets at any time.
+    """
+
+    bfs = get_basis_functions_anytime_survey(nside)
+
+    weights = np.ones(len(bfs))
+
+    anytime_survey = GreedySurvey(
+        basis_functions=bfs,
+        basis_weights=weights,
+        filtername="r",
+        nside=nside,
+        survey_name=survey_name,
+    )
+
+    return anytime_survey

tests/auxtel/test_basis_functions.py

@@ -52,7 +52,7 @@ def test_get_basis_functions_cwfs_survey() -> None:
         wind_speed_maximum=7.0,
     )
 
-    assert len(basis_functions) == 8
+    assert len(basis_functions) == 9
 
 
 def test_get_basis_functions_spectroscopic_survey() -> None:

tests/auxtel/test_scheduler.py

@@ -26,7 +26,7 @@
 from astropy.coordinates import Angle
 from lsst.ts.fbs.utils import Target, Tiles
 from lsst.ts.fbs.utils.auxtel.make_scheduler import MakeScheduler, SurveyType
-from rubin_sim.scheduler.detailers import BaseDetailer, CameraRotDetailer
+from rubin_scheduler.scheduler.detailers import BaseDetailer, CameraRotDetailer
 
 
 class TestMakeScheduler(unittest.TestCase):