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.

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

DM-13396: Add more flexible mask propagation to statisticsStack. #314

Merged
merged 1 commit into from Jan 30, 2018

Conversation

TallJimbo
Copy link
Member

Changes here were done to in a way that should guarantee ABI compatibility with w_2018_04 (when the fixed version of that comes out); I didn't want anyone working on coadds this week to have to rebuild everything (instead they'll just have to rebuild afw). Note that this precludes some cleanups I'd have otherwise tried to do in nearby code (wow, statisticsStack is a mess!).

Copy link
Contributor

@PaulPrice PaulPrice left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Typos.

// Might the masking be excused?
image::MaskPixel const maskVal = sctrl.getAndMask() & ~excuse;
}
// Check to see if any pixels were rejected to be masking, and apply
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"to be masking"

template std::shared_ptr<image::MaskedImage<TYPE>> statisticsStack<TYPE>( \
std::vector<std::shared_ptr<image::MaskedImage<TYPE>>> & images, Property flags, \
StatisticsControl const &sctrl, WeightVector const &wvector, image::MaskPixel, \
std::vector<std::pair<image::MaskPixel, image::MaskPixel>> const &); \
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Missing backslash in #define?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just bad whitespace, actually, but still worth fixing.

template void statisticsStack<TYPE>( \
image::MaskedImage<TYPE> & out, std::vector<std::shared_ptr<image::MaskedImage<TYPE>>> & images, \
Property flags, StatisticsControl const &sctrl, WeightVector const &wvector, image::MaskPixel, \
std::vector<std::pair<image::MaskPixel, image::MaskPixel>> const &); \
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Missing backslash in #define?

@TallJimbo TallJimbo merged commit 2a81816 into master Jan 30, 2018
@ktlim ktlim deleted the tickets/DM-13396 branch August 25, 2018 06:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants