Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

DM-22814: Remove afw APIs deprecated in DM-17566 #92

Merged
merged 1 commit into from
Nov 4, 2020
Merged

DM-22814: Remove afw APIs deprecated in DM-17566 #92

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 2 additions & 3 deletions python/lsst/meas/modelfit/mixture.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,7 @@ namespace {
using PyMixtureComponent = py::class_<MixtureComponent>;
using PyMixtureUpdateRestriction =
py::class_<MixtureUpdateRestriction, std::shared_ptr<MixtureUpdateRestriction>>;
using PyMixture = py::class_<Mixture, std::shared_ptr<Mixture>, afw::table::io::PersistableFacade<Mixture>,
afw::table::io::Persistable>;
using PyMixture = py::class_<Mixture, std::shared_ptr<Mixture>>;

static PyMixtureComponent declareMixtureComponent(py::module &mod) {
PyMixtureComponent cls(mod, "MixtureComponent");
Expand Down Expand Up @@ -75,8 +74,8 @@ static PyMixtureUpdateRestriction declareMixtureUpdateRestriction(py::module &mo
}

static PyMixture declareMixture(py::module &mod) {
afw::table::io::python::declarePersistableFacade<Mixture>(mod, "Mixture");
PyMixture cls(mod, "Mixture");
afw::table::io::python::addPersistableMethods<Mixture>(cls);
cls.def("__iter__", [](Mixture &self) { return py::make_iterator(self.begin(), self.end()); },
py::keep_alive<0, 1>());
cls.def("__getitem__",
Expand Down
4 changes: 2 additions & 2 deletions src/CModel.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1354,8 +1354,8 @@ void CModelAlgorithm::measure(
// Read the shapelet approximation to the PSF, load/verify other inputs from the SourceRecord
shapelet::MultiShapeletFunction psf = _processInputs(measRecord, exposure);
afw::geom::ellipses::Quadrupole moments;
if (!measRecord.getTable()->getShapeKey().isValid() ||
(measRecord.getTable()->getShapeFlagKey().isValid() && measRecord.getShapeFlag())) {
if (!measRecord.getTable()->getShapeSlot().getMeasKey().isValid() ||
(measRecord.getTable()->getShapeSlot().getFlagKey().isValid() && measRecord.getShapeFlag())) {
if (getControl().fallbackInitialMomentsPsfFactor > 0.0) {
result.flags[Result::NO_SHAPE] = true;
try {
Expand Down