Merge branch 'master' into tickets/DM-14534

lsst · Jun 8, 2018 · 40816b5 · 40816b5
2 parents 65483b2 + 66b7bb6
commit 40816b5
Show file tree

Hide file tree

Showing 89 changed files with 2,489 additions and 3,098 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,7 @@
 _build.*
 .cache
+.pytest_cache
+.coverage
 *.dylib
 *.o
 *.so

diff --git a/examples/growthcurve.py b/examples/growthcurve.py
@@ -41,6 +41,7 @@
 
 import numpy as np
 
+import lsst.geom
 import lsst.afw.image as afwImage
 import lsst.afw.math as afwMath
 import lsst.afw.table as afwTable
@@ -167,7 +168,7 @@ def main():
             # get the aperture fluxes for Naive and Sinc methods
 
             axes = afwGeom.ellipses.Axes(radius[iR], radius[iR], math.radians(0))
-            center = afwGeom.Point2D(0, 0)
+            center = lsst.geom.Point2D(0, 0)
             ellipse = afwGeom.Ellipse(axes, center)
             resultSinc = measBase.ApertureFluxAlgorithm.computeSincFlux(mimg.getImage(), ellipse)
             resultNaive = measBase.ApertureFluxAlgorithm.computeNaiveFlux(mimg.getImage(), ellipse)

diff --git a/include/lsst/meas/base.h b/include/lsst/meas/base.h
@@ -50,5 +50,4 @@
 #include "lsst/afw/detection.h"
 #include "lsst/afw/math.h"
 
-
-#endif // !LSST_MEAS_base_h_INCLUDED
+#endif  // !LSST_MEAS_base_h_INCLUDED
diff --git a/include/lsst/meas/base/Algorithm.h b/include/lsst/meas/base/Algorithm.h
@@ -32,7 +32,9 @@
 #include "lsst/meas/base/exceptions.h"
 #include "lsst/meas/base/FlagHandler.h"
 
-namespace lsst { namespace meas { namespace base {
+namespace lsst {
+namespace meas {
+namespace base {
 
 /**
  *  Ultimate abstract base class for all C++ measurement algorithms
@@ -41,7 +43,6 @@ namespace lsst { namespace meas { namespace base {
  */
 class BaseAlgorithm {
 public:
-
     /**
      *  Handle an exception thrown by the current algorithm by setting flags in the given
      *  record.
@@ -58,16 +59,12 @@ class BaseAlgorithm {
      *  implemented even when all known failure modes do not throw exceptions, to ensure
      *  that unexpected exceptions thrown in lower-level code are properly handled.
      */
-    virtual void fail(
-        afw::table::SourceRecord & measRecord,
-        MeasurementError * error=nullptr
-    ) const = 0;
+    virtual void fail(afw::table::SourceRecord& measRecord, MeasurementError* error = nullptr) const = 0;
 
     virtual ~BaseAlgorithm() {}
 
-    std::string getLogName() const {
-        return _logName;
-    }
+    std::string getLogName() const { return _logName; }
+
 protected:
     std::string _logName;
 };
@@ -84,7 +81,6 @@ class BaseAlgorithm {
  */
 class SingleFrameAlgorithm : public virtual BaseAlgorithm {
 public:
-
     /**
      *  Called to measure a single child source in an image.
      *
@@ -93,10 +89,8 @@ class SingleFrameAlgorithm : public virtual BaseAlgorithm {
      *  which can also be used to obtain centroid (see SafeCentroidExtractor) and shape
      *  (see SafeShapeExtractor) information.
      */
-    virtual void measure(
-        afw::table::SourceRecord & measRecord,
-        afw::image::Exposure<float> const & exposure
-    ) const = 0;
+    virtual void measure(afw::table::SourceRecord& measRecord,
+                         afw::image::Exposure<float> const& exposure) const = 0;
 
     /**
      *  Called to simultaneously measure all children in a deblend family, in a single image.
@@ -108,11 +102,8 @@ class SingleFrameAlgorithm : public virtual BaseAlgorithm {
      *  The default implementation simply throws an exception, indicating that simultaneous
      *  measurement is not supported.
      */
-    virtual void measureN(
-        afw::table::SourceCatalog const & measCat,
-        afw::image::Exposure<float> const & exposure
-    ) const;
-
+    virtual void measureN(afw::table::SourceCatalog const& measCat,
+                          afw::image::Exposure<float> const& exposure) const;
 };
 
 /**
@@ -135,7 +126,6 @@ class SingleFrameAlgorithm : public virtual BaseAlgorithm {
  */
 class ForcedAlgorithm : public virtual BaseAlgorithm {
 public:
-
     /**
      *  Called to measure a single child source in an image.
      *
@@ -144,12 +134,10 @@ class ForcedAlgorithm : public virtual BaseAlgorithm {
      *  which can also be used to obtain centroid (see SafeCentroidExtractor) and shape
      *  (see SafeShapeExtractor) information.
      */
-    virtual void measureForced(
-        afw::table::SourceRecord & measRecord,
-        afw::image::Exposure<float> const & exposure,
-        afw::table::SourceRecord const & refRecord,
-        afw::geom::SkyWcs const & refWcs
-    ) const = 0;
+    virtual void measureForced(afw::table::SourceRecord& measRecord,
+                               afw::image::Exposure<float> const& exposure,
+                               afw::table::SourceRecord const& refRecord,
+                               afw::geom::SkyWcs const& refWcs) const = 0;
 
     /**
      *  Called to simultaneously measure all children in a deblend family, in a single image.
@@ -161,13 +149,10 @@ class ForcedAlgorithm : public virtual BaseAlgorithm {
      *  The default implementation simply throws an exception, indicating that simultaneous
      *  measurement is not supported.
      */
-    virtual void measureNForced(
-        afw::table::SourceCatalog const & measCat,
-        afw::image::Exposure<float> const & exposure,
-        afw::table::SourceCatalog const & refRecord,
-        afw::geom::SkyWcs const & refWcs
-    ) const;
-
+    virtual void measureNForced(afw::table::SourceCatalog const& measCat,
+                                afw::image::Exposure<float> const& exposure,
+                                afw::table::SourceCatalog const& refRecord,
+                                afw::geom::SkyWcs const& refWcs) const;
 };
 
 /**
@@ -184,27 +169,23 @@ class ForcedAlgorithm : public virtual BaseAlgorithm {
  */
 class SimpleAlgorithm : public SingleFrameAlgorithm, public ForcedAlgorithm {
 public:
-
-    virtual void measureForced(
-        afw::table::SourceRecord & measRecord,
-        afw::image::Exposure<float> const & exposure,
-        afw::table::SourceRecord const & refRecord,
-        afw::geom::SkyWcs const & refWcs
-    ) const {
+    virtual void measureForced(afw::table::SourceRecord& measRecord,
+                               afw::image::Exposure<float> const& exposure,
+                               afw::table::SourceRecord const& refRecord,
+                               afw::geom::SkyWcs const& refWcs) const {
         measure(measRecord, exposure);
     }
 
-    virtual void measureNForced(
-        afw::table::SourceCatalog const & measCat,
-        afw::image::Exposure<float> const & exposure,
-        afw::table::SourceCatalog const & refRecord,
-        afw::geom::SkyWcs const & refWcs
-    ) const {
+    virtual void measureNForced(afw::table::SourceCatalog const& measCat,
+                                afw::image::Exposure<float> const& exposure,
+                                afw::table::SourceCatalog const& refRecord,
+                                afw::geom::SkyWcs const& refWcs) const {
         measureN(measCat, exposure);
     }
-
 };
 
-}}} // namespace lsst::meas::base
+}  // namespace base
+}  // namespace meas
+}  // namespace lsst
 
-#endif // !LSST_MEAS_BASE_Algorithm_h_INCLUDED
+#endif  // !LSST_MEAS_BASE_Algorithm_h_INCLUDED