Skip to content

[WIP] Moment errors #40

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

Open
e-koch wants to merge 9 commits into
base: master
Choose a base branch
from
Open

[WIP] Moment errors #40

Changes from 2 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
70c3003
Moment error calculations. slice methods verified
e-koch Nov 21, 2016
ea8038d
Clean-up and move to tests
e-koch Nov 22, 2016
cd30fa3
Functions for calculating moment errors
e-koch Nov 22, 2016
677caa0
Remove unaltered ray-wise for now.
e-koch Nov 22, 2016
5a94acf
Call _cube and _slice methods from general moment error funcs
e-koch Nov 29, 2016
17b8dc9
tests use general functions
e-koch Nov 29, 2016
d55f4f6
Copy moment1 before Quantity conversion
e-koch Nov 29, 2016
f82903d
Default axis to zeroth
e-koch Nov 29, 2016
4327cba
Copy to Quantity conversion not needed
e-koch Nov 29, 2016
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
10 changes: 5 additions & 5 deletions signal_id/_moment_errs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
np2wcs = {2: 0, 1: 1, 0: 2}


def moment0_error(cube, scale, axis, how='auto'):
def moment0_error(cube, scale, axis=0, how='auto'):
'''
Compute the zeroth moment error.

Expand Down Expand Up @@ -75,7 +75,7 @@ def moment0_error(cube, scale, axis, how='auto'):
header=cube._nowcs_header)


def moment1_error(cube, scale, axis, how='auto', moment0=None, moment1=None):
def moment1_error(cube, scale, axis=0, how='auto', moment0=None, moment1=None):
'''
Compute the first moment error.

Expand Down Expand Up @@ -113,7 +113,7 @@ def moment1_error(cube, scale, axis, how='auto', moment0=None, moment1=None):

# Remove velocity offset from centroid to match cube._pix_cen
# Requires converting to a Quantity
moment1 = u.Quantity(moment1)
moment1 = u.Quantity(moment1.copy())
moment1 -= cube.spectral_axis[0]

if how == "cube":
Expand All @@ -136,7 +136,7 @@ def moment1_error(cube, scale, axis, how='auto', moment0=None, moment1=None):
header=cube._nowcs_header)


def moment2_error(cube, scale, axis, how='auto', moment0=None, moment1=None,
def moment2_error(cube, scale, axis=0, how='auto', moment0=None, moment1=None,
moment2=None, moment1_err=None):
'''
Compute the second moment error.
Expand Down Expand Up @@ -175,7 +175,7 @@ def moment2_error(cube, scale, axis, how='auto', moment0=None, moment1=None,

# Remove velocity offset to match cube._pix_cen
# Requires converting to a Quantity
moment1 = u.Quantity(moment1)
moment1 = u.Quantity(moment1.copy())
Copy link
Contributor

@keflavich keflavich Nov 29, 2016

Choose a reason for hiding this comment

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

making it a Quantity doesn't automatically copy the data? I guess I didn't realize that. It might be better to have copy=True as a parameter, since that's default for, e.g., np.array

Copy link
Contributor Author

@e-koch e-koch Nov 29, 2016

Choose a reason for hiding this comment

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

I assumed it didn't automatically, so I'll go back and check if this is needed.

Copy link
Contributor Author

@e-koch e-koch Nov 29, 2016

Choose a reason for hiding this comment

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

You're right, it's automatically copied.

moment1 -= cube.spectral_axis[0]

if moment2 is None:
Expand Down