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-17195: Fix missing INST-PA message for y-band data. #174

Merged
merged 1 commit into from
Jan 15, 2019
Merged

DM-17195: Fix missing INST-PA message for y-band data. #174

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 11 additions & 8 deletions python/lsst/obs/subaru/strayLight/rotatorAngle.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@

import numpy as np
from astropy.io import fits
import lsst.geom

# fixed parameters
ltt_d = 19.82556 # dome latitude in degree
Expand Down Expand Up @@ -232,13 +233,13 @@ def _minorArc(angle1, angle2):
return angle1, angle2


def inrStartEnd(header):
def inrStartEnd(visitInfo):
"""Calculate instrument rotator angle for start and end of exposure

Parameters
----------
header : `lsst.daf.base.PropertySet`
FITS header for exposure to correct
visitInfo : `lsst.afw.image.VisitInfo`
Visit info for the exposure to calculate correction.

Returns
-------
Expand All @@ -248,12 +249,14 @@ def inrStartEnd(header):
Instrument rotator angle at end of exposure, degrees.
"""

inst_pa = header.getDouble('INST-PA')
ra_t_d = header.getDouble('CRVAL1')
de_t_d = header.getDouble('CRVAL2')
inst_pa = 270.0 - visitInfo.getBoresightRotAngle().asAngularUnits(lsst.geom.degrees)
czwa marked this conversation as resolved.
Show resolved Hide resolved
ra_t_sp, de_t_sp = visitInfo.getBoresightRaDec()
czwa marked this conversation as resolved.
Show resolved Hide resolved

mjd_str = header.getDouble('MJD-STR')
mjd_end = header.getDouble('MJD-END')
ra_t_d = ra_t_sp.asAngularUnits(lsst.geom.degrees)
de_t_d = de_t_sp.asAngularUnits(lsst.geom.degrees)

mjd_str = visitInfo.getDate().get() - 0.5*visitInfo.getExposureTime()/86400.0
mjd_end = visitInfo.getDate().get() + 0.5*visitInfo.getExposureTime()/86400.0

inr_d = 0.00

Expand Down
2 changes: 1 addition & 1 deletion python/lsst/obs/subaru/strayLight/yStrayLight.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ def run(self, exposure, filename=None):
return

if self.config.doRotatorAngleCorrection:
angleStart, angleEnd = inrStartEnd(exposureMetadata)
angleStart, angleEnd = inrStartEnd(exposure.getInfo().getVisitInfo())
self.log.debug(
"(INR-STR, INR-END) = ({:g}, {:g}) (FITS header says ({:g}, {:g})).".format(
angleStart, angleEnd,
Expand Down