debugging tests

Author: ehneilsen

.vscode/launch.json

@@ -9,7 +9,8 @@
             "console": "integratedTerminal",
             "purpose": ["debug-test"],
             "env": {
-                "TEST_WITH_EFD": "True"
+                "TEST_WITH_EFD": "True",
+                "TEST_WITH_CONSDB": "True"
             },
         }
     ]

schedview/compute/maf.py

@@ -87,6 +87,9 @@ def compute_metric_by_visit(visits, metric, constraint=""):
     values : `pandas.Series`
         The metric values.
     """
+    if "observationId" not in visits.columns and visits.index.name == "observationId":
+        visits = visits.reset_index()
+
     slicer = maf.OneDSlicer("observationId", bin_size=1)
     metric_bundle = maf.MetricBundle(slicer=slicer, metric=metric, constraint=constraint)
 

schedview/plot/visits.py

@@ -202,7 +202,7 @@ def plot_visit_param_vs_time(
         y=column_name,
         color=band_cmap,
         source=data,
-        legend_group="filter",
+        legend_group=band_column,
         **circle_kwargs,
     )
 

tests/test_compute_maf.py

@@ -9,30 +9,31 @@
 try:
     from rubin_sim import maf
 
+    HAVE_MAF = True
     from schedview.compute import compute_hpix_metric_in_bands, compute_metric_by_visit
 except ModuleNotFoundError:
-    pass
+    HAVE_MAF = False
 
 
 class TestComputeMAF(unittest.TestCase):
 
-    @unittest.skipUnless("maf" in locals(), "No maf installation")
+    @unittest.skipUnless(HAVE_MAF, "No maf installation")
     def test_compute_metric_by_visit(self):
         visits = read_opsim(get_baseline())
         mjd_start = SURVEY_START_MJD
         constraint = f"observationStartMjd BETWEEN {mjd_start + 0.5} AND {mjd_start+1.5}"
-        metric = maf.TeffMetric()
+        metric = maf.SumMetric(col="t_eff", metric_name="Total Teff")
         values = compute_metric_by_visit(visits, metric, constraint=constraint)
         self.assertGreater(len(values), 10)
         self.assertGreater(np.min(values), 0.0)
         self.assertLess(np.max(values), 300)
 
-    @unittest.skipUnless("maf" in locals(), "No maf installation")
+    @unittest.skipUnless(HAVE_MAF, "No maf installation")
     def test_compute_hpix_metric_in_bands(self):
         visits = read_opsim(get_baseline())
         mjd_start = SURVEY_START_MJD
         constraint = f"observationStartMjd BETWEEN {mjd_start+0.5} AND {mjd_start+1.5}"
-        metric = maf.TeffMetric()
+        metric = maf.SumMetric(col="t_eff", metric_name="Total Teff")
         values = compute_hpix_metric_in_bands(visits, metric, constraint=constraint)
         self.assertGreater(len(values.keys()), 1)
         for band in values.keys():

tests/test_compute_visits.py

@@ -10,8 +10,10 @@
 
 try:
     from rubin_sim import maf
+
+    HAVE_MAF = True
 except ModuleNotFoundError:
-    pass
+    HAVE_MAF = True
 
 
 class TestComputeVisits(unittest.TestCase):
@@ -27,11 +29,15 @@ def test_add_coords_tuple(self):
         visits = schedview.compute.visits.add_coords_tuple(self.visits)
         self.assertEqual(len(visits["coords"].iloc[0]), 2)
 
-    @unittest.skipUnless("maf" in locals(), "No maf installation")
+    @unittest.skipUnless(HAVE_MAF, "No maf installation")
     def test_add_maf_metric(self):
         constraint = None
         visits = schedview.compute.visits.add_maf_metric(
-            self.visits, maf.TeffMetric(), "teff", constraint, "fiveSigmaDepth"
+            self.visits,
+            maf.SumMetric(col="t_eff", metric_name="Total Teff"),
+            "teff",
+            constraint,
+            "fiveSigmaDepth",
         )
         self.assertIn("teff", visits.columns)
 

tests/test_plot_cadence.py

@@ -11,13 +11,15 @@
 
 try:
     from rubin_sim import maf
+
+    HAVE_MAF = True
 except ModuleNotFoundError:
-    pass
+    HAVE_MAF = False
 
 
 class TestPlotCadence(TestCase):
 
-    @unittest.skipUnless("maf" in locals(), "No rubin_sim.maf installation")
+    @unittest.skipUnless(HAVE_MAF, "No rubin_sim.maf installation")
     def test_create_cadence_plot(self):
         stackers = [
             maf.stackers.ObservationStartDatetime64Stacker(),