DM-430: Modify measurement framework to log plugins error in individual logs #83
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
rearmstr
commented
Apr 21, 2017
include/lsst/meas/base/PsfFlux.h
Outdated
| @@ -78,7 +78,8 @@ class PsfFluxAlgorithm : public SimpleAlgorithm { | |||
| /// The control object contains the configuration parameters for this algorithm. | |||
| typedef PsfFluxControl Control; | |||
|
|
|||
| PsfFluxAlgorithm(Control const & ctrl, std::string const & name, afw::table::Schema & schema); | |||
| PsfFluxAlgorithm(Control const & ctrl, std::string const & name, afw::table::Schema & schema, | |||
| std::string const & logName = ""); | |||
There was a problem hiding this comment.
indentation should match the beginning of the parentheses.
rearmstr
commented
Apr 21, 2017
python/lsst/meas/base/algorithm.cc
Outdated
|
|
||
| /* Members */ | ||
| python::declareAlgorithm<SingleFrameAlgorithm>(clsSingleFrameAlgorithm); | ||
|
|
||
| clsSimpleAlgorithm.def("measureForced", &SimpleAlgorithm::measureForced, | ||
| "measRecord"_a, "exposure"_a, "refRecord"_a, "refWcs"_a); | ||
| clsSimpleAlgorithm.def("getLogName", &SimpleAlgorithm::getLogName); |
There was a problem hiding this comment.
Shouldn't this be a method of BaseAlgorithm?
rearmstr
commented
Apr 21, 2017
python/lsst/meas/base/wrappers.py
Outdated
| @@ -119,8 +125,7 @@ def wrapAlgorithm(Base, AlgClass, factory, executionOrder, name=None, Control=No | |||
| If apCorrList is non-empty then shouldApCorr is ignored. | |||
| If non-empty and doRegister is True then the names are added to the set | |||
| retrieved by getApCorrNameSet | |||
|
|
|||
|
|
|||
| @param[in] hasLogName Plugin supports a logName as a constructor argument | |||
There was a problem hiding this comment.
Removed extra blank line. Not sure what the standard is, but should be in a separate commit.
rearmstr
commented
Apr 21, 2017
python/lsst/meas/base/wrappers.py
Outdated
| if hasattr(ctrl, "makeControl"): | ||
| ctrl = ctrl.makeControl() | ||
| # logNmae signature needs to be on this Class __init__, but is not needed by the C++ plugin |
There was a problem hiding this comment.
logNmae -> logName
rearmstr
commented
Apr 21, 2017
tests/testPluginLogs.py
Outdated
| class RegisteredPluginsTestCase(AlgorithmTestCase, lsst.utils.tests.TestCase): | ||
| """ | ||
| Test all the registered Plugins to see if their logName is set as expected. | ||
| Those which have the hasLogName=True attribute will have a LogName parameter |
There was a problem hiding this comment.
extra space after "True"
pgee2000
force-pushed
the
tickets/DM-430
branch
3 times, most recently
from
ba59644
to
28dfd1d
Compare
…al logs Logs named for the taskName + pluginName (e.g., measurement.base_PsfFlux) Name is set by the task, but the name is pushed down to the plugin. if the plugin class has "hasLogName = True" and an optional "logName" parameter in its initialization. If both are so, plugin.getLogName() wil return the name of the log. if lsst.log.Log logs are identified by name, not by the logger itself, so the logName is enough. C++ routines can use the BaseAlgorithm function getLogName to get the right log. Log Measurement Errors, which were not previously logged. Checkin seg fault problem with pybind methods on BaseAlgorithm Add py:multiple_inheritance to SimpleAlgorithm wrapper.
|
I responded by fixing all the comments on the pull request as per Bob Armstrong's comment. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.