Use and enforce Astropy compliant units

include/lsst/meas/modelfit/CModel.h

@@ -79,7 +79,7 @@ namespace lsst { namespace meas { namespace modelfit {
  *
  *  Unlike most measurement algorithms, CModel requires the Exposure it is given to have both a Wcs and
  *  a Calib.  This is because it makes use of Bayesian priors, and hence it has to know the relationship
- *  between the raw units of the image (pixels and dn) and the global units in which the priors are defined.
+ *  between the raw units of the image (pixel and count) and the global units in which the priors are defined.
  *
  *  In fact, all of the nonlinear fits in CModel are done in a special, local coordinate system, defined
  *  by a Wcs in which the "pixels" have units of arcseconds (because we never create an image in this system,

python/lsst/meas/modelfit/baseMeasure.py

@@ -117,7 +117,7 @@ def __init__(self, butler=None, **kwds):
         self.schema = modelfitLib.ModelFitTable.makeMinimalSchema()
         self.keys = {}
         self.keys["center"] = lsst.afw.table.Point2DKey.addFields(
-            self.schema, "center", "input centroid of the object in image coordinates", "pixels"
+            self.schema, "center", "input centroid of the object in image coordinates", "pixel"
             )
         self.keys["initial.nonlinear"] = self.schema.addField(
             "initial.nonlinear", type="ArrayD", size=self.model.getNonlinearDim(),

src/CModel.cc

@@ -138,14 +138,14 @@ struct CModelStageKeys {
             schema.addField<meas::base::Flux>(
                 schema.join(prefix, "flux"),
                 "flux from the " + stage + " fit",
-                "dn"
+                "count"
             )
         ),
         fluxSigma(
             schema.addField<meas::base::FluxErrElement>(
                 schema.join(prefix, "fluxSigma"),
                 "flux uncertainty from the " + stage + " fit",
-                "dn"
+                "count"
             )
         ),
         fluxFlag(

src/psf.cc

@@ -420,7 +420,7 @@ shapelet::MultiShapeletFunctionKey PsfFitter::addFields(
     }
     return shapelet::MultiShapeletFunctionKey::addFields(
         schema, prefix, "multi-Shapelet approximation to the PSF model",
-        "pixels", // ellipse units
+        "pixel", // ellipse units
         "",       // coefficient units (unitless)
         orders
     );

tests/testCModel.py

@@ -47,7 +47,7 @@ def makeMultiShapeletCircularGaussian(sigma):
 
 def computePsfFlux(centroid, exposure):
     schema = lsst.afw.table.SourceTable.makeMinimalSchema()
-    pointKey = lsst.afw.table.Point2DKey.addFields(schema, "centroid", "known input centroid", "pixels")
+    pointKey = lsst.afw.table.Point2DKey.addFields(schema, "centroid", "known input centroid", "pixel")
     schema.getAliasMap().set("slot_Centroid", "centroid")
     algorithm = lsst.meas.base.PsfFluxAlgorithm(lsst.meas.base.PsfFluxControl(), "base_PsfFlux", schema)
     table = lsst.afw.table.SourceTable.make(schema)

tests/testShapeletPsfApproxPlugins.py

@@ -58,7 +58,7 @@ def setUp(self):
         self.exposure = lsst.afw.image.ExposureF(41, 41)
         self.psf = lsst.afw.detection.GaussianPsf(19, 19, self.psfSigma)
         self.schema = lsst.afw.table.SourceTable.makeMinimalSchema()
-        self.centroidKey = lsst.afw.table.Point2DKey.addFields(self.schema, "centroid", "centroid", "pixels")
+        self.centroidKey = lsst.afw.table.Point2DKey.addFields(self.schema, "centroid", "centroid", "pixel")
         self.schema.getAliasMap().set("slot_Centroid", "centroid")
         self.psfDir = os.path.join(os.environ["MEAS_MODELFIT_DIR"], "tests", "data", "psfs")
 

tests/testShapeletPsfModels.py

@@ -46,7 +46,7 @@ class ShapeletPsfApproxPluginsTestCase(lsst.utils.tests.TestCase):
     def setUp(self):
         self.exposure = lsst.afw.image.ExposureF(41, 41)
         self.schema = lsst.afw.table.SourceTable.makeMinimalSchema()
-        self.centroidKey = lsst.afw.table.Point2DKey.addFields(self.schema, "centroid", "centroid", "pixels")
+        self.centroidKey = lsst.afw.table.Point2DKey.addFields(self.schema, "centroid", "centroid", "pixel")
         self.schema.getAliasMap().set("slot_Centroid", "centroid")
         self.psfDir = os.path.join(os.environ["MEAS_MODELFIT_DIR"], "tests", "data", "psfs")