Tickets/dm 8232 #89
Tickets/dm 8232 #89
Conversation
| @param[in] refObjLoader An instance of LoadReferenceObjectsTasks that supplies an | ||
| external reference catalog. May be None if the desired loader can be constructed | ||
| from the butler argument or all steps requiring a reference catalog are disabled. | ||
| @param[in] charRefObjLoader An instance of LoadReferenceObjectsTasks that supplies an |
There was a problem hiding this comment.
charImage only uses this for selecting PSF stars, if a catalog star selector is used. It's probably worth making that clear in this docstring. Also maybe charRefObjLoader should be psfRefObjLoader?
There was a problem hiding this comment.
O.K. updated docstring.
| @@ -121,11 +120,11 @@ class CharacterizeImageConfig(pexConfig.Config): | |||
| target = LoadAstrometryNetObjectsTask, | |||
| doc = "reference object loader", | |||
| ) | |||
| astrometry = pexConfig.ConfigurableField( | |||
| target = AstrometryTask, | |||
| calib = pexConfig.ConfigurableField( | |||
There was a problem hiding this comment.
calib is confusing here because it's not doing any calibration. refObjMatcher maybe?
There was a problem hiding this comment.
Changed to ref_match
| if self.config.doAstrometry: | ||
| if astromRefObjLoader is None: | ||
| self.makeSubtask('astromRefObjLoader', butler=butler) | ||
| refObjLoader = self.astromRefObjLoader | ||
| self.pixelMargin = refObjLoader.config.pixelMargin | ||
| self.makeSubtask("astrometry", refObjLoader=refObjLoader, schema=self.schema) |
There was a problem hiding this comment.
Doesn't this need to be refObjLoader=self.astromRefObjLoader instead of refObjLoader=refObjLoader? If astromRefObjLoader is not None, the refObjLoader variable would not get set. It would be nice to get rid of the refObjLoader variable entirely.
There was a problem hiding this comment.
Good catch. I'll look into how to fix this.
There was a problem hiding this comment.
I couldn't find an immediate way around the intermediate variable. I just changed refObjLoader -> astromRefObjLoader.
| self.makeSubtask('photoRefObjLoader', butler=butler) | ||
| refObjLoader = self.photoRefObjLoader | ||
| self.pixelMargin = refObjLoader.config.pixelMargin | ||
| self.makeSubtask("photoCal", refObjLoader=refObjLoader, schema=self.schema) |
There was a problem hiding this comment.
Changed refObjLoader -> photoRefObjLoader
SimonKrughoff
force-pushed
the
tickets/DM-8232
branch
from
80fae86
to
1a8b0af
Compare
This allows different catalogs for astrometry and photometry. This requires a few steps: 1. Pull out the matching code from AstrometryTask so that PhotoCal can use it as well. 2. Rework the two calibration tasks to inherit from that base class. 3. Modify the top level tasks to take multiple configurable ref object loaders.
No description provided.