DM-25156: During 2to3 conversion ask Instrument for the curated calibrations #291
Conversation
python/lsst/obs/base/_instrument.py
Outdated
| # Do not check the data packages for calibrations for now. | ||
| # Camera is a special dataset type that is also handled as a | ||
| # curated calibration. | ||
| return set(("camera",) + cls.standardCuratedDatasetTypes + cls.additionalCuratedDatasetTypes) |
There was a problem hiding this comment.
Why does camera not belong in standardCuratedDatasetTypes? Special-casing something like this seems like it could cause bugs later.
If the point is that these are the curated calibrations only for conversion purposes, but not for others, then the method/property name should reflect that.
There was a problem hiding this comment.
because "standard" means "calibration data found in obs_x_data package following the standard organization". At some point versioned camera geometry will turn up in that form and when it does we will include it in the standard list. If you look at writeCuratedCalbrations you will see it does standard curated, additional curated, and camera as distinct operations.
There was a problem hiding this comment.
As for the name, I am wanting the list of names returned here to match the list of dataset types that writeCuratedCalibrations will be writing.
There was a problem hiding this comment.
Ok, it was not at all clear that "standard organization of obs_*_data" was the distinction being made. I assume this is what "standard definitions" meant in the docstring?
If that's the key difference, then consider rewording the description of additionalCuratedDatasetTypes from "Curated dataset types specific to this particular instrument." to "Curated dataset types that do not follow the standard organization defined in obs_base." I think that would make it a bit clearer what is and is not proper usage of these two variables.
This required that the code to locate standard curated calibrations be moved into a class method.
|
I tweaked the logic a little bit to only return the calibrations understood by the instrument (so defects is not in the list if defects aren't defined in a standard way for that instrument (of course a subclass can declare them as "additional" curated calibrations). |
Do not use the config file since the instrument already knows which calibrations it will curate.