Updated meanz summary metric

rubin_sim/maf/maf_contrib/lss_metrics.py

@@ -4,7 +4,9 @@
 import numpy as np
 import scipy
 
-from rubin_sim.maf.metrics import BaseMetric, ExgalM5
+from rubin_sim.maf.metrics.base_metric import BaseMetric
+from rubin_sim.maf.metrics.simple_metrics import Coaddm5Metric
+from rubin_sim.maf.metrics.exgal_m5 import ExgalM5
 
 
 class GalaxyCountsMetric(BaseMetric):

rubin_sim/maf/maf_contrib/lss_obs_strategy/galaxy_counts_metric_extended.py

@@ -29,7 +29,9 @@
     power_law_const_a,
     power_law_const_b,
 )
-from rubin_sim.maf.metrics import BaseMetric, Coaddm5Metric, ExgalM5
+from rubin_sim.maf.metrics.base_metric import BaseMetric
+from rubin_sim.maf.metrics.simple_metrics import Coaddm5Metric
+from rubin_sim.maf.metrics.exgal_m5 import ExgalM5
 
 
 class GalaxyCountsMetricExtended(BaseMetric):

rubin_sim/maf/maf_contrib/lv_dwarfs/lv_dwarfs_metrics.py

@@ -14,7 +14,11 @@
 from rubin_scheduler.data import get_data_dir
 
 from rubin_sim.maf.maf_contrib.lss_obs_strategy import GalaxyCountsMetricExtended
-from rubin_sim.maf.metrics import BaseMetric, ExgalM5, StarDensityMetric
+
+from rubin_sim.maf.metrics.base_metric import BaseMetric
+from rubin_sim.maf.metrics.simple_metrics import Coaddm5Metric
+from rubin_sim.maf.metrics.exgal_m5 import ExgalM5
+from rubin_sim.maf.metrics.star_density import StarDensityMetric
 from rubin_sim.maf.slicers import UserPointsSlicer
 
 

rubin_sim/maf/maf_contrib/static_probes_fom_summary_metric.py

@@ -34,6 +34,8 @@ def __init__(
         super().__init__(col=col, **kwargs)
         if col is None:
             self.col = "metricdata"
+        else:
+            self.col = col
         self.shear_m = shear_m
         self.sigma_z = sigma_z
         self.sig_delta_z = sig_delta_z

rubin_sim/maf/maf_contrib/young_stellar_objects_metric.py

@@ -9,7 +9,8 @@
 import scipy.integrate as integrate
 
 from rubin_sim.maf.maps import DustMap, DustMap3D, StellarDensityMap
-from rubin_sim.maf.metrics import BaseMetric, CrowdingM5Metric
+from rubin_sim.maf.metrics.base_metric import BaseMetric
+from rubin_sim.maf.metrics.crowding_metric import CrowdingM5Metric
 from rubin_sim.phot_utils import DustValues
 
 

rubin_sim/maf/metrics/__init__.py

@@ -6,6 +6,7 @@
 from .cadence_metrics import *
 from .calibration_metrics import *
 from .chip_vendor_metric import *
+from .cosmology_summary_metrics import *
 from .coverage_metric import *
 from .crowding_metric import *
 from .cumulative_metric import *
@@ -40,8 +41,10 @@
 from .surfb_metric import *
 from .technical_metrics import *
 from .tgaps import *
+from .tomography_models import *
 from .transient_metrics import *
 from .use_metrics import *
+from .uniformity_metrics import *
 from .vector_metrics import *
 from .visit_groups_metric import *
 from .weak_lensing_systematics_metric import *

rubin_sim/maf/metrics/area_summary_metrics.py

@@ -96,7 +96,7 @@ def __init__(
         self.lower_threshold = lower_threshold
         self.mask_val = np.nan  # Include so all values get passed
         self.col = col
-        self.units = "degrees"
+        self.units = "square degrees"
 
     def run(self, data_slice, slice_point=None):
         # find out what nside we have
@@ -113,7 +113,7 @@ def run(self, data_slice, slice_point=None):
             npix = len(
                 np.where(
                     (data_slice[self.col] > self.lower_threshold)
-                    and (data_slice[self.col] < self.upper_threshold)
+                    & (data_slice[self.col] < self.upper_threshold)
                 )[0]
             )
         area = pix_area * npix