#68 BinnedScatterPlotSysTest

stile/__init__.py

@@ -6,4 +6,4 @@
 from .treecorr_utils import ReadTreeCorrResultsFile
 from .data_handler import DataHandler
 from .sys_tests import (GalaxyShearSysTest, BrightStarShearSysTest, StarXGalaxyShearSysTest,
-                        StarXStarShearSysTest, StatSysTest)
+                        StarXStarShearSysTest, StatSysTest, BinnedScatterPlotSysTest)

stile/hsc/base_tasks.py

@@ -63,7 +63,8 @@ class CCDSingleEpochStileConfig(lsst.pex.config.Config):
                              "WhiskerPlotStar", "WhiskerPlotPSF", "WhiskerPlotResidual",
                              "ScatterPlotStarVsPSFG1", "ScatterPlotStarVsPSFG2",
                              "ScatterPlotStarVsPSFSigma", "ScatterPlotResidualVsPSFG1",
-                             "ScatterPlotResidualVsPSFG2", "ScatterPlotResidualVsPSFSigma"
+                             "ScatterPlotResidualVsPSFG2", "ScatterPlotResidualVsPSFSigma",
+                             "RMSE1Sky", "RMSE2Sky", "RMSE1Chip", "RMSE2Chip", "CountPerMagnitude"
                              ])
     treecorr_kwargs = lsst.pex.config.DictField(doc="extra kwargs to control TreeCorr",
                         keytype=str, itemtype=str,
@@ -231,12 +232,12 @@ def removeFlaggedObjects(self, catalog):
         @returns       The source catalog, masked to the rows which don't have any of our defined
                        flags set.
         """
-	masks = []
+        masks = []
         if self.config.flags_keep_false:
             masks += [catalog[flag]==False for flag in self.config.flags_keep_false]
         if self.config.flags_keep_true:
             masks += [catalog[flag]==True for flag in self.config.flags_keep_true]
-	if masks:
+        if masks:
             mask = masks[0]
             for new_mask in masks[1:]:
                 mask = numpy.logical_and(mask, new_mask)
@@ -581,7 +582,8 @@ def computeExtraColumn(self, col, data, calib_data, calib_type, xy0=None):
             elif calib_type=="calexp":
                 zeropoint = 2.5*numpy.log10(calib_data.get("FLUXMAG0"))
             key = data.schema.find('flux.psf.flags').key
-            return (zeropoint - 2.5*numpy.log10(data.getPsfFlux()),
+	    flux_key = data.schema.find('flux.psf').key
+            return (zeropoint - 2.5*numpy.log10([src.get(flux_key) for src in data]),
                     numpy.array([src.get(key)==0 for src in data]))
         elif col=="w":
             # Use uniform weights for now if we don't use shapes ("w" will be removed from the
@@ -657,7 +659,8 @@ class VisitSingleEpochStileConfig(CCDSingleEpochStileConfig):
                              "WhiskerPlotStar", "WhiskerPlotPSF", "WhiskerPlotResidual",
                              "ScatterPlotStarVsPSFG1", "ScatterPlotStarVsPSFG2",
                              "ScatterPlotStarVsPSFSigma", "ScatterPlotResidualVsPSFG1",
-                             "ScatterPlotResidualVsPSFG2", "ScatterPlotResidualVsPSFSigma"
+                             "ScatterPlotResidualVsPSFG2", "ScatterPlotResidualVsPSFSigma",
+                             "RMSE1Sky", "RMSE2Sky", "RMSE1Chip", "RMSE2Chip", "CountPerMagnitude"
                              ])
     treecorr_kwargs = lsst.pex.config.DictField(doc="extra kwargs to control treecorr",
                         keytype=str, itemtype=str,
@@ -869,7 +872,8 @@ class PatchSingleEpochStileConfig(CCDSingleEpochStileConfig):
                              "WhiskerPlotStar", "WhiskerPlotPSF", "WhiskerPlotResidual",
                              "ScatterPlotStarVsPSFG1", "ScatterPlotStarVsPSFG2",
                              "ScatterPlotStarVsPSFSigma", "ScatterPlotResidualVsPSFG1",
-                             "ScatterPlotResidualVsPSFG2", "ScatterPlotResidualVsPSFSigma"
+                             "ScatterPlotResidualVsPSFG2", "ScatterPlotResidualVsPSFSigma",
+                             "RMSE1Sky", "RMSE2Sky", "RMSE1Chip", "RMSE2Chip", "CountPerMagnitude"
                              ])
     whiskerplot_figsize = lsst.pex.config.ListField(dtype=float,
         doc="figure size for whisker plot", default = [7., 5.])
@@ -952,7 +956,8 @@ class TractSingleEpochStileConfig(CCDSingleEpochStileConfig):
                              "WhiskerPlotStar", "WhiskerPlotPSF", "WhiskerPlotResidual",
                              "ScatterPlotStarVsPSFG1", "ScatterPlotStarVsPSFG2",
                              "ScatterPlotStarVsPSFSigma", "ScatterPlotResidualVsPSFG1",
-                             "ScatterPlotResidualVsPSFG2", "ScatterPlotResidualVsPSFSigma"
+                             "ScatterPlotResidualVsPSFG2", "ScatterPlotResidualVsPSFSigma",
+                             "RMSE1Sky", "RMSE2Sky", "RMSE1Chip", "RMSE2Chip", "CountPerMagnitude"
                              ])
     treecorr_kwargs = lsst.pex.config.DictField(doc="extra kwargs to control treecorr",
                         keytype=str, itemtype=str,

stile/hsc/sys_test_adapters.py

@@ -186,7 +186,7 @@ def __call__(self, task_config, *data, **kwargs):
         sys_test itself returns.
         """
         new_data = [self.fixArray(d) for d in data]
-        return self.sys_test(task_config.corr2_kwargs, *new_data, **kwargs)
+        return self.sys_test(config=task_config.treecorr_kwargs, *new_data, **kwargs)
 
 class GalaxyShearAdapter(ShapeSysTestAdapter):
     """
@@ -459,6 +459,59 @@ def __call__(self,task_config,*data, **kwargs):
         new_data = [self.fixArray(d) for d in data]
         return self.sys_test(*new_data, per_ccd_stat = per_ccd_stat)
 
+class NoConfigShapeSysTestAdapter(ShapeSysTestAdapter):
+    """
+    Just like the ShapeSysTestAdapter, only don't send the config object to the test.
+    """
+    def __call__(self, task_config, *data, **kwargs):
+        """
+        Call this object's sys_test with the given data and kwargs, and return whatever the
+        sys_test itself returns.
+        """
+        new_data = [self.fixArray(d) for d in data]
+        return self.sys_test(*new_data, **kwargs)
+
+class RMSE1SkyAdapter(NoConfigShapeSysTestAdapter):
+    def __init__(self, config):
+        self.shape_type = 'sky'
+        self.config = config
+        self.sys_test = sys_tests.BinnedScatterPlotSysTest(x_field='mag', y_field='g1', w_field='w', method='rms')
+        self.name = 'rms_e1_sky'
+        self.setupMasks(['galaxy'])
+
+class RMSE2SkyAdapter(NoConfigShapeSysTestAdapter):
+    def __init__(self, config):
+        self.shape_type = 'sky'
+        self.config = config
+        self.sys_test = sys_tests.BinnedScatterPlotSysTest(x_field='mag', y_field='g2', w_field='w', method='rms')
+        self.name = 'rms_e2_sky'
+        self.setupMasks(['galaxy'])
+
+class RMSE1ChipAdapter(NoConfigShapeSysTestAdapter):
+    def __init__(self, config):
+        self.shape_type = 'chip'
+        self.config = config
+        self.sys_test = sys_tests.BinnedScatterPlotSysTest(x_field='mag', y_field='g1', w_field='w', method='rms')
+        self.name = 'rms_e1_chip'
+        self.setupMasks(['galaxy'])
+
+class RMSE2ChipAdapter(NoConfigShapeSysTestAdapter):
+    def __init__(self, config):
+        self.shape_type = 'chip'
+        self.config = config
+        self.sys_test = sys_tests.BinnedScatterPlotSysTest(x_field='mag', y_field='g2', w_field='w', method='rms')
+        self.name = 'rms_e2_chip'
+        self.setupMasks(['galaxy'])
+
+class CountPerMagnitudeAdapter(BaseSysTestAdapter):
+    def __init__(self, config):
+        self.config = config
+        self.sys_test = sys_tests.BinnedScatterPlotSysTest(x_field='mag', w_field='w', method='count')
+        self.name = 'count_per_mag'
+        self.setupMasks(['galaxy'])
+
+
+
 adapter_registry.register("StatsPSFFlux", StatsPSFFluxAdapter)
 adapter_registry.register("GalaxyShear", GalaxyShearAdapter)
 adapter_registry.register("BrightStarShear", BrightStarShearAdapter)
@@ -474,3 +527,8 @@ def __call__(self,task_config,*data, **kwargs):
 adapter_registry.register("ScatterPlotResidualVsPSFG1", ScatterPlotResidualVsPSFG1Adapter)
 adapter_registry.register("ScatterPlotResidualVsPSFG2", ScatterPlotResidualVsPSFG2Adapter)
 adapter_registry.register("ScatterPlotResidualVsPSFSigma", ScatterPlotResidualVsPSFSigmaAdapter)
+adapter_registry.register("RMSE1Sky", RMSE1SkyAdapter)
+adapter_registry.register("RMSE2Sky", RMSE2SkyAdapter)
+adapter_registry.register("RMSE1Chip", RMSE1ChipAdapter)
+adapter_registry.register("RMSE2Chip", RMSE2ChipAdapter)
+adapter_registry.register("CountPerMagnitude", CountPerMagnitudeAdapter)