Skip to content

Enable unit support on all functional models #6183

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

Merged
astrofrog merged 15 commits into from
Jun 14, 2017
Merged

Enable unit support on all functional models #6183

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
5efb257
Added tests for evaluation of all 1D functional models with quantities
astrofrog Jun 11, 2017
74c89e1
Added test of bounding_box when quantities are present
astrofrog Jun 11, 2017
38c849d
Test 2D functional models with quantities (for evaluation and boundin…
astrofrog Jun 11, 2017
d6ee801
Fix fitting for 1D functional models with units
astrofrog Jun 12, 2017
8f5fdf7
Fix fitting tests for all functional models
astrofrog Jun 12, 2017
7397b26
Add tests without units for all functional models
astrofrog Jun 13, 2017
b0caec6
Minor fixes to logic
astrofrog Jun 13, 2017
41f993f
Skip models that require scipy if scipy is not installed
astrofrog Jun 13, 2017
c2adf61
Updated changelog entry [ci skip]
astrofrog Jun 13, 2017
e185bb2
Don't use all ones for dependent variable when testing fitting, and a…
astrofrog Jun 13, 2017
dd03dec
Addressed comments by @nden and @pllim
astrofrog Jun 13, 2017
fd9f35d
Test bounding box values
astrofrog Jun 13, 2017
be6b28d
Make sure that fitted models retain units in parameters
astrofrog Jun 13, 2017
d435d22
Remove workaround for Ring2D width
astrofrog Jun 14, 2017
ebe4e3c
Fix test function names
astrofrog Jun 14, 2017
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
4 changes: 2 additions & 2 deletions CHANGES.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,8 @@ New Features
is controlled by a new optional boolean keyword ``with_bounding_box``. [#6081]

- Added infrastructure support for units on parameters and during
model evaluation and fitting, added support for units on Gaussian1D
and added a new Blackbody1D model. [#4855]
model evaluation and fitting, added support for units on most
functional models and added a new BlackBody1D model. [#4855, #6183]

- ``astropy.nddata``

Expand Down
13 changes: 4 additions & 9 deletions astropy/modeling/core.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1475,22 +1475,17 @@ def prepare_inputs(self, *inputs, **kwargs):
for i in range(len(inputs)):

input_name = self.inputs[i]
input_unit = self.input_units.get(input_name, None)

@pllim pllim Jun 13, 2017

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

This change assumes self.input_units is now always a dictionary. The deleted code allowed for None type and a dictionary. Is this intentional?

@nden nden Jun 13, 2017

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

At this point it's always a dict. The check for None is done earlier.


if self.input_units is not None:
input_unit = self.input_units.get(input_name, None)
if input_unit is None:
continue

if isinstance(inputs[i], Quantity):

# We check for consistency of the units with input_units,
# taking into account any equivalencies

if input_unit is None:

# We dont need to do anything since no restrictions were
# placed on input_units for this parameter.
pass

elif inputs[i].unit.is_equivalent(input_unit, equivalencies=input_units_equivalencies[input_name]):
if inputs[i].unit.is_equivalent(input_unit, equivalencies=input_units_equivalencies[input_name]):

# If equivalencies have been specified, we need to
# convert the input to the input units - this is because
Expand Down
Loading