OPSIM-1063: Ensure MAF imports without data and that all stackers run

rubin_sim/maf/batches/altaz_batch.py

@@ -11,7 +11,7 @@
 
 def basicSetup(metric_name, colmap=None, nside=64):
     if colmap is None:
-        colmap = col_map_dict("opsimV4")
+        colmap = col_map_dict()
 
     slicer = slicers.HealpixSlicer(
         nside=nside,

rubin_sim/maf/batches/common.py

@@ -1,7 +1,6 @@
 __all__ = (
     "combine_info_labels",
     "filter_list",
-    "radec_cols",
     "standard_summary",
     "extended_summary",
     "standard_metrics",
@@ -17,7 +16,6 @@
 import inspect
 
 import rubin_sim.maf.metrics as metrics
-import rubin_sim.maf.stackers as stackers
 
 
 def combine_info_labels(info1, info2):
@@ -86,39 +84,6 @@ def filter_list(all=True, extra_sql=None, extra_info_label=None):
     return filterlist, colors, orders, sqls, info_labels
 
 
-def radec_cols(dither_stacker, colmap, ditherkwargs=None):
-    degrees = colmap["raDecDeg"]
-    if dither_stacker is None:
-        raCol = colmap["ra"]
-        decCol = colmap["dec"]
-        stacker = None
-        ditherInfoLabel = None
-    else:
-        if isinstance(dither_stacker, stackers.BaseDitherStacker):
-            stacker = dither_stacker
-        else:
-            s = stackers.BaseStacker().registry[dither_stacker]
-            args = [f for f in inspect.getfullargspec(s).args if f.endswith("Col")]
-            # Set up default dither kwargs.
-            kwargs = {}
-            for a in args:
-                colmapCol = a.replace("Col", "")
-                if colmapCol in colmap:
-                    kwargs[a] = colmap[colmapCol]
-            # Update with passed values, if any.
-            if ditherkwargs is not None:
-                kwargs.update(ditherkwargs)
-            stacker = s(degrees=degrees, **kwargs)
-        raCol = stacker.colsAdded[0]
-        decCol = stacker.colsAdded[1]
-        # Send back some info_label information.
-        ditherInfoLabel = stacker.__class__.__name__.replace("Stacker", "")
-        if ditherkwargs is not None:
-            for k, v in ditherkwargs.items():
-                ditherInfoLabel += " " + "%s:%s" % (k, v)
-    return raCol, decCol, degrees, stacker, ditherInfoLabel
-
-
 def standard_summary(withCount=True):
     """A set of standard summary metrics, to calculate Mean, RMS, Median, #, Max/Min, and # 3-sigma outliers."""
     standardSummary = [

rubin_sim/maf/batches/filterchange_batch.py

@@ -80,7 +80,7 @@ def filtersPerNight(colmap=None, runName="opsim", nights=1, extraSql=None, extra
     """
 
     if colmap is None:
-        colmap = col_map_dict("opsimV4")
+        colmap = col_map_dict()
     bundleList = []
 
     # Set up sql and info_label, if passed any additional information.
@@ -144,7 +144,7 @@ def filtersWholeSurvey(colmap=None, runName="opsim", extraSql=None, extraInfoLab
     metric_bundleDict
     """
     if colmap is None:
-        colmap = col_map_dict("opsimV4")
+        colmap = col_map_dict()
     bundleList = []
 
     # Set up sql and info_label, if passed any additional information.

rubin_sim/maf/batches/glance_batch.py

@@ -58,7 +58,7 @@ def glanceBatch(
         raise ValueError("colmap must be a dictionary, not a string")
 
     if colmap is None:
-        colmap = col_map_dict("opsimV4")
+        colmap = col_map_dict()
 
     bundle_list = []
 

rubin_sim/maf/batches/hourglass_batch.py

@@ -26,7 +26,7 @@ def hourglassPlots(colmap=None, runName="opsim", nyears=10, extraSql=None, extra
         Add an extra piece of info_label before running metrics. Default None.
     """
     if colmap is None:
-        colmap = col_map_dict("opsimV4")
+        colmap = col_map_dict()
     bundleList = []
 
     sql = ""

rubin_sim/maf/batches/info_batch.py

@@ -5,7 +5,7 @@
 import rubin_sim.maf.batches as batches
 
 
-def metadata_bundle_dicts(allsky_slicer, wfd_slicer, opsim="opsim", colmap=batches.col_map_dict("FBS")):
+def metadata_bundle_dicts(allsky_slicer, wfd_slicer, opsim="opsim", colmap=batches.col_map_dict()):
     # Set up the bundle dicts
     # Some of these metrics are reproduced in other scripts - srd and cadence
     bdict = {}

rubin_sim/maf/batches/metadata_batch.py

@@ -10,7 +10,6 @@
 
 import rubin_sim.maf.metric_bundles as mb
 import rubin_sim.maf.metrics as metrics
-import rubin_sim.maf.plots as plots
 import rubin_sim.maf.slicers as slicers
 import rubin_sim.maf.stackers as stackers
 
@@ -19,7 +18,6 @@
     combine_info_labels,
     extended_metrics,
     filter_list,
-    radec_cols,
     standard_angle_metrics,
     standard_summary,
 )
@@ -69,7 +67,7 @@ def metadataBasics(
     metric_bundleDict
     """
     if colmap is None:
-        colmap = col_map_dict("fbs")
+        colmap = col_map_dict()
     bundleList = []
 
     if valueName is None:
@@ -87,8 +85,10 @@ def metadataBasics(
 
     displayDict = {"group": groupName, "subgroup": subgroup}
 
-    raCol, decCol, degrees, ditherStacker, ditherMeta = radec_cols(None, colmap, None)
-    extraInfoLabel = combine_info_labels(extraInfoLabel, ditherMeta)
+    raCol = colmap["ra"]
+    decCol = colmap["dec"]
+    degrees = colmap["raDecDeg"]
+
     # Set up basic all and per filter sql constraints.
     filterlist, colors, orders, sqls, info_label = filter_list(
         all=True, extra_sql=extraSql, extra_info_label=extraInfoLabel
@@ -217,7 +217,7 @@ def metadataBasicsAngle(
     metric_bundleDict
     """
     if colmap is None:
-        colmap = col_map_dict("opsimV4")
+        colmap = col_map_dict()
     bundleList = []
 
     if valueName is None:
@@ -235,8 +235,9 @@ def metadataBasicsAngle(
 
     displayDict = {"group": groupName, "subgroup": subgroup}
 
-    raCol, decCol, degrees, ditherStacker, ditherMeta = radec_cols(None, colmap, None)
-    extraInfoLabel = combine_info_labels(extraInfoLabel, ditherMeta)
+    raCol = colmap["ra"]
+    decCol = colmap["dec"]
+    degrees = colmap["raDecDeg"]
     # Set up basic all and per filter sql constraints.
     filterlist, colors, orders, sqls, info_label = filter_list(
         all=True, extra_sql=extraSql, extra_info_label=extraInfoLabel
@@ -336,7 +337,7 @@ def allMetadata(colmap=None, runName="opsim", extraSql=None, extraInfoLabel=None
     """
 
     if colmap is None:
-        colmap = col_map_dict("opsimV4")
+        colmap = col_map_dict()
 
     bdict = {}
 
@@ -413,7 +414,7 @@ def metadataMaps(
     metric_bundleDict
     """
     if colmap is None:
-        colmap = col_map_dict("opsimV4")
+        colmap = col_map_dict()
     bundleList = []
 
     if valueName is None:
@@ -431,8 +432,9 @@ def metadataMaps(
 
     displayDict = {"group": groupName, "subgroup": subgroup}
 
-    raCol, decCol, degrees, ditherStacker, ditherMeta = radec_cols(None, colmap, None)
-    extraInfoLabel = combine_info_labels(extraInfoLabel, ditherMeta)
+    raCol = colmap["ra"]
+    decCol = colmap["dec"]
+    degrees = colmap["raDecDeg"]
     # Set up basic all and per filter sql constraints.
     filterlist, colors, orders, sqls, info_label = filter_list(
         all=True, extra_sql=extraSql, extra_info_label=extraInfoLabel
@@ -506,7 +508,7 @@ def firstYearMetadata(colmap=None, runName="opsim", extraSql=None, extraInfoLabe
     """
 
     if colmap is None:
-        colmap = col_map_dict("opsimV4")
+        colmap = col_map_dict()
 
     bdict = {}
 

rubin_sim/maf/batches/moving_objects_batch.py

@@ -136,7 +136,7 @@ def quick_discovery_batch(
     magtype="asteroid",
 ):
     if colmap is None:
-        colmap = col_map_dict("opsimV4")
+        colmap = col_map_dict()
     bundleList = []
 
     basicPlotDict = {
@@ -277,7 +277,7 @@ def discovery_batch(
     magtype="asteroid",
 ):
     if colmap is None:
-        colmap = col_map_dict("opsimV4")
+        colmap = col_map_dict()
     bundleList = []
 
     basicPlotDict = {
@@ -906,7 +906,7 @@ def characterization_inner_batch(
 ):
     """Characterization metrics for inner solar system objects."""
     if colmap is None:
-        colmap = col_map_dict("opsimV4")
+        colmap = col_map_dict()
     bundleList = []
 
     # Set up a dictionary to pass to each metric for the column names.
@@ -1103,7 +1103,7 @@ def characterization_outer_batch(
 ):
     """Characterization metrics for outer solar system objects."""
     if colmap is None:
-        colmap = col_map_dict("opsimV4")
+        colmap = col_map_dict()
     bundleList = []
 
     # Set up a dictionary to pass to each metric for the column names.

rubin_sim/maf/batches/openshutter_batch.py

@@ -26,7 +26,7 @@ def openshutterFractions(colmap=None, runName="opsim", extraSql=None, extraInfoL
         Additional info_label to add before any below (i.e. "WFD").  Default is None.
     """
     if colmap is None:
-        colmap = col_map_dict("opsimV4")
+        colmap = col_map_dict()
     bundleList = []
 
     group = "Open Shutter Fraction"

rubin_sim/maf/batches/science_radar_batch.py

@@ -658,6 +658,7 @@ def science_radar_batch(
 
     # Do the weak lensing per year
     for year in np.arange(1, 10):
+        displayDict["order"] = year
         sqlconstraint = (
             'note not like "DD%"'
             + ' and (filter="g" or filter="r" or filter="i") and night < %i' % (year * 365.25)

rubin_sim/maf/batches/skycoverage.py

@@ -27,7 +27,7 @@ def meanRADec(colmap=None, runName="opsim", extraSql=None, extraInfoLabel=None):
         Additional info_label to add before any below (i.e. "WFD").  Default is None.
     """
     if colmap is None:
-        colmap = col_map_dict("opsimV4")
+        colmap = col_map_dict()
     bundleList = []
 
     group = "RA Dec coverage"
@@ -90,7 +90,7 @@ def eastWestBias(colmap=None, runName="opsim", extraSql=None, extraInfoLabel=Non
         Additional info_label to add before any below (i.e. "WFD").  Default is None.
     """
     if colmap is None:
-        colmap = col_map_dict("opsimV4")
+        colmap = col_map_dict()
     bundleList = []
 
     group = "East vs West"