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

Solving crop_by_coord problem when data are rotated #113

Merged
merged 14 commits into from
Apr 27, 2018
Merged

Solving crop_by_coord problem when data are rotated #113

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
909ce8c
Solving crop_by_coord problem when data are rotated
BaptistePellorceAstro Apr 18, 2018
28aba8c
New error raising and dimension modified
BaptistePellorceAstro Apr 19, 2018
952a712
Adding a new test for rotated data
BaptistePellorceAstro Apr 20, 2018
cefd9a7
PEP8 correction in test_ndcube.py
BaptistePellorceAstro Apr 20, 2018
5a0f454
Solving test bug with old values on crop by coords
BaptistePellorceAstro Apr 23, 2018
b837d0e
Some error tests added
BaptistePellorceAstro Apr 23, 2018
77b32f7
New API for crop by coords with units
BaptistePellorceAstro Apr 25, 2018
16c08f0
Some Quantity types checks refactored
BaptistePellorceAstro Apr 25, 2018
1adde1d
Fix a test error
BaptistePellorceAstro Apr 25, 2018
76501e1
Improving units checks in crop by coords
BaptistePellorceAstro Apr 26, 2018
7c56239
Improving corners calculation
BaptistePellorceAstro Apr 26, 2018
4f729dd
Improving the data slicing
BaptistePellorceAstro Apr 26, 2018
b097241
Fix some error bugs
BaptistePellorceAstro Apr 26, 2018
d6cf940
Removing product importation
BaptistePellorceAstro Apr 27, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 13 additions & 18 deletions ndcube/ndcube.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -463,24 +463,19 @@ def crop_by_coords(self, lower_corner, interval_widths=None, upper_corner=None,
raise TypeError("lower_corner and interval_widths/upper_corner must be "
"of type astropy.units.Quantity or the units kwarg "
"must be set.")
# Derive all corners coordinates
quantity_list = [[lower_corner[i], upper_corner[i]] for i in range(n_dim)]
all_corners = [self.world_to_pixel(*a) for a in product(*quantity_list)]
# Inputing of all corners coordinates inside a numpy array
# According to the boundary conditions
corners_array = np.zeros((2**n_dim, n_dim))
for i in range(2**n_dim):
for j in range(n_dim):
corners_array[i, j] = u.Quantity(all_corners[i][j]).value
if corners_array[i, j] > self.data.shape[j]:
corners_array[i, j] = self.data.shape[j]
if corners_array[i, j] < 0:
corners_array[i, j] = 0
# Taking the maximum and minimum values of coordinates
lower_pixels = corners_array.min(0)
upper_pixels = corners_array.max(0)
# Creating a tuple to crop the data with inputed coordinates
item = tuple([slice(int(lower_pixels[i]), int(upper_pixels[i]) + 1) for i in range(n_dim)])
# Get all corners of region of interest.
all_world_corners_grid = np.meshgrid(*[u.Quantity([lower_corner[i], upper_corner[i]],
unit=lower_corner[i].unit).value
for i in range(self.data.ndim)])
Copy link
Member

Choose a reason for hiding this comment

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

Suggestion for code readability:

all_world_corners_grid = np.meshgrid(
    *[u.Quantity([lower_corner[i], upper_corner[i]], unit=lower_corner[i].unit).value
      for i in range(self.data.ndim)]

It makes the code more readable but minimizing the break up of single items (e.g. Quantities) over multiple lines.

Copy link
Member

Choose a reason for hiding this comment

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

ping @BaptistePellorceAstro. This comment got outdated incorrectly.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Ok I was thinking about it ! I am solving some test bugs from the last commits.

all_world_corners = [all_world_corners_grid[i].flatten()*lower_corner[i].unit
for i in range(n_dim)]
# Convert to pixel coordinates
all_pix_corners = self.world_to_pixel(*all_world_corners)
# Derive slicing item with which to slice NDCube.
# Be sure to round down min pixel and round up + 1 the max pixel.
item = tuple([slice(int(axis_pixels.value.min()),
int(np.ceil(axis_pixels.value.max()))+1)
for axis_pixels in all_pix_corners])
return self[item]

def crop_by_extra_coord(self, min_coord_value, interval_width, coord_name):
Expand Down