DM-7477: Increase mask plane size to 32 bits #258
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
PaulPrice
approved these changes
Jul 11, 2017
There was a problem hiding this comment.
This looks great, except that I would love to see
afwImage.Mask[afwImage.MaskPixel].getPlaneBitMask(...) become afwImage.Mask.getPlaneBitMask(...) --- the user in python shouldn't have to know about MaskPixel. I've pushed some changes to util and afw in u/price/DM-7477 that should allow that.
Why MaskX instead of MaskI? I think I is what we use for int32 in other cases.
| @@ -461,7 +461,7 @@ Mask<MaskPixelT>::Mask(fits::Fits& fitsfile, std::shared_ptr<daf::base::Property | |||
| afw::geom::Box2I const& bbox, ImageOrigin const origin, bool const conformMasks) | |||
| : ImageBase<MaskPixelT>(), _maskDict(detail::MaskDict::makeMaskDict()) { | |||
| // These are the permitted input file types | |||
| typedef boost::mpl::vector<unsigned char, unsigned short, short> fits_mask_types; | |||
| typedef boost::mpl::vector<unsigned char, unsigned short, short, std::int32_t> fits_mask_types; | |||
There was a problem hiding this comment.
MaskPixel instead of std::int32_t?
|
I think you need to add a test for the legacy |
PaulPrice
changed the title
natelust
force-pushed
the
tickets/DM-7477
branch
from
000a12e
to
eec2196
Compare
Changed Mask pixel type(def) to int32, adding alias to MaskPixel in python as well. This change triggered a renaming of the python template alias from MaskU to MaskX to avoid type confusion. Because of the new pybind11 continue class abstract base classes this new name could be mostly hidden behind the abc name "Mask", as MaskX is now the default type to construct when calling the abc.
Changing the mask pixel type necessitated creating a way to read HeavyFootprints that were saved with the old MaskPixel type. Test that a old HeavyFootprint is loadable, has the correct values, and is comprised of the new MaskPixel type.
natelust
force-pushed
the
tickets/DM-7477
branch
from
0661e82
to
c1b2468
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.