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-11800: Update meas_mosaic to new transform-based API for afw::cameraGeom #20

Merged
merged 1 commit into from
Sep 13, 2017
Merged

DM-11800: Update meas_mosaic to new transform-based API for afw::cameraGeom #20

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
16 changes: 8 additions & 8 deletions src/mosaicfit.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2497,11 +2497,11 @@ CoeffSet lsst::meas::mosaic::solveMosaic_CCD_shot(int order, int nmatch, ObsVec
coeff(2 * ncoeff * nexp + 3 * i + 2) * afw::geom::radians,
it->second->getOrientation().getPitch(), it->second->getOrientation().getRoll());

afw::cameraGeom::CameraTransformMap::Transforms newTr;
afw::cameraGeom::TransformMap::Transforms newTr;

// Transform from pixels to focal plane has to be recalculated.
newTr[afw::cameraGeom::FOCAL_PLANE] =
std::make_shared<afw::geom::AffineXYTransform const>(
std::make_shared<afw::geom::TransformPoint2ToPoint2>(
newOrientation.makePixelFpTransform(pixelSize));

// We should not require any other transformations within meas_mosaic.
Expand Down Expand Up @@ -2529,11 +2529,11 @@ CoeffSet lsst::meas::mosaic::solveMosaic_CCD_shot(int order, int nmatch, ObsVec
it->second->getOrientation().getYaw(), it->second->getOrientation().getPitch(),
it->second->getOrientation().getRoll());

afw::cameraGeom::CameraTransformMap::Transforms newTr;
afw::cameraGeom::TransformMap::Transforms newTr;

// Transform from pixels to focal plane has to be recalculated.
newTr[afw::cameraGeom::FOCAL_PLANE] =
std::make_shared<afw::geom::AffineXYTransform const>(
std::make_shared<afw::geom::TransformPoint2ToPoint2>(
newOrientation.makePixelFpTransform(pixelSize));

// We should not require any other transformations within meas_mosaic.
Expand Down Expand Up @@ -2693,11 +2693,11 @@ CoeffSet lsst::meas::mosaic::solveMosaic_CCD(int order, int nmatch, int nsource,
coeff(2 * ncoeff * nexp + 3 * i + 2) * afw::geom::radians,
it->second->getOrientation().getPitch(), it->second->getOrientation().getRoll());

afw::cameraGeom::CameraTransformMap::Transforms newTr;
afw::cameraGeom::TransformMap::Transforms newTr;

// Transform from pixels to focal plane has to be recalculated.
newTr[afw::cameraGeom::FOCAL_PLANE] =
std::make_shared<afw::geom::AffineXYTransform const>(
std::make_shared<afw::geom::TransformPoint2ToPoint2>(
newOrientation.makePixelFpTransform(pixelSize));

// We should not require any other transformations within meas_mosaic.
Expand All @@ -2724,11 +2724,11 @@ CoeffSet lsst::meas::mosaic::solveMosaic_CCD(int order, int nmatch, int nsource,
it->second->getOrientation().getYaw(), it->second->getOrientation().getPitch(),
it->second->getOrientation().getRoll());

afw::cameraGeom::CameraTransformMap::Transforms newTr;
afw::cameraGeom::TransformMap::Transforms newTr;

// Transform from pixels to focal plane has to be recalculated.
newTr[afw::cameraGeom::FOCAL_PLANE] =
std::make_shared<afw::geom::AffineXYTransform const>(
std::make_shared<afw::geom::TransformPoint2ToPoint2>(
newOrientation.makePixelFpTransform(pixelSize));

// We should not require any other transformations within meas_mosaic.
Expand Down