Skip to content

Commit 97df5ec

Browse files
committed
Fixed astropy#2274
1 parent 78225a3 commit 97df5ec

1 file changed

Lines changed: 28 additions & 15 deletions

File tree

‎astropy/convolution/utils.py‎

Lines changed: 28 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44

55
import numpy as np
66

7-
from ..modeling.core import Fittable1DModel, Fittable2DModel
8-
7+
from ..modeling.core import (Fittable1DModel, Fittable2DModel,
8+
custom_model, _ModelMeta)
99

1010
__all__ = ['discretize_model']
1111

@@ -74,12 +74,15 @@ def add_kernel_arrays_2D(array_1, array_2):
7474

7575
def discretize_model(model, x_range, y_range=None, mode='center', factor=10):
7676
"""
77-
Function to evaluate analytical models on a grid.
77+
Function to evaluate analytical model functions on a grid.
78+
79+
So far the function can only deal with pixel coordinates.
7880
7981
Parameters
8082
----------
81-
model : `~astropy.modeling.FittableModel`
82-
Model to be evaluated.
83+
model : `~astropy.modeling.FittableModel` or callable
84+
Model function to be evaluated. Can also be a callable
85+
function. See `astropy.modeling.custom_model` for details.
8386
x_range : tuple
8487
x range in which the model is evaluated.
8588
y_range : tuple, optional
@@ -135,27 +138,37 @@ def discretize_model(model, x_range, y_range=None, mode='center', factor=10):
135138
136139
137140
"""
138-
if isinstance(model, Fittable2DModel) and y_range is None:
139-
raise Exception("Please specify y range.")
141+
if not callable(model):
142+
raise Exception('Model must be callable.')
143+
if not isinstance(model, (Fittable1DModel, Fittable2DModel, _ModelMeta)):
144+
model = custom_model(model)
145+
ndim = model.n_inputs
146+
if ndim > 2:
147+
raise Exception('discretize_model only supports 1-d and 2-d models.')
148+
149+
if ndim == 2 and y_range is None:
150+
raise Exception("y range not specified, but model is 2-d")
151+
if ndim == 1 and y_range is not None:
152+
raise Exception("y range specified, but model is only 1-d.")
140153
if mode == "center":
141-
if isinstance(model, Fittable1DModel):
154+
if ndim == 1:
142155
return discretize_center_1D(model, x_range)
143-
if isinstance(model, Fittable2DModel):
156+
elif ndim == 2:
144157
return discretize_center_2D(model, x_range, y_range)
145158
elif mode == "linear_interp":
146-
if isinstance(model, Fittable1DModel):
159+
if ndim == 1:
147160
return discretize_linear_1D(model, x_range)
148-
if isinstance(model, Fittable2DModel):
161+
if ndim == 2:
149162
return discretize_bilinear_2D(model, x_range, y_range)
150163
elif mode == "oversample":
151-
if isinstance(model, Fittable1DModel):
164+
if ndim == 1:
152165
return discretize_oversample_1D(model, x_range, factor)
153-
if isinstance(model, Fittable2DModel):
166+
if ndim == 2:
154167
return discretize_oversample_2D(model, x_range, y_range, factor)
155168
elif mode == "integrate":
156-
if isinstance(model, Fittable1DModel):
169+
if ndim == 1:
157170
return discretize_integrate_1D(model, x_range)
158-
if isinstance(model, Fittable2DModel):
171+
if ndim == 2:
159172
return discretize_integrate_2D(model, x_range, y_range)
160173
else:
161174
raise DiscretizationError('Invalid mode.')

0 commit comments

Comments
 (0)