#68 BinnedScatterPlotSysTest

CHANGELOG.md

@@ -1,3 +1,4 @@
+7/12/18: Add BinnedScatterPlotSysTest class (issue #68)
 7/11/18: Update code to python3
 3/17/16: Update documentation to Sphinx standard and add documentation build files (issue #17)
 2/17/16: Changes to correlation function plots & documentation (issue #77)

stile/__init__.py

@@ -6,4 +6,5 @@
 from .treecorr_utils import ReadTreeCorrResultsFile
 from .data_handler import DataHandler
 from .sys_tests import (StatSysTest, CorrelationFunctionSysTest, ScatterPlotSysTest,
-                        WhiskerPlotSysTest, HistogramSysTest)
+                        WhiskerPlotSysTest, HistogramSysTest, BinnedScatterPlotSysTest)
+

stile/hsc/base_tasks.py

@@ -75,7 +75,8 @@ class CCDSingleEpochStileConfig(lsst.pex.config.Config):
                              "ScatterPlotStarVsPSFG1", "ScatterPlotStarVsPSFG2",
                              "ScatterPlotStarVsPSFSigma", "ScatterPlotResidualVsPSFG1",
                              "ScatterPlotResidualVsPSFG2", "ScatterPlotResidualVsPSFSigma",
-                             "ScatterPlotResidualSigmaVsPSFMag"
+                             "ScatterPlotResidualSigmaVsPSFMag",
+                             "RMSESky", "RMSEChip", "CountPerMagnitude"
                              ])
     treecorr_kwargs = lsst.pex.config.DictField(doc="extra kwargs to control TreeCorr",
                         keytype=str, itemtype=str,
@@ -744,7 +745,8 @@ class VisitSingleEpochStileConfig(CCDSingleEpochStileConfig):
                              "ScatterPlotStarVsPSFG1", "ScatterPlotStarVsPSFG2",
                              "ScatterPlotStarVsPSFSigma", "ScatterPlotResidualVsPSFG1",
                              "ScatterPlotResidualVsPSFG2", "ScatterPlotResidualVsPSFSigma",
-                             "ScatterPlotResidualSigmaVsPSFMag"
+                             "ScatterPlotResidualSigmaVsPSFMag",
+                             "RMSESky", "RMSEChip", "CountPerMagnitude"
                              ])
     treecorr_kwargs = lsst.pex.config.DictField(doc="extra kwargs to control treecorr",
                         keytype=str, itemtype=str,
@@ -1062,7 +1064,8 @@ class PatchSingleEpochStileConfig(CCDSingleEpochStileConfig):
                              "ScatterPlotStarVsPSFG1", "ScatterPlotStarVsPSFG2",
                              "ScatterPlotStarVsPSFSigma", "ScatterPlotResidualVsPSFG1",
                              "ScatterPlotResidualVsPSFG2", "ScatterPlotResidualVsPSFSigma",
-                             "ScatterPlotResidualSigmaVsPSFMag"
+                             "ScatterPlotResidualSigmaVsPSFMag",
+                             "RMSESky", "RMSEChip", "CountPerMagnitude"
                              ])
     do_hsm = lsst.pex.config.Field(dtype=bool, default=True, doc="Use HSM shapes for galaxies?")
     treecorr_kwargs = lsst.pex.config.DictField(doc="extra kwargs to control TreeCorr",
@@ -1159,7 +1162,8 @@ class TractSingleEpochStileConfig(CCDSingleEpochStileConfig):
                              "ScatterPlotStarVsPSFG1", "ScatterPlotStarVsPSFG2",
                              "ScatterPlotStarVsPSFSigma", "ScatterPlotResidualVsPSFG1",
                              "ScatterPlotResidualVsPSFG2", "ScatterPlotResidualVsPSFSigma",
-                             "ScatterPlotResidualSigmaVsPSFMag"
+                             "ScatterPlotResidualSigmaVsPSFMag",
+                             "RMSESky", "RMSEChip", "CountPerMagnitude"
                              ])
     do_hsm = lsst.pex.config.Field(dtype=bool, default=True, doc="Use HSM shapes for galaxies?")
     treecorr_kwargs = lsst.pex.config.DictField(doc="extra kwargs to control treecorr",

stile/hsc/sys_test_adapters.py

@@ -1,4 +1,4 @@
-"""
+"""
 sys_test_adapters.py: Contains classes to wrap Stile systematics tests with functions necessary to run the tests via the
 HSC/LSST pipeline.
 """
@@ -474,6 +474,79 @@ 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 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'])
+
+class RMSESkyAdapter(ShapeSysTestAdapter):
+    def __init__(self, config):
+        self.shape_type = 'sky'
+        self.config = config
+        self.sys_test = sys_tests.BinnedScatterPlotSysTest(x_field='mag', y_field='g', w_field='w', method='rms')
+        self.name = 'rms_e_sky'
+        self.setupMasks(['galaxy'])
+
+    def __call__(self, task_config, *data, **kwargs):
+        new_data = []
+        for d in data:
+            if d is None:
+                new_data.append(d)
+            else:
+                # We'll just make a new array using numpy.rec.fromarrays that includes |g|.
+                # First collect everything else, with a placeholder [] for |g|
+                list_of_arrays = [d[field] if field is not 'g' else [] for field in self.sys_test.required_quantities]
+                shape_col_1 = 'g1_'+self.shape_type
+                shape_col_2 = 'g2_'+self.shape_type
+                # Then replace that empty list with |g|
+                list_of_arrays[self.sys_test.required_quantities.index('g')] = (
+                    numpy.sqrt(d[shape_col_1]**2+d[shape_col_2]**2))
+                new_data.append(numpy.rec.fromarrays(list_of_arrays, self.sys_test.required_quantities))
+        return self.sys_test(*new_data, **kwargs)
+
+class RMSEChipAdapter(RMSESkyAdapter):
+    # We can use the same __call__ as RMSESKY, we just need to switch self.shape_type to 'chip'
+    def __init__(self, config):
+        self.shape_type = 'chip'
+        self.config = config
+        self.sys_test = sys_tests.BinnedScatterPlotSysTest(x_field='mag', y_field='g', w_field='w', method='rms')
+        self.name = 'rms_e_sky'
+        self.setupMasks(['galaxy'])    
+
 adapter_registry.register("StatsPSFFlux", StatsPSFFluxAdapter)
 adapter_registry.register("GalaxyShear", GalaxyShearAdapter)
 adapter_registry.register("BrightStarShear", BrightStarShearAdapter)
@@ -492,3 +565,10 @@ def __call__(self, task_config, *data, **kwargs):
 adapter_registry.register("ScatterPlotResidualVsPSFSigma", ScatterPlotResidualVsPSFSigmaAdapter)
 adapter_registry.register("ScatterPlotResidualSigmaVsPSFMag",
                           ScatterPlotResidualSigmaVsPSFMagAdapter)
+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)
+adapter_registry.register("RMSESky", RMSE1SkyAdapter)
+adapter_registry.register("RMSEChip", RMSE1ChipAdapter)