[DM-981] convert measurement algorithms in meas_extensions_shapeHSM - Jira

XML

Word

Printable

Details

Type: Story
Status: Done
Resolution: Done
Fix Version/s: None
Component/s: meas_extensions_shapeHSM
Labels:
- SciencePipelines

Story Points:
3
Epic Link:
Measurement - Convert Old Algorithms
Sprint:
Science Pipelines DM-W15-4, Science Pipelines DM-W15-5
Team:
Data Release Production

Description

This is a low-priority ticket to replace the old-style plugins in meas_extensions_shapeHSM with new ones compatible with meas_base. As this isn't a part of the main-line stack, we should delay it until other the meas_base conversion is nearly (or perhaps fully) complete.

Attachments

Issue Links

blocks

DM-1920 update shapeHSM wrappers to latest external version

Done

has to be done before

DM-2131 Resolve compiler warnings in new measurement framework

Done

Activity

Ascending order - Click to sort in descending order

No builds found.

Jim Bosch created issue - 18/Jul/14 1:49 PM

Jim Bosch made changes - 18/Jul/14 1:49 PM

Field	Original Value	New Value
Epic Link		~~DM-16~~ [ 11264 ]

Jim Bosch made changes - 18/Jul/14 1:50 PM

Rank

Ranked higher

Jim Bosch made changes - 18/Jul/14 1:51 PM

Description

This is a low-priority ticket to replace the old-style plugins in meas_algorithms with new ones compatible with meas_base. As this isn't a part of the main-line stack, we should delay it until other the meas_base conversion is nearly (or perhaps fully) complete.

Jim Bosch made changes - 18/Jul/14 1:51 PM

Priority

Major [ 3 ]

Minor [ 4 ]

Jim Bosch made changes - 18/Jul/14 1:58 PM

Rank

Ranked lower

Jim Bosch made changes - 19/Aug/14 12:41 PM

Rank

Ranked higher

Jim Bosch made changes - 19/Aug/14 1:06 PM

Rank

Ranked higher

Jim Bosch made changes - 22/Aug/14 8:34 AM

Epic Link

~~DM-16~~ [ 11264 ]

~~DM-1100~~ [ 13907 ]

Jim Bosch made changes - 22/Aug/14 8:36 AM

Labels

Measurement

AppsPlanning

Jim Bosch made changes - 22/Aug/14 2:27 PM

Story Points

Jim Bosch made changes - 26/Aug/14 2:52 PM

Story Points

Jim Bosch made changes - 05/Oct/14 3:55 PM

Labels

AppsPlanning

SciencePipelines

Jim Bosch made changes - 31/Dec/14 11:26 AM

Sprint

Science Pipelines DM-W15-4 [ 120 ]

Jim Bosch made changes - 31/Dec/14 11:26 AM

Rank

Ranked higher

Jim Bosch made changes - 31/Dec/14 11:26 AM

Story Points

Perry Gee made changes - 27/Jan/15 12:11 AM

Status

To Do [ 10001 ]

In Progress [ 3 ]

Hide

Permalink

Jim Bosch added a comment - 27/Jan/15 8:47 AM

I have not yet moved the changes from HSC for this package. Please do Kron first.

Show

Jim Bosch added a comment - 27/Jan/15 8:47 AM I have not yet moved the changes from HSC for this package. Please do Kron first.

Hide

Permalink

Perry Gee added a comment - 02/Feb/15 3:30 PM

I have completed the conversion of the previous version. I don't think the HSC one will require much more work, unless the config and outputs have been changed substantially. Please let me know when the HSC side is merged.

Show

Perry Gee added a comment - 02/Feb/15 3:30 PM I have completed the conversion of the previous version. I don't think the HSC one will require much more work, unless the config and outputs have been changed substantially. Please let me know when the HSC side is merged.

Jim Bosch made changes - 03/Feb/15 5:07 PM

Link

This issue blocks ~~DM-1920~~ [ ~~DM-1920~~ ]

John Swinbank made changes - 16/Feb/15 10:00 AM

Sprint

Science Pipelines DM-W15-4 [ 120 ]

Science Pipelines DM-W15-4, Science Pipelines DM-W15-5 [ 120, 129 ]

John Swinbank made changes - 16/Feb/15 10:00 AM

Rank

Ranked higher

Hide

Permalink

Jim Bosch added a comment - 20/Feb/15 10:03 AM

I have just finished ~~DM-1920~~, which brings over the HSC changes, which were very extensive. However, it needs to build against a new version of the GalSim package, which is only available at present on lsst-dev, as version 1.2.lsst1. I'll keep working on getting a version of that out that can be installed via eups distrib, but it's now possible to work on lsst-dev in the meantime.

This issue absolutely needs to be rebased on top of master before doing any more work, because ~~DM-1920~~ changes essentially everything underneath it. It may actually be easier to start over again, but it's probably worth seeing how bad the rebase is first.

Show

Jim Bosch added a comment - 20/Feb/15 10:03 AM I have just finished DM-1920 , which brings over the HSC changes, which were very extensive. However, it needs to build against a new version of the GalSim package, which is only available at present on lsst-dev, as version 1.2.lsst1. I'll keep working on getting a version of that out that can be installed via eups distrib, but it's now possible to work on lsst-dev in the meantime. This issue absolutely needs to be rebased on top of master before doing any more work, because DM-1920 changes essentially everything underneath it. It may actually be easier to start over again, but it's probably worth seeing how bad the rebase is first.

John Swinbank made changes - 23/Feb/15 6:49 AM

Link

This issue has to be done before ~~DM-2131~~ [ ~~DM-2131~~ ]

Perry Gee made changes - 26/Feb/15 12:21 PM

Reviewers		Jim Bosch [ jbosch ]
Status	In Progress [ 3 ]	In Review [ 10004 ]

Perry Gee made changes - 26/Feb/15 12:22 PM

Status

In Review [ 10004 ]

In Progress [ 3 ]

Jim Bosch made changes - 26/Feb/15 12:27 PM

Comment

[ moved this work onto a new branch, tickets/~~DM-982~~. u/pgee/~~DM-982~~ was abandoned, but all the versions of KronFluxAlgorithm.h and KronFluxAlgorithm.cc were moved to the new branch, so the review of that code should still apply. Since the changes were so substantial, merging the u/pgee/~~DM-982~~ with master was not feasible.

include/lsst/meas/extensions/photometryKron.h | 76 --
.../extensions/photometryKron/KronFluxAlgorithm.h | 143 ++++
.../meas/extensions/photometryKron/__init__.py | 3 +-
.../lsst/meas/extensions/photometryKron/kronLib.i | 34 +-
src/KronFluxAlgorithm.cc | 618 ++++++++++++++++
src/KronPhotometry.cc | 759 --------------------
tests/Kron.py | 163 +++--
ups/meas_extensions_photometryKron.cfg | 2 +-
ups/meas_extensions_photometryKron.table | 1 +
9 files changed, 883 insertions(+), 916 deletions(-)

Please note that KronFluxAlgorithm.h and
KronFluxAlgorithm.cc are actually moved versions of KronPhotometry.h and KronShape.cc. I am now rather sorry I renamed them, since the git diff doesn't seem to know. If you have a fix for this, let me know ]

Hide

Permalink

Perry Gee added a comment - 01/Mar/15 12:06 AM

OK, hsmShape is ready for review. It may be a little ragged, since I am pushing this against the Sprint deadline. But I think that everything is working.

I may clean up and push again tomorrow, if you don't get to this early.

Show

Perry Gee added a comment - 01/Mar/15 12:06 AM OK, hsmShape is ready for review. It may be a little ragged, since I am pushing this against the Sprint deadline. But I think that everything is working. I may clean up and push again tomorrow, if you don't get to this early.

Perry Gee made changes - 01/Mar/15 12:06 AM

Status

In Progress [ 3 ]

In Review [ 10004 ]

Hide

Permalink

Perry Gee added a comment - 01/Mar/15 12:07 AM

Oh, sorry. Here is the diff.

include/lsst/meas/extensions/shapeHSM/HsmMomentsControl.h | 124 ++++++++++++++++++++++++++++++++++++++++++++--------
include/lsst/meas/extensions/shapeHSM/HsmShapeControl.h | 155 +++++++++++++++++++++++++++++++++++++++++++++++++++-------------
python/lsst/meas/extensions/shapeHSM/_init_.py | 20 ++++++---
python/lsst/meas/extensions/shapeHSM/hsmLib.i | 14 +++++-
src/HsmMoments.cc | 144 +++++++++++-------------------------------------------------
src/HsmShape.cc | 182 ++++++++++++++++++++++------------------------------------------------------
tests/testHsm.py | 137 ++++++++++++++++++++++++++++++++-------------------------
ups/meas_extensions_shapeHSM.cfg | 2 +-
ups/meas_extensions_shapeHSM.table | 1 +

Show

Perry Gee added a comment - 01/Mar/15 12:07 AM Oh, sorry. Here is the diff. include/lsst/meas/extensions/shapeHSM/HsmMomentsControl.h | 124 ++++++++++++++++++++++++++++++++++++++++++++-------- include/lsst/meas/extensions/shapeHSM/HsmShapeControl.h | 155 +++++++++++++++++++++++++++++++++++++++++++++++++++------------- python/lsst/meas/extensions/shapeHSM/_ init _.py | 20 ++++++--- python/lsst/meas/extensions/shapeHSM/hsmLib.i | 14 +++++- src/HsmMoments.cc | 144 +++++++++++------------------------------------------------- src/HsmShape.cc | 182 ++++++++++++++++++++++------------------------------------------------------ tests/testHsm.py | 137 ++++++++++++++++++++++++++++++++------------------------- ups/meas_extensions_shapeHSM.cfg | 2 +- ups/meas_extensions_shapeHSM.table | 1 +

Hide

Permalink

Perry Gee added a comment - 01/Mar/15 8:18 AM

Just added whitespace and copyright cleanup on a separate commit

Show

Perry Gee added a comment - 01/Mar/15 8:18 AM Just added whitespace and copyright cleanup on a separate commit

Hide

Permalink

Perry Gee added a comment - 01/Mar/15 8:34 AM

two additional cleanups of the same type, and and accidental line deletion in previous commit of testHsm.py.

Show

Perry Gee added a comment - 01/Mar/15 8:34 AM two additional cleanups of the same type, and and accidental line deletion in previous commit of testHsm.py.

Hide

Permalink

Jim Bosch added a comment - 01/Mar/15 1:59 PM

Review complete. No major concerns, but lots of little cleanup comments on the PR.

Show

Jim Bosch added a comment - 01/Mar/15 1:59 PM Review complete. No major concerns, but lots of little cleanup comments on the PR.

Jim Bosch made changes - 01/Mar/15 1:59 PM

Status

In Review [ 10004 ]

Reviewed [ 10101 ]

Perry Gee made changes - 01/Mar/15 9:39 PM

Resolution		Done [ 10000 ]
Status	Reviewed [ 10101 ]	Done [ 10002 ]

Frossie Economou made changes - 05/Mar/15 12:40 AM

Team

Measurement Framework [ 10205 ]

Data Release Production [ 10301 ]

People

Assignee:: Perry Gee

Reporter:: Jim Bosch

Reviewers:: Jim Bosch

Watchers:: Jim Bosch, Perry Gee

Votes:: 0 Vote for this issue

Watchers:: 2 Start watching this issue

Dates

Created:: 18/Jul/14 1:49 PM

Updated:: 05/Mar/15 12:40 AM

Resolved:: 01/Mar/15 9:39 PM

Jenkins

No builds found.

Data Management

Details

Description

Attachments

Issue Links

Activity

People

Dates

Jenkins