tickets/SP-2754: add no_sky=True to ModelObservatory wherever possible

schedview/collect/scheduler_pickle.py

@@ -71,7 +71,7 @@ def read_local_scheduler_pickle(file_name, everything=False):
         try:
             conditions = scheduler.conditions
         except AttributeError:
-            conditions = ModelObservatory().return_conditions()
+            conditions = ModelObservatory(no_sky=True).return_conditions()
 
     return [scheduler, conditions]
 

schedview/compute/astro.py

@@ -70,7 +70,7 @@ def night_events(night_date=None, site=None, timezone="Chile/Continental"):
         night_date = datetime.date.today()
 
     if site is None:
-        site = ModelObservatory().location
+        site = ModelObservatory(no_sky=True).location
 
     all_nights_events = _compute_all_night_events().set_index("night")
     night_of_survey = convert_evening_date_to_night_of_survey(night_date, timezone=timezone)

schedview/compute/survey.py

@@ -104,8 +104,9 @@ def compute_maps(survey, conditions, nside=None):
 
     survey_maps = OrderedDict()
 
-    for band in conditions.skybrightness.keys():
-        survey_maps[f"{band}_sky"] = deepcopy(conditions.skybrightness[band])
+    if conditions.skybrightness is not None:
+        for band in conditions.skybrightness.keys():
+            survey_maps[f"{band}_sky"] = deepcopy(conditions.skybrightness[band])
 
     def can_be_healpix_map(values):
         try:

schedview/examples/app/visits.py

@@ -38,7 +38,7 @@ def __init__(self, **params):
         super().__init__(**params)
         self.nside = 32
         self.footprint = schedview.collect.footprint.get_footprint(self.nside)
-        self.observatory = ModelObservatory(nside=self.nside, init_load_length=1)
+        self.observatory = ModelObservatory(nside=self.nside, no_sky=True)
         self.conditions = self.observatory.return_conditions()
 
     @param.depends("night", watch=True)

schedview/examples/sunmoon.py

@@ -38,7 +38,7 @@ def make_sunmoon(
     night_events: pd.DataFrame = schedview.compute.astro.night_events(day_obs.date)
     mjd = night_events.loc["night_middle", "MJD"]
 
-    observatory: ModelObservatory = ModelObservatory(init_load_length=1, mjd=mjd)
+    observatory: ModelObservatory = ModelObservatory(no_sky=True, mjd=mjd)
     positions: pd.DataFrame = schedview.compute.astro.compute_sun_moon_positions(observatory)
 
     # Plot

schedview/examples/visitmap.py

@@ -54,7 +54,7 @@ def make_visit_map(
     footprint = schedview.collect.footprint.get_footprint(nside)
 
     # Compute
-    observatory: ModelObservatory = ModelObservatory(nside=nside, init_load_length=1)
+    observatory: ModelObservatory = ModelObservatory(nside=nside, no_sky=True)
     observatory.mjd = day_obs.mean_local_solar_midnight.mjd
     conditions = observatory.return_conditions()
     visits: pd.DataFrame = schedview.compute.visits.add_coords_tuple(visits)

schedview/plot/nightbf.py

@@ -8,7 +8,7 @@
 
 def _extract_night(df, mjd_column, night, observatory=None):
     if observatory is None:
-        observatory = ModelObservatory()
+        observatory = ModelObservatory(no_sky=True)
 
     # Add 1, so we use the date of the pm of the night instead of the am
     # as our reference.

schedview/plot/scheduler.py

@@ -152,10 +152,12 @@ def mjd(self, value):
         try:
             # If we cannot go to the requested MJD, follback on
             # on we can go to:
-            if value < self.observatory.sky_model.mjd_left.min():
+            if self.observatory.sky_model is not None and value < self.observatory.sky_model.mjd_left.min():
                 LOGGER.info("Cannot go to requested date, going to earliest.")
                 self.observatory.mjd = self.observatory.sky_model.mjd_left.min() + 1.0
-            elif value > self.observatory.sky_model.mjd_right.max():
+            elif (
+                self.observatory.sky_model is not None and value > self.observatory.sky_model.mjd_right.max()
+            ):
                 LOGGER.info("Cannot go to requested date, going to latest.")
                 self.observatory.mjd = self.observatory.sky_model.mjd_right.max() - 1.0
             else:

schedview/plot/visitmap.py

@@ -354,8 +354,7 @@ def create_visit_skymaps(
         visits = visits.query(f"observationStartMJD <= {Time(end_time).mjd}")
 
     if observatory is None:
-        observatory = ModelObservatory(nside=nside, init_load_length=1)
-        observatory.sky_model.load_length = 1
+        observatory = ModelObservatory(nside=nside, no_sky=True)
 
     footprint_regions = get_current_footprint(nside)[1]
     footprint_regions[np.isin(footprint_regions, ["bulgy", "lowdust"])] = "WFD"

tests/test_nightly.py

@@ -26,7 +26,7 @@ def _load_sample_visits():
 
 
 def _create_almanac(night):
-    site = ModelObservatory().location
+    site = ModelObservatory(no_sky=True).location
     timezone = "Chile/Continental"
     almanac_events = schedview.compute.astro.night_events(night, site, timezone)
     return almanac_events

tests/test_plot_survey.py

@@ -34,7 +34,7 @@ def test_create_hpix_visit_map_grid(self):
             get_baseline(), Time(start_mjd + 0.5, format="mjd"), Time(start_mjd + 1.5, format="mjd")
         )
 
-        observatory = ModelObservatory(mjd_start=start_mjd + 1, nside=nside)
+        observatory = ModelObservatory(mjd_start=start_mjd + 1, nside=nside, no_sky=True)
         conditions = observatory.return_conditions()
 
         plot = create_hpix_visit_map_grid(hpix_maps, visits, conditions)
@@ -50,7 +50,7 @@ def test_create_hpix_visit_map_no_raster(self):
             get_baseline(), Time(start_mjd + 0.5, format="mjd"), Time(start_mjd + 1.5, format="mjd")
         )
 
-        observatory = ModelObservatory(mjd_start=start_mjd + 1, nside=nside)
+        observatory = ModelObservatory(mjd_start=start_mjd + 1, nside=nside, no_sky=True)
         conditions = observatory.return_conditions()
 
         plot = map_visits_over_hpix(visits, conditions, hpix_map, prerender_hpix=False)

tests/test_plot_survey_skyproj.py

@@ -50,7 +50,7 @@ def test_map_visits_over_healpix():
     visits_mjd = visits["observationStartMJD"].median()
     time_datetime = Time(visits_mjd - 0.5, format="mjd").datetime
 
-    model_observatory = ModelObservatory(init_load_length=1)
+    model_observatory = ModelObservatory(no_sky=True)
     astropy.utils.iers.conf.iers_degraded_accuracy = "ignore"
     night_events = schedview.compute.astro.night_events(
         datetime.date(time_datetime.year, time_datetime.month, time_datetime.day)
@@ -69,7 +69,7 @@ def test_create_hpix_visit_map_grid():
     visits_mjd = visits["observationStartMJD"].median()
     time_datetime = Time(visits_mjd - 0.5, format="mjd").datetime
 
-    model_observatory = ModelObservatory(init_load_length=1)
+    model_observatory = ModelObservatory(no_sky=True)
     astropy.utils.iers.conf.iers_degraded_accuracy = "ignore"
     night_events = schedview.compute.astro.night_events(
         datetime.date(time_datetime.year, time_datetime.month, time_datetime.day)
@@ -82,7 +82,7 @@ def test_map_healpix():
     hp_map = np.random.default_rng(RANDOM_SEED).uniform(0, 1, hp.nside2npix(4))
     mjd = 61040
     time_datetime = Time(mjd - 0.5, format="mjd").datetime
-    model_observatory = ModelObservatory(init_load_length=1)
+    model_observatory = ModelObservatory(no_sky=True)
     astropy.utils.iers.conf.iers_degraded_accuracy = "ignore"
     night_events = schedview.compute.astro.night_events(
         datetime.date(time_datetime.year, time_datetime.month, time_datetime.day)
@@ -98,7 +98,7 @@ def test_create_hpix_map_grid():
 
     mjd = 61040
     time_datetime = Time(mjd - 0.5, format="mjd").datetime
-    model_observatory = ModelObservatory(init_load_length=1)
+    model_observatory = ModelObservatory(no_sky=True)
     astropy.utils.iers.conf.iers_degraded_accuracy = "ignore"
     night_events = schedview.compute.astro.night_events(
         datetime.date(time_datetime.year, time_datetime.month, time_datetime.day)