From 68815ce222705332f0bfcca7c02eab3b0aa9eeb8 Mon Sep 17 00:00:00 2001 From: Eric Neilsen Date: Tue, 10 Dec 2024 09:00:44 -0800 Subject: [PATCH] replace deprecated survey_start_mjd() with SURVEY_START_MJD --- schedview/plot/scheduler.py | 4 ++-- tests/test_compute_maf.py | 6 +++--- tests/test_compute_scheduler.py | 4 ++-- tests/test_compute_survey.py | 4 ++-- tests/test_compute_visits.py | 4 ++-- tests/test_overhead.py | 4 ++-- tests/test_plot_survey.py | 8 ++++---- tests/test_plot_visits.py | 4 ++-- tests/test_scheduler_pickle.py | 4 ++-- util/sample_data/make_sample_test_data.py | 4 ++-- 10 files changed, 23 insertions(+), 23 deletions(-) diff --git a/schedview/plot/scheduler.py b/schedview/plot/scheduler.py index bfc0fe43..8dd2acd7 100644 --- a/schedview/plot/scheduler.py +++ b/schedview/plot/scheduler.py @@ -18,14 +18,14 @@ from rubin_scheduler.scheduler.features.conditions import Conditions from rubin_scheduler.scheduler.model_observatory import ModelObservatory from rubin_scheduler.scheduler.schedulers.core_scheduler import CoreScheduler as CoreScheduler -from rubin_scheduler.utils import survey_start_mjd +from rubin_scheduler.utils import SURVEY_START_MJD from uranography.api import ArmillarySphere, HorizonMap, MollweideMap, Planisphere, make_zscale_linear_cmap from schedview.collect import read_scheduler from schedview.compute.scheduler import make_scheduler_summary_df, make_unique_survey_name from schedview.compute.survey import make_survey_reward_df -DEFAULT_MJD = survey_start_mjd() + 0.2 +DEFAULT_MJD = SURVEY_START_MJD + 0.2 DEFAULT_NSIDE = 32 diff --git a/tests/test_compute_maf.py b/tests/test_compute_maf.py index d138d757..5990e87e 100644 --- a/tests/test_compute_maf.py +++ b/tests/test_compute_maf.py @@ -1,7 +1,7 @@ import unittest import numpy as np -from rubin_scheduler.utils import survey_start_mjd +from rubin_scheduler.utils import SURVEY_START_MJD from rubin_sim.data import get_baseline from schedview.collect import read_opsim @@ -19,7 +19,7 @@ class TestComputeMAF(unittest.TestCase): @unittest.skipUnless("maf" in locals(), "No maf installation") def test_compute_metric_by_visit(self): visits = read_opsim(get_baseline()) - mjd_start = survey_start_mjd() + mjd_start = SURVEY_START_MJD constraint = f"observationStartMjd BETWEEN {mjd_start + 0.5} AND {mjd_start+1.5}" metric = maf.TeffMetric() values = compute_metric_by_visit(visits, metric, constraint=constraint) @@ -30,7 +30,7 @@ def test_compute_metric_by_visit(self): @unittest.skipUnless("maf" in locals(), "No maf installation") def test_compute_hpix_metric_in_bands(self): visits = read_opsim(get_baseline()) - mjd_start = survey_start_mjd() + mjd_start = SURVEY_START_MJD constraint = f"observationStartMjd BETWEEN {mjd_start+0.5} AND {mjd_start+1.5}" metric = maf.TeffMetric() values = compute_hpix_metric_in_bands(visits, metric, constraint=constraint) diff --git a/tests/test_compute_scheduler.py b/tests/test_compute_scheduler.py index 401c4e05..ba173aa1 100644 --- a/tests/test_compute_scheduler.py +++ b/tests/test_compute_scheduler.py @@ -6,11 +6,11 @@ from rubin_scheduler.scheduler.example import example_scheduler from rubin_scheduler.scheduler.features.conditions import Conditions from rubin_scheduler.scheduler.model_observatory import ModelObservatory -from rubin_scheduler.utils import survey_start_mjd +from rubin_scheduler.utils import SURVEY_START_MJD from schedview.compute.scheduler import create_example, make_scheduler_summary_df, make_unique_survey_name -MJD_START = survey_start_mjd() +MJD_START = SURVEY_START_MJD TEST_MJD = MJD_START + 0.2 diff --git a/tests/test_compute_survey.py b/tests/test_compute_survey.py index ec4fa97a..f711ebc5 100644 --- a/tests/test_compute_survey.py +++ b/tests/test_compute_survey.py @@ -4,11 +4,11 @@ import pandas as pd from rubin_scheduler.scheduler.example import example_scheduler from rubin_scheduler.scheduler.model_observatory import ModelObservatory -from rubin_scheduler.utils import survey_start_mjd +from rubin_scheduler.utils import SURVEY_START_MJD from schedview.compute.survey import compute_maps, make_survey_reward_df -MJD_START = survey_start_mjd() +MJD_START = SURVEY_START_MJD TEST_MJD = MJD_START + 0.2 diff --git a/tests/test_compute_visits.py b/tests/test_compute_visits.py index 7d6e4747..b9612467 100644 --- a/tests/test_compute_visits.py +++ b/tests/test_compute_visits.py @@ -2,7 +2,7 @@ import numpy as np from astropy.time import Time -from rubin_scheduler.utils import survey_start_mjd +from rubin_scheduler.utils import SURVEY_START_MJD from rubin_sim.data import get_baseline import schedview.collect @@ -18,7 +18,7 @@ class TestComputeVisits(unittest.TestCase): def setUp(self): self.visit_db_fname = get_baseline() - start_mjd = survey_start_mjd() + start_mjd = SURVEY_START_MJD start_time = Time(start_mjd, format="mjd") end_time = Time(start_mjd + 1, format="mjd") self.visits = schedview.collect.read_opsim(self.visit_db_fname, start_time, end_time) diff --git a/tests/test_overhead.py b/tests/test_overhead.py index 265a8ca9..3187be75 100644 --- a/tests/test_overhead.py +++ b/tests/test_overhead.py @@ -2,7 +2,7 @@ import bokeh from astropy.time import Time -from rubin_scheduler.utils import survey_start_mjd +from rubin_scheduler.utils import SURVEY_START_MJD from rubin_sim.data import get_baseline import schedview.collect @@ -15,7 +15,7 @@ class TestOverhead(unittest.TestCase): @classmethod def setUpClass(cls): cls.visit_db_fname = get_baseline() - start_mjd = survey_start_mjd() + start_mjd = SURVEY_START_MJD cls.start_time = Time(start_mjd + 0.5, format="mjd") cls.end_time = Time(start_mjd + 1.5, format="mjd") cls.visits = schedview.collect.read_opsim(cls.visit_db_fname, cls.start_time, cls.end_time) diff --git a/tests/test_plot_survey.py b/tests/test_plot_survey.py index cce69dd6..74f748a4 100644 --- a/tests/test_plot_survey.py +++ b/tests/test_plot_survey.py @@ -5,7 +5,7 @@ import numpy as np from astropy.time import Time from rubin_scheduler.scheduler.model_observatory import ModelObservatory -from rubin_scheduler.utils import survey_start_mjd +from rubin_scheduler.utils import SURVEY_START_MJD from rubin_sim.data import get_baseline from uranography.api import SphereMap @@ -13,7 +13,7 @@ from schedview.plot.survey import create_hpix_visit_map_grid, map_survey_healpix, map_visits_over_hpix RANDOM_NUMBER_GENERATOR = np.random.default_rng(6563) -TEST_MJD = survey_start_mjd() + 0.2 +TEST_MJD = SURVEY_START_MJD + 0.2 class TestMapSurvey(unittest.TestCase): @@ -29,7 +29,7 @@ def test_create_hpix_visit_map_grid(self): npix = hp.nside2npix(nside) hpix_maps = {b: RANDOM_NUMBER_GENERATOR.random(npix) for b in "ugrizy"} - start_mjd = survey_start_mjd() + start_mjd = SURVEY_START_MJD visits = schedview.collect.read_opsim( get_baseline(), Time(start_mjd + 0.5, format="mjd"), Time(start_mjd + 1.5, format="mjd") ) @@ -45,7 +45,7 @@ def test_create_hpix_visit_map_no_raster(self): npix = hp.nside2npix(nside) hpix_map = RANDOM_NUMBER_GENERATOR.random(npix) - start_mjd = survey_start_mjd() + start_mjd = SURVEY_START_MJD visits = schedview.collect.read_opsim( get_baseline(), Time(start_mjd + 0.5, format="mjd"), Time(start_mjd + 1.5, format="mjd") ) diff --git a/tests/test_plot_visits.py b/tests/test_plot_visits.py index 023d05f3..6768d391 100644 --- a/tests/test_plot_visits.py +++ b/tests/test_plot_visits.py @@ -3,7 +3,7 @@ import bokeh import bokeh.models from astropy.time import Time -from rubin_scheduler.utils import survey_start_mjd +from rubin_scheduler.utils import SURVEY_START_MJD from rubin_sim.data import get_baseline import schedview.collect @@ -14,7 +14,7 @@ class TestPlotVisits(TestCase): def setUp(self): self.visit_db_fname = get_baseline() - start_mjd = survey_start_mjd() + start_mjd = SURVEY_START_MJD self.start_time = Time(start_mjd + 0.5, format="mjd") self.end_time = Time(start_mjd + 1.5, format="mjd") self.visits = schedview.collect.read_opsim(self.visit_db_fname, self.start_time, self.end_time) diff --git a/tests/test_scheduler_pickle.py b/tests/test_scheduler_pickle.py index 06fac70e..75cf9038 100644 --- a/tests/test_scheduler_pickle.py +++ b/tests/test_scheduler_pickle.py @@ -6,11 +6,11 @@ from rubin_scheduler.scheduler.example import example_scheduler from rubin_scheduler.scheduler.features.conditions import Conditions from rubin_scheduler.scheduler.schedulers.core_scheduler import CoreScheduler -from rubin_scheduler.utils import survey_start_mjd +from rubin_scheduler.utils import SURVEY_START_MJD from schedview.collect.scheduler_pickle import read_scheduler -MJD_START = survey_start_mjd() +MJD_START = SURVEY_START_MJD class TestSchedulerPickle(unittest.TestCase): diff --git a/util/sample_data/make_sample_test_data.py b/util/sample_data/make_sample_test_data.py index 37bfcedc..5054ad5c 100644 --- a/util/sample_data/make_sample_test_data.py +++ b/util/sample_data/make_sample_test_data.py @@ -9,9 +9,9 @@ from rubin_scheduler.scheduler.example import example_scheduler from rubin_scheduler.scheduler.model_observatory import ModelObservatory from rubin_scheduler.scheduler.utils import SchemaConverter -from rubin_scheduler.utils import survey_start_mjd +from rubin_scheduler.utils import SURVEY_START_MJD -DEFAULT_DATE = Time(survey_start_mjd(), format="mjd").iso[:10] +DEFAULT_DATE = Time(SURVEY_START_MJD, format="mjd").iso[:10] # Several dependencies throw prodigious instances of (benign) warnings. # Suppress them to avoid poluting the executed notebook.