From 7cf0e5977e4a885595ca0931f26a5fef7dc8f82e Mon Sep 17 00:00:00 2001 From: Aaron LI Date: Wed, 26 Oct 2016 15:36:57 +0800 Subject: utils/grid.py: Use own-implemented JIT-optimized "rotate_center()" Also remove the dependence on "scipy". --- fg21sim/utils/grid.py | 6 +++--- requirements.txt | 1 - setup.py | 1 - 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/fg21sim/utils/grid.py b/fg21sim/utils/grid.py index 7a81ea2..ca9510c 100644 --- a/fg21sim/utils/grid.py +++ b/fg21sim/utils/grid.py @@ -8,9 +8,9 @@ Grid utilities. import numpy as np import numba as nb -from scipy import ndimage from .draw import ellipse +from .rotate import rotate_center from .healpix import ang2pix_ring @@ -136,8 +136,8 @@ def make_grid_ellipse(center, size, resolution, rotation=None): gridmap[rr, cc] = 1.0 if rotation is not None: # Rotate the ellipse - gridmap = ndimage.rotate(gridmap, angle=rotation, order=1, - reshape=False) + gridmap = rotate_center(gridmap, angle=rotation, interp=True, + reshape=False, fill_value=0.0) return (lon, lat, gridmap) diff --git a/requirements.txt b/requirements.txt index 60199f0..a072943 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,5 @@ numpy numba -scipy pandas astropy healpy diff --git a/setup.py b/setup.py index 1fce5c6..99aa4eb 100755 --- a/setup.py +++ b/setup.py @@ -81,7 +81,6 @@ setup( install_requires=[ "numpy", "numba", - "scipy", "pandas", "astropy", "healpy", -- cgit v1.2.2