root out last rubin_sim references

rubin_scheduler/scheduler/features/conditions.py

@@ -71,7 +71,7 @@ def __init__(
         -----------
         nside : int
             Healpix resolution. All maps are set to this reslution.
-        site : rubin_sim.Site object ('LSST')
+        site : rubin_scheduler.Site object ('LSST')
             Contains static site-specific data (lat, lon, altitude, etc). Defaults to 'LSST'.
         ra : np.array
             A healpix array with the RA of each healpixel center (radians). Automatically

rubin_scheduler/scheduler/surveys/base_survey.py

@@ -260,7 +260,7 @@ def make_reward_df(self, conditions, accum=True):
 
         Parameters
         ----------
-        conditions : `rubin_sim.scheduler.features.Conditions`
+        conditions : `rubin_scheduler.scheduler.features.Conditions`
             Conditions for which rewards are to be returned
         accum : `bool`
             Include accumulated reward (more compute intensive)
@@ -412,7 +412,7 @@ class BaseMarkovSurvey(BaseSurvey):
 
     Parameters
     ----------
-    basis_function : list of rubin_sim.schuler.basis_function objects
+    basis_function : list of rubin_scheduler.schuler.basis_function objects
 
     basis_weights : list of float
         Must be same length as basis_function

rubin_scheduler/scheduler/surveys/generate_ddf_grid.py

@@ -3,12 +3,14 @@
 
 import astropy.units as u
 import numpy as np
+# Technically this script should be over in rubin_sim, but here to be more
+# easily found. 
 import rubin_sim.skybrightness as sb
 from astroplan import Observer
 from astropy.time import Time
-from rubin_sim.data import get_data_dir
-from rubin_sim.site_models.seeing_model import SeeingModel
-from rubin_sim.utils import Site, ddf_locations, m5_flat_sed
+from rubin_scheduler.data import get_data_dir
+from rubin_scheduler.site_models.seeing_model import SeeingModel
+from rubin_scheduler.utils import Site, ddf_locations, m5_flat_sed
 
 if __name__ == "__main__":
     # Generate a grid of airmass skybrightness values

rubin_scheduler/scheduler/thomson/thomson_jit.py

@@ -13,7 +13,7 @@
 
 import numpy as np
 from numba import jit
-from rubin_sim.utils import _angular_separation
+from rubin_scheduler.utils import _angular_separation
 from scipy.optimize import minimize
 
 

rubin_scheduler/scheduler/training/training.py

@@ -1,7 +1,7 @@
 import numpy as np
-import rubin_sim.scheduler as fs
-import rubin_sim.scheduler.Training as optional
-from rubin_sim.speedObservatory import Speed_observatory
+import rubin_scheduler.scheduler as fs
+import rubin_scheduler.scheduler.Training as optional
+from rubin_scheduler.model_observatory import ModelObservatory
 
 
 class BlackTraining:
@@ -52,7 +52,7 @@ def target(self, x):
         for survey in self.surveys:
             survey.basis_weights = x
         scheduler = fs.Core_scheduler_cost(self.surveys)
-        observatory = Speed_observatory()
+        observatory = ModelObservatory()
         observatory, scheduler, observations = fs.sim_runner(
             observatory, scheduler, survey_length=self.survey_length
         )

rubin_scheduler/scheduler/utils/sky_area.py

@@ -243,7 +243,7 @@ def __init__(
         self.low_dust = np.where(self.low_dust > smoothing_cutoff, 1, 0)
 
     def read_dustmap(self, dustmap_file=None):
-        """Read the dustmap from rubin_sim, in the appropriate resolution."""
+        """Read the dustmap from rubin_scheduler, in the appropriate resolution."""
         # Dustmap from rubin_sim_data
         if dustmap_file is None:
             datadir = rs_data.get_data_dir()

rubin_scheduler/scheduler/utils/utils.py

@@ -848,7 +848,7 @@ def run_info_table(observatory, extra_info=None):
     result[1]["Parameter"] = "hostname"
     result[1]["Value"] = socket.gethostname()
 
-    result[2]["Parameter"] = "rubin_sim.__version__"
+    result[2]["Parameter"] = "rubin_scheduler.__version__"
     result[2]["Value"] = rsVersion.__version__
 
     result[3:]["Parameter"] = observatory_info[:, 0]