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-4639: modernize afw code and reduce doxygen errors #81

Merged
merged 1 commit into from
Apr 28, 2017
Merged

DM-4639: modernize afw code and reduce doxygen errors #81

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
2 changes: 1 addition & 1 deletion src/SdssCentroid.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -391,7 +391,7 @@ smoothAndBinImage(CONST_PTR(lsst::afw::detection::Psf) psf,
double const nEffective = 4*M_PI*smoothingSigma*smoothingSigma; // correct for a Gaussian
#endif

lsst::afw::math::Kernel::ConstPtr kernel = psf->getLocalKernel(center);
std::shared_ptr<lsst::afw::math::Kernel const> kernel = psf->getLocalKernel(center);
int const kWidth = kernel->getWidth();
int const kHeight = kernel->getHeight();

Expand Down
12 changes: 6 additions & 6 deletions src/SincCoeffs.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ std::pair<double, double> computeGaussLeakage(double const sigma) {
}

template<typename PixelT>
typename afw::image::Image<PixelT>::Ptr
std::shared_ptr<afw::image::Image<PixelT>>
calcImageRealSpace(double const rad1, double const rad2, double const taperwidth) {

PixelT initweight = 0.0; // initialize the coeff values
Expand All @@ -236,7 +236,7 @@ calcImageRealSpace(double const rad1, double const rad2, double const taperwidth
int const y0 = -ywidth/2;

// create an image to hold the coefficient image
typename afw::image::Image<PixelT>::Ptr coeffImage =
auto coeffImage =
std::make_shared<afw::image::Image<PixelT> >(afw::geom::ExtentI(xwidth, ywidth), initweight);
coeffImage->setXY0(x0, y0);

Expand Down Expand Up @@ -343,7 +343,7 @@ std::pair<double, double> rotate(double x, double y, double angle) {
*/

template<typename PixelT>
typename afw::image::Image<PixelT>::Ptr calcImageKSpaceCplx(double const rad1, double const rad2,
std::shared_ptr<afw::image::Image<PixelT>> calcImageKSpaceCplx(double const rad1, double const rad2,
double const posAng, double const ellipticity
) {

Expand Down Expand Up @@ -399,7 +399,7 @@ typename afw::image::Image<PixelT>::Ptr calcImageKSpaceCplx(double const rad1, d
fftw_destroy_plan(plan);

// put the coefficients into an image
typename afw::image::Image<PixelT>::Ptr coeffImage =
auto coeffImage =
std::make_shared<afw::image::Image<PixelT> >(afw::geom::ExtentI(wid, wid), 0.0);

for (int iY = 0; iY != coeffImage->getHeight(); ++iY) {
Expand Down Expand Up @@ -429,7 +429,7 @@ typename afw::image::Image<PixelT>::Ptr calcImageKSpaceCplx(double const rad1, d
// but I have to do it as real-to-halfcplx (R2HC) to get the correct numbers.

template<typename PixelT>
typename afw::image::Image<PixelT>::Ptr calcImageKSpaceReal(double const rad1, double const rad2) {
std::shared_ptr<afw::image::Image<PixelT>> calcImageKSpaceReal(double const rad1, double const rad2) {

// we only need a half-width due to symmertry
// make the hwid 2*rad2 so we have some buffer space and round up to the next power of 2
Expand Down Expand Up @@ -477,7 +477,7 @@ typename afw::image::Image<PixelT>::Ptr calcImageKSpaceReal(double const rad1, d
fftw_destroy_plan(plan);

// put the coefficients into an image
typename afw::image::Image<PixelT>::Ptr coeffImage =
auto coeffImage =
std::make_shared<afw::image::Image<PixelT> >(afw::geom::ExtentI(wid, wid), 0.0);

for (int iY = 0; iY != coeffImage->getHeight(); ++iY) {
Expand Down