Skip to content
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.

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

Review of DM-4373 (HSC backport: Add tract conveniences) #27

Merged
merged 6 commits into from Dec 5, 2015

Conversation

jdswinbank
Copy link
Contributor

No description provided.

@@ -3,6 +3,7 @@ setupRequired(pipe_base)
setupRequired(daf_base)
setupRequired(pex_config)
setupRequired(coadd_utils)
setupOptional(geom)
Copy link
Member

Choose a reason for hiding this comment

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

I'm a bit confused as to how this can be an optional dependency if there is an unprotected import in the code above.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Required?

Copy link
Contributor

Choose a reason for hiding this comment

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

Sorry, I blindly followed the HSC entry (which I guess should have been Required). Amended.

PaulPrice and others added 4 commits December 4, 2015 12:46
We want to iterate over all tracts spanned by the data when no
tract is provided (the user doesn't want to have to look up
what tracts are spanned).  This patch determines the set of
tracts each visit touches and adds a data reference with those
tracts for each of the visit components.  This was originally
implemented for meas_mosaic, but moved here to be of more
general use, and applied to forcedPhotCcd.

Conflicts:
	python/lsst/pipe/tasks/forcedPhotCcd.py

This is effectively a cherry-pick of HSC-715's commit:
HyperSuprime-Cam/pipe_tasks@d0e5a1a
Conflicts:
	python/lsst/pipe/tasks/forcedPhotCcd.py

This is effectively a cherry-pick of HSC-715's commit:
HyperSuprime-Cam/pipe_tasks@eb1ca20
Modify PerTractCcdDataIdContainerto inherit from lsst.pipe.base.DataIdContainer
instead of CoaddDataIdContainer.  Inheriting from the latter was confusing as
it pertains to Coadds and this method pertains to Ccds.  Additionally, the only
functionality it was gaining was the setting and memoising of the skymap via
the getSkymap() function.  The memoizing was in fact also being done in the
function itself, so simply set the skymap explicitly there (thus omiting the
need to call getSkymap() and its inheritance from from CoaddDataIdContainer).
The override version of castDataIds() was implemented to add the
tract/int idKey/idKeyType to the idKeyTypeDict.  However, this is
not necessary as this entry exists in the latter regardless of
whether the user supplies the tract in the data id on the command
line.
continue

visit = ref.dataId["visit"]
visitRefs = collections.defaultdict(list)
Copy link
Contributor Author

Choose a reason for hiding this comment

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

This looks wrong: every time around the loop you're replacing whatever visitRefs used to refer to with a new, empty defaultdict. You probably want to move this line outside the loop, replacing line 71.

Includes:
- update copyright
- whitespace
- make use of defaultdict
- remove conditional setting of lsst.pex.logging for clarity
- update help message in argument parser
Currently, forcedPhotCcd.py is the only place where the
PerTractCcdDataIdContainer is being used, so it seems appropriate
just to include it there (as opposed to having in its own file).
The only other place currently planned to make use of it is in
meas_mosaic, which is not yet implemented.  If a more suitable
location for this container becomes apparent (e.g. in the process
of getting meas_mosaic running with the stack), it can be moved
accordingly then.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
4 participants