DM-39346: Fixes for LSSTCam and TS8 filter definitions #454
Conversation
include GENERIC_FILTER_DEFINITIONS in __all__ ensure 'empty' isn't prepended for CCOB filter combinations when FILTER keyword is null include LsstCamFiltersGeneric in imSim filter defs
…y string filter keyword values
| @@ -46,7 +46,7 @@ DARKTIME: 15.165 | |||
| TSEQNUM: 18 | |||
| FPVERS: '1.1.8-SNAPSHOT' | |||
| IHVERS: '1.0.36' | |||
| FILTER: '' | |||
| FILTER: null | |||
There was a problem hiding this comment.
How were these yaml files created? astrometadata dump does correctly put null if the keyword value is undefined. Is this specific file using an empty string? In which case it needs to stay an empty string and the physical filter code needs to use is_key_ok() which checks for truth and so handles empty string and undefined.
There was a problem hiding this comment.
I just used astropy.io.fits and enclosed keyword values that are returned as strings in single quotes. I wasn't aware of astrometadata dump. When I was debugging, is_key_ok() was definitely returning false for that FILTER keyword when run on current TS8 data.
There was a problem hiding this comment.
Okay. astrometadata dump exists precisely to make my life easier when generating these YAML files.
Isn't False what you wanted for is_key_ok() for empty string and undefined?
There was a problem hiding this comment.
In this context, it's what I want, since TS8 is writing those keywords with null values. I would prefer not have to deal with an empty string, however, where currently is_key_ok() seems to return True.
| Returns "unknown" if no filter is declared. | ||
| """ | ||
| joined = super().to_physical_filter() | ||
| while joined.endswith("~empty"): |
There was a problem hiding this comment.
I think this will work:
return re.sub("(~empty)+$", "", joined)There was a problem hiding this comment.
I'll leave this for now. I suspect this code may need to be revisited once LSSTCam data taking starts up again, so I'll fix it then.
There was a problem hiding this comment.
People don't like regexps for some reason... 😉
|
TS8 doesn't currently produce filter keyword combinations that result in physical_filter values that have the trailing |
Also added test code to check header examples against filter definitions for each instrument.