Fix for aiaprep - issue #1691 #1756
Conversation
| center = np.floor(tempmap.meta['crpix1']) | ||
| leftx = center - aiamap.data.shape[0] / 2 | ||
| rightx = center + aiamap.data.shape[0] / 2 | ||
| newmap = tempmap.submap([leftx, rightx]*u.pix, [leftx, rightx]*u.pix) |
There was a problem hiding this comment.
I'm not sure why you are using just shape[0], is it because the image need to be square?
In any case, another way of doing this without repetition would be:
range_side = (center + np.array([-1, 1]) * aiamap.data.shape[0] / 2) * u.pix
newmap = tempmap.submap(range_side, range_side)
| tempmap = aiamap.rotate(recenter=True, scale=scale_factor.value, missing=aiamap.min()) | ||
|
|
||
| # extract center from padded aiamap.rotate output | ||
| center = np.floor(tempmap.meta['crpix1']) |
There was a problem hiding this comment.
crpix1 and crpix2 will always be the same (recenter=True) - aiaprep doesn't work on submaps
There was a problem hiding this comment.
Can you add that as a comment to clairify for future Stu?!
There was a problem hiding this comment.
Comment and docstring?
There was a problem hiding this comment.
just an inline comment above the line will suffice, it's a suble implementation detail that's all.
Cadair
added
map
| tempmap = aiamap.rotate(recenter=True, scale=scale_factor.value, missing=aiamap.min()) | ||
|
|
||
| # extract center from padded aiamap.rotate output | ||
| # crpix1 and crpix2 will be equal (recenter=True), as aiaprep does not work with submaps |
There was a problem hiding this comment.
How do you assure it doesn't work for a submap? I've just tried and it didn't show any error or warning that I should not being doing this. Maybe raising an error if the dimensions are not right would be better than just proceed as normal and produce bad data:
>>> saia_map = aia_map.submap(u.Quantity([30, 809], u.pix), u.Quantity([35, 789], u.pix))
>>> saia_map_prep = sunpy.instr.aia.aiaprep(saia_map)
>>> saia_map.dimensions
Pair(x=<Quantity 779.0 pix>, y=<Quantity 754.0 pix>)
>>> saia_map_prep.dimensions
Pair(x=<Quantity 754.0 pix>, y=<Quantity 741.0 pix>)
>>> saia_map.xrange
>>> <Quantity [-1156.8, 712.8] arcsec>
>>> saia_map_prep.xrange
<Quantity [-903.6, 906. ] arcsec>
>>> saia_map.yrange
<Quantity [-1144.8, 664.8] arcsec>
>>> saia_map_prep.yrange
<Quantity [-873.6, 904.8] arcsec>
|
@larrymanley @wafels @dpshelio Can this PR be merged as is to close the obvious bug and the discussion can continue after the 0.7 feature freeze? |
|
@larrymanley you need to merge master into this to fix the conflict. |
|
@Cadair What command do I use for that? Then a push from my local? |
|
@larrymanley assuming you have github.com/sunpy/sunpy configured as "upstream" and github.com/larrymanley/sunpy as "origin" you can do: |
|
I have opened #1783 to continue the discussion regarding submaps, but in the interests of getting a 0.7 branch cut, I am going to merge this. 👍 |
|
Note to self: This needs backporting to 0.6. |
Generic fix for sunpy.instr.aia.aiaprep, issue #1691. Works for full-resolution Level 1 data or data that has already been reduced.