Skip to content

Commit

Permalink
Merge pull request #52 from robelgeda/main
Browse files Browse the repository at this point in the history
More updates
  • Loading branch information
robelgeda authored Jan 19, 2022
2 parents d58133c + d4c4911 commit 0787988
Show file tree
Hide file tree
Showing 6 changed files with 364 additions and 371 deletions.
Binary file modified docs/images/concentration_index_vs_epsilon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/images/concentration_index_vs_n.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/images/f105w_concentration_index_vs_epsilon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion docs/installation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ and install the package. There are two recommended ways to install the requireme
`Conda <https://docs.conda.io/projects/conda/en/latest/user-guide/getting-started.html>`_ and
`Docker <https://docs.docker.com/get-docker/>`_.

PIP
pip
****
Petrofit can be installed using pip as follows:

Expand Down
729 changes: 361 additions & 368 deletions docs/introduction.ipynb

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions petrofit/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@

from scipy.ndimage import rotate
from scipy.special import gammainc, gamma, gammaincinv
from scipy.signal import convolve

from astropy.convolution import convolve
from astropy.nddata import block_reduce
from astropy.modeling import FittableModel, Parameter, custom_model, models

Expand Down Expand Up @@ -135,7 +135,7 @@ def evaluate(self, *args, **kwargs):
psf = self.psf
if psf_p[0] != 0:
psf = rotate(psf, psf_p[0], reshape=False)
return convolve(model_image, psf)[y.astype(int), x.astype(int)]
return convolve(model_image, psf, mode='same')[y.astype(int), x.astype(int)]

@property
def model(self):
Expand Down

0 comments on commit 0787988

Please sign in to comment.