Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pyreduce/clipnflip.py
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ def clipnflip(
transpose = (
transpose
if transpose is not None
else header.get("e_transpose", (orientation % 8) >= 4)
else header.get("e_transp", header.get("e_transpose", (orientation % 8) >= 4))
)
if transpose:
timage = np.transpose(timage, axes=(-1, -2))
Expand Down
2 changes: 1 addition & 1 deletion pyreduce/combine_frames.py
Original file line number Diff line number Diff line change
Expand Up @@ -352,7 +352,7 @@ def combine_frames(
# orient 0, 2, 5, 7: orders are horizontal
# orient 1, 3, 4, 6: orders are vertical
orientation = head.get("e_orient", 0)
transpose = head.get("e_transpose", False)
transpose = head.get('e_transp', head.get('e_transpose', False))
orientation = orientation % 8
# check if non-linearity correction
linear = head.get("e_linear", True)
Expand Down
8 changes: 4 additions & 4 deletions pyreduce/instruments/common.py
Original file line number Diff line number Diff line change
Expand Up @@ -265,9 +265,9 @@ def add_header_info(self, header, mode, **kwargs):
info = self.info
get = getter(header, info, mode)

header["e_instrument"] = get("instrument", self.__class__.__name__)
header["e_telescope"] = get("telescope", "")
header["e_exptime"] = get("exposure_time", 0)
header["e_instru"] = get("instrument", self.__class__.__name__)
header["e_telesc"] = get("telescope", "")
header["e_exptim"] = get("exposure_time", 0)

jd = get("date")
if jd is not None:
Expand All @@ -277,7 +277,7 @@ def add_header_info(self, header, mode, **kwargs):
header["e_orient"] = get("orientation", 0)
# As per IDL rotate if orient is 4 or larger and transpose is undefined
# the image is transposed
header["e_transpose"] = get("transpose", (header["e_orient"] % 8 >= 4))
header["e_transp"] = get("transpose", (header["e_orient"] % 8 >= 4))

naxis_x = get("naxis_x", 0)
naxis_y = get("naxis_y", 0)
Expand Down
2 changes: 1 addition & 1 deletion pyreduce/instruments/mcdonald.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ def add_header_info(self, header, mode, **kwargs):
header["e_orient"] = get("orientation", 0)
# As per IDL rotate if orient is 4 or larger and transpose is undefined
# the image is transposed
header["e_transpose"] = get("transpose", (header["e_orient"] % 8 >= 4))
header["e_transp"] = get("transpose", (header["e_orient"] % 8 >= 4))

trimsec = get("trimsec")

Expand Down
2 changes: 1 addition & 1 deletion pyreduce/instruments/nte.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ def add_header_info(self, header, mode, **kwargs):

header["e_ra"] /= 15
if header["e_jd"] is not None:
header["e_jd"] += header["e_exptime"] / (7200 * 24) + 0.5
header["e_jd"] += header["e_exptim"] / (7200 * 24) + 0.5

return header

Expand Down
2 changes: 1 addition & 1 deletion pyreduce/instruments/uves.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ def add_header_info(self, header, mode, **kwargs):

header["e_ra"] /= 15
if header["e_jd"] is not None:
header["e_jd"] += header["e_exptime"] / (7200 * 24) + 0.5
header["e_jd"] += header["e_exptim"] / (7200 * 24) + 0.5

return header

Expand Down
4 changes: 2 additions & 2 deletions pyreduce/instruments/xshooter.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,12 @@ def add_header_info(self, header, mode, **kwargs):
header = super().add_header_info(header, mode)

header["e_backg"] = (
header["e_readn"] + header["e_exptime"] * header["e_drk"] / 3600
header["e_readn"] + header["e_exptim"] * header["e_drk"] / 3600
)

header["e_ra"] /= 15
if header["e_jd"] is not None:
header["e_jd"] += header["e_exptime"] / 2 / 3600 / 24 + 0.5
header["e_jd"] += header["e_exptim"] / 2 / 3600 / 24 + 0.5

return header

Expand Down
2 changes: 1 addition & 1 deletion test/test_clipnflip.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ def header(image):
header["e_xlo"], header["e_xhi"] = 0, image.shape[1]
header["e_ylo"], header["e_yhi"] = 0, image.shape[0]
header["e_orient"] = 0
header["e_transpose"] = False
header["e_transp"] = False
return header


Expand Down
2 changes: 1 addition & 1 deletion test/test_instruments.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ def test_get_instrument_info(supported_instrument):

def test_modeinfo(supported_instrument, supported_modes):
# Standard FITS header keywords
required_keywords = ["e_instrument", "e_telescope", "e_exptime", "e_jd"]
required_keywords = ["e_instru", "e_telesc", "e_exptim", "e_jd"]
# PyReduce keywords
required_keywords += [
"e_xlo",
Expand Down