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.

Sign up for GitHub

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

Jump to bottom

DM-17837: Fix typo in RTM-004_S20 detector serial #79

Merged
merged 6 commits into from
Feb 13, 2019
Merged

DM-17837: Fix typo in RTM-004_S20 detector serial #79

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d43246e
Fix typo in RTM-004_S20 detector serial
timj Feb 11, 2019
ff355dc
Raise an exception if the detector serial is not found
timj Feb 11, 2019
6d59346
Remove f-string from TS8 instrument name definition
timj Feb 11, 2019
003e9d2
Remove MONOWL special case from TS8 ingest
timj Feb 12, 2019
acb25aa
Update TS8 CONTNUM list
timj Feb 11, 2019
2b2e4b5
Improve error message if policy file is missing
timj Feb 13, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 0 additions & 3 deletions config/ts8/ingest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,6 @@

config.parse.retarget(Ts8ParseTask)

# what used to be config.parse.translation = {
config.parse.translation['wavelength'] = 'MONOWL'

# what used to be config.parse.translators = {
del config.parse.translators['snap']
config.parse.translators['dayObs'] = 'translate_dayObs'
Expand Down
2 changes: 1 addition & 1 deletion policy/ts8/RTM-004.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ RTM-004 :
S10 : ITL-3800C-346
S11 : ITL-3800C-062
S12 : ITL-3800C-371
S20 : ITL-3800C-285
S20 : ITL-3800C-385
S21 : ITL-3800C-424
S22 : ITL-3800C-247

Expand Down
9 changes: 6 additions & 3 deletions python/lsst/obs/lsst/translators/lsst.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,12 @@ def read_detector_ids(policyFile):
"""

file = os.path.join(obs_lsst_packageDir, policyFile)
with open(file) as fh:
# Use the fast parser since these files are large
camera = yaml.load(fh, Loader=yaml.CLoader)
try:
with open(file) as fh:
# Use the fast parser since these files are large
camera = yaml.load(fh, Loader=yaml.CLoader)
except OSError as e:
raise ValueError(f"Could not load camera policy file {file}") from e

mapping = {}
for ccd, value in camera["CCDs"].items():
Expand Down
3 changes: 2 additions & 1 deletion python/lsst/obs/lsst/translators/lsstsim.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,8 @@ def compute_detector_info_from_serial(cls, detector_serial):
if detector_serial in serial_mapping:
info = serial_mapping[detector_serial]
else:
log.warning(f"Unable to determine detector information from detector serial {detector_serial}")
raise RuntimeError("Unable to determine detector information from detector serial"
f" {detector_serial}")

return info

Expand Down
12 changes: 10 additions & 2 deletions python/lsst/obs/lsst/translators/ts8.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,15 @@ def can_translate(cls, header, filename=None):
return True

if "LSST_NUM" in header and "REBNAME" in header and \
"CONTNUM" in header and header["CONTNUM"] == "000018910e0c":
"CONTNUM" in header and \
header["CONTNUM"] in ("000018910e0c", "000018ee33b7", "000018ee0f35", "000018ee3b40",
"00001891fcc7", "000018edfd65", "0000123b5ba8", "000018911b05",
"00001891fa3e", "000018910d7f", "000018ed9f12", "000018edf4a7",
"000018ee34e6", "000018ef1464", "000018eda120", "000018edf8a2",
"000018ef3819", "000018ed9486", "000018ee02c8", "000018edfb24",
"000018ee34c0", "000018edfb51", "0000123b51d1", "0000123b5862",
"0000123b8ca9", "0000189208fa", "0000189111af", "0000189126e1",
"000018ee0618", "000018ee3b78", "000018ef1534"):
return True

return False
Expand Down Expand Up @@ -143,7 +151,7 @@ def to_instrument(self):
instrume : `str`
Name of the test stand.
"""
return f"LSST-TS8"
return "LSST-TS8"

@cache_translation
def to_datetime_begin(self):
Expand Down