Remove CcdImageList std::list subclass

CcdImageList is now just a typedef, and the "valid size" method got lifted into Associations, where it fits nicely.
lsst · Mar 17, 2017 · 04e3e5d · 04e3e5d
1 parent 8da60c6
commit 04e3e5d
Show file tree

Hide file tree

Showing 13 changed files with 29 additions and 69 deletions.
diff --git a/include/lsst/jointcal/Associations.h b/include/lsst/jointcal/Associations.h
@@ -5,8 +5,7 @@
 
 #include <string>
 #include <iostream>
-
-//#include "stringlist.h"
+#include <list>
 
 #include "lsst/afw/table/Source.h"
 #include "lsst/afw/image/TanWcs.h"
@@ -117,6 +116,16 @@ class Associations {
     const lsst::afw::geom::Box2D getRaDecBBox();
 
 
+    /**
+     * @brief      return the number of CcdImages with non-empty catalogs to-be-fit.
+     */
+    int nCcdImagesValidForFit() const
+    {
+        return std::count_if(ccdImageList.begin(), ccdImageList.end(),
+                             [](std::shared_ptr<CcdImage> const &item)
+                             {return item->getCatalogForFit().size() > 0;});
+    }
+
 private:
     void associateRefStars(double matchCutInArcsec, const Gtransfo* gtransfo);
 

diff --git a/include/lsst/jointcal/CcdImage.h b/include/lsst/jointcal/CcdImage.h
@@ -1,9 +1,8 @@
 #ifndef CCDIMAGE__H
 #define CCDIMAGE__H
 
-#include <string>
 #include <list>
-#include <vector>
+#include <string>
 
 #include "lsst/afw/table/Source.h"
 #include "lsst/afw/image/TanWcs.h"
@@ -19,6 +18,8 @@
 namespace lsst {
 namespace jointcal {
 
+typedef std::list<std::shared_ptr<CcdImage> > CcdImageList;
+
 typedef int VisitIdType;
 typedef int CcdIdType;
 
@@ -188,42 +189,6 @@ class CcdImage : public RefCount
     CcdImage(const CcdImage &); // forbid copies
 };
 
-
-/********* CcdImageList *************/
-
-
-/**
- * A list of CcdImage. Usually produced by Associations.
- */
-//class CcdImageList : public std::list<CountedRef<CcdImage> >
-class CcdImageList : public std::list<std::shared_ptr<CcdImage> >
-{
-public:
-
-    template<class Accept> CcdImageList SubList(const Accept &OP) const
-    {
-        CcdImageList out;
-        for (auto const &i: *this)
-            if (OP(*i)) out.push_back(i);
-        return out;
-    }
-
-    /**
-     * @brief      Return the number of ccdImages with a populated catalogForFit list.
-     */
-    int sizeValidForFit() const
-    {
-        return std::count_if(this->begin(), this->end(),
-                             [](std::shared_ptr<CcdImage> const &item)
-                             {return item->getCatalogForFit().size() > 0;});
-    }
-};
-
-
-typedef CcdImageList::iterator CcdImageIterator;
-typedef CcdImageList::const_iterator CcdImageCIterator;
-
-}
-} // end of namespaces
+}} // end of namespaces
 
 #endif /* CCDIMAGE__H */
diff --git a/include/lsst/jointcal/ConstrainedPolyModel.h b/include/lsst/jointcal/ConstrainedPolyModel.h
@@ -13,7 +13,7 @@ class CcdImage;
 #include "lsst/jointcal/SimplePolyMapping.h"
 #include "lsst/jointcal/ProjectionHandler.h"
 #include "lsst/jointcal/TwoTransfoMapping.h"
-#include "lsst/jointcal/CcdImage.h" // for VisitIdType;
+#include "lsst/jointcal/CcdImage.h"
 
 
 #include <map>
@@ -22,8 +22,6 @@ class CcdImage;
 namespace lsst {
 namespace jointcal {
 
-class CcdImageList;
-
 /**
  * This is the model used to fit mappings as the combination of a
  * transformation depending on the chip number (instrument model) and a

diff --git a/include/lsst/jointcal/ProjectionHandler.h b/include/lsst/jointcal/ProjectionHandler.h
@@ -1,6 +1,7 @@
 #ifndef PROJECTIONHANDLER__H
 #define PROJECTIONHANDLER__H
 
+#include "lsst/jointcal/CcdImage.h"
 #include "lsst/jointcal/Gtransfo.h"
 #include "map"
 
@@ -9,7 +10,6 @@ namespace jointcal {
 
 class Mapping;
 class CcdImage;
-class CcdImageList;
 
 /**
  * This is a virtual class that allows a lot of freedom in the choice of the

diff --git a/include/lsst/jointcal/SimplePhotometryModel.h b/include/lsst/jointcal/SimplePhotometryModel.h
@@ -1,6 +1,7 @@
 #ifndef SIMPLEPHOTOMMODEL__H
 #define SIMPLEPHOTOMMODEL__H
 
+#include "lsst/jointcal/CcdImage.h"
 #include "lsst/jointcal/Eigenstuff.h"
 #include "lsst/jointcal/PhotometryModel.h"
 #include "lsst/jointcal/Point.h"
@@ -9,7 +10,6 @@
 namespace lsst {
 namespace jointcal {
 
-class CcdImageList;
 class CcdImage;
 class Point;
 

diff --git a/include/lsst/jointcal/SimplePolyModel.h b/include/lsst/jointcal/SimplePolyModel.h
@@ -15,7 +15,6 @@ namespace lsst {
 namespace jointcal {
 
 class CcdImage;
-class CcdImageList;
 
 /* We deal here with coordinate transforms which are fitted
    and/or necessary to AstrometryFit. The classes SimplePolyModel

diff --git a/python/lsst/jointcal/associations.cc b/python/lsst/jointcal/associations.cc
@@ -21,6 +21,7 @@
  */
 
 #include "pybind11/pybind11.h"
+#include "pybind11/stl.h"
 
 #include "lsst/jointcal/Associations.h"
 #include "lsst/jointcal/CcdImage.h"
@@ -43,6 +44,7 @@ void declareAssociations(py::module &mod) {
             "matchCutInArcsec"_a=0, "useFittedList"_a=false, "enlargeFittedList"_a=true);
     cls.def("collectRefStars", &Associations::collectRefStars);
     cls.def("deprojectFittedStars", &Associations::deprojectFittedStars);
+    cls.def("nCcdImagesValidForFit", &Associations::nCcdImagesValidForFit);
 
     cls.def("addImage", &Associations::addImage);
     cls.def("selectFittedStars", &Associations::selectFittedStars);

diff --git a/python/lsst/jointcal/astrometryModels.cc b/python/lsst/jointcal/astrometryModels.cc
@@ -21,6 +21,7 @@
  */
 
 #include "pybind11/pybind11.h"
+#include "pybind11/stl.h"
 
 #include "lsst/jointcal/CcdImage.h"
 #include "lsst/jointcal/AstrometryModel.h"

diff --git a/python/lsst/jointcal/ccdImage.cc b/python/lsst/jointcal/ccdImage.cc
@@ -23,8 +23,6 @@
 #include "pybind11/pybind11.h"
 #include "pybind11/stl.h"
 
-#include <list>
-
 #include "lsst/jointcal/CcdImage.h"
 
 namespace py = pybind11;
@@ -60,23 +58,10 @@ void declareCcdImage(py::module &mod) {
 
 }
 
-void declareCcdImageList(py::module &mod) {
-    py::class_<CcdImageList, std::shared_ptr<CcdImageList>> cls(mod, "CcdImageList");
-
-    cls.def("sizeValidForFit", &CcdImageList::sizeValidForFit);
-
-    // Make this behave like a std::list (which it is but we can't wrap std::list subclasses trivially)
-    cls.def("__len__", &CcdImageList::size);
-    cls.def("__iter__", [](const CcdImageList &self) {
-        return py::make_iterator(self.begin(), self.end());
-    }, py::keep_alive<0, 1>()); /* Essential: keep object alive while iterator exists */
-}
-
 PYBIND11_PLUGIN(ccdImage) {
     py::module mod("ccdImage");
 
     declareCcdImage(mod);
-    declareCcdImageList(mod);
 
     return mod.ptr();
 }

diff --git a/python/lsst/jointcal/jointcal.py b/python/lsst/jointcal/jointcal.py
@@ -359,7 +359,7 @@ def _do_load_refcat_and_fit(self, associations, defaultFilter, center, radius,
         self._check_star_lists(associations, name)
         self.metrics['selected%sRefStars' % name] = associations.refStarListSize()
         self.metrics['selected%sFittedStars' % name] = associations.fittedStarListSize()
-        self.metrics['selected%sCcdImageList' % name] = associations.ccdImageList.sizeValidForFit()
+        self.metrics['selected%sCcdImageList' % name] = associations.nCcdImagesValidForFit()
 
         load_cat_prof_file = 'jointcal_fit_%s.prof'%name if profile_jointcal else ''
         with pipeBase.cmdLineTask.profile(load_cat_prof_file):
@@ -374,7 +374,7 @@ def _do_load_refcat_and_fit(self, associations, defaultFilter, center, radius,
 
     def _check_star_lists(self, associations, name):
         # TODO: these should be len(blah), but we need this properly wrapped first.
-        if associations.ccdImageList.sizeValidForFit() == 0:
+        if associations.nCcdImagesValidForFit() == 0:
             raise RuntimeError('No images in the ccdImageList!')
         if associations.fittedStarListSize() == 0:
             raise RuntimeError('No stars in the {} fittedStarList!'.format(name))

diff --git a/python/lsst/jointcal/photometryModels.cc b/python/lsst/jointcal/photometryModels.cc
@@ -21,6 +21,7 @@
  */
 
 #include "pybind11/pybind11.h"
+#include "pybind11/stl.h"
 
 #include "lsst/jointcal/CcdImage.h"
 #include "lsst/jointcal/PhotometryModel.h"

diff --git a/python/lsst/jointcal/projectionHandler.cc b/python/lsst/jointcal/projectionHandler.cc
@@ -21,6 +21,7 @@
  */
 
 #include "pybind11/pybind11.h"
+#include "pybind11/stl.h"
 
 #include "lsst/jointcal/ProjectionHandler.h"
 #include "lsst/jointcal/CcdImage.h"

diff --git a/src/ConstrainedPolyModel.cc b/src/ConstrainedPolyModel.cc
@@ -39,12 +39,11 @@ ConstrainedPolyModel::ConstrainedPolyModel(const CcdImageList &ccdImageList,
 {
   // from datacards (or default)
   unsigned degree = DistortionDegree;
-  unsigned count = 0;
   VisitIdType refVisit;
   // first loop to initialize all visit  and chip transfos.
-  for (auto i=ccdImageList.cbegin(); i!= ccdImageList.cend(); ++i, ++count)
+  for (auto &ccdImage: ccdImageList)
     {
-      const CcdImage &im = **i;
+      const CcdImage &im = *ccdImage;
       unsigned visit = im.getVisit();
       unsigned chip = im.getCcdId();
       auto visitp = _visitMap.find(visit);
@@ -88,9 +87,9 @@ ConstrainedPolyModel::ConstrainedPolyModel(const CcdImageList &ccdImageList,
 	}
     }
   // now, second loop to set the mappings of the CCdImages
-  for (auto i=ccdImageList.cbegin(); i!= ccdImageList.cend(); ++i, ++count)
+  for (auto &ccdImage: ccdImageList)
     {
-      const CcdImage &im = **i;
+      const CcdImage &im = *ccdImage;
       unsigned visit = im.getVisit();
       unsigned chip = im.getCcdId();
       // check that the chip_indexed part was indeed assigned