Skip to content
Merged
Show file tree
Hide file tree
Changes from 3 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
12 changes: 12 additions & 0 deletions METIS/METIS_DET_IFU.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,11 @@ properties:
file_name: "QE_detector_H2RG_METIS.dat"
linearity:
file_name: "FPA_linearity_HxRG.dat"
border:
1: [32, 0, 32, 64]
2: [32, 64, 32, 0]
3: [32, 64, 32, 0]
4: [32, 0, 32, 64]

effects:
- name: detector_array_list
Expand All @@ -52,6 +57,13 @@ effects:
kwargs:
fill_frac: "!OBS.auto_exposure.fill_frac"

- name: reference_pixel_mask
description: Mask for reference pixels
class: ReferencePixelBorder
include: True
kwargs:
border: "!DET.border"

- name: exposure_integration
description: Summing up sky signal for all DITs and NDITs
class: ExposureIntegration
Expand Down
8 changes: 8 additions & 0 deletions METIS/METIS_DET_IMG_LM.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ properties:
file_name: "QE_detector_H2RG_METIS.dat"
linearity:
file_name: "FPA_linearity_HxRG.dat"
border: [64, 64, 64, 64]

effects:
- name: detector_array
Expand Down Expand Up @@ -70,6 +71,13 @@ effects:
full_well: "!DET.full_well"
mindit: "!DET.mindit"

- name: reference_pixel_mask
description: Mask for reference pixels
class: ReferencePixelBorder
include: True
kwargs:
border: "!DET.border"

- name: exposure_integration
description: Summing up sky signal for all DITs and NDITs
class: ExposureIntegration
Expand Down
8 changes: 8 additions & 0 deletions METIS/METIS_DET_IMG_N_GeoSnap.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ properties:
temperature: -240
dit: "!OBS.dit"
ndit: "!OBS.ndit"
border: [28, 28, 28, 28]
layout:
file_name: "FPA_metis_img_n_geosnap_layout.dat"
qe_curve:
Expand Down Expand Up @@ -74,6 +75,13 @@ effects:
full_well: "!DET.full_well"
mindit: "!DET.mindit"

- name: reference_pixel_mask
description: Mask for reference pixels
class: ReferencePixelBorder
include: True
kwargs:
border: "!DET.border"

- name: exposure_integration
description: Summing up sky signal for all DITs and NDITs
class: ExposureIntegration
Expand Down
46 changes: 25 additions & 21 deletions METIS/headers/FITS_det_ifu_keywords.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
HIERARCH:
ESO:
DET3:
DIT: "!OBS.dit"
DIT: ["!OBS.dit", "[s]"]
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That just ... works? Nice!

NDIT: "!OBS.ndit"
CUBE:
MODE: false
Expand All @@ -16,11 +16,12 @@
DET3:
CHIP:
ID: "!DET.detector"
MINDIT: "!DET.mindit"
FULLWELL: "!DET.full_well"
RON: "!DET.readout_noise"
DARK: "!DET.dark_current"
GAIN: "!DET.gain.1"
MINDIT: ["!DET.mindit", "[s]"]
FULLWELL: ["!DET.full_well", "[e]"]
RON: ["!DET.readout_noise", "[e] per CDS readout"]
DARK: ["!DET.dark_current", "[e/s]"]
GAIN: ["!DET.gain.1", "[e/ADU]"]
REFPIX: ["!DET.border.1", "b l t r"]

- ext_number: [2]
keywords:
Expand All @@ -30,11 +31,12 @@
DET3:
CHIP:
ID: "!DET.detector"
MINDIT: "!DET.mindit"
FULLWELL: "!DET.full_well"
RON: "!DET.readout_noise"
DARK: "!DET.dark_current"
GAIN: "!DET.gain.2"
MINDIT: ["!DET.mindit", "[s]"]
FULLWELL: ["!DET.full_well", "[e]"]
RON: ["!DET.readout_noise", "[e] per CDS readout"]
DARK: ["!DET.dark_current", "[e/s]"]
GAIN: ["!DET.gain.2", "[e/ADU]"]
REFPIX: ["!DET.border.2", "b l t r"]

- ext_number: [3]
keywords:
Expand All @@ -44,11 +46,12 @@
DET3:
CHIP:
ID: "!DET.detector"
MINDIT: "!DET.mindit"
FULLWELL: "!DET.full_well"
RON: "!DET.readout_noise"
DARK: "!DET.dark_current"
GAIN: "!DET.gain.3"
MINDIT: ["!DET.mindit", "[s]"]
FULLWELL: ["!DET.full_well", "[e]"]
RON: ["!DET.readout_noise", "[e] per CDS readout"]
DARK: ["!DET.dark_current", "[e/s]"]
GAIN: ["!DET.gain.3", "[e/ADU]"]
REFPIX: ["!DET.border.3", "b l t r"]

- ext_number: [4]
keywords:
Expand All @@ -58,8 +61,9 @@
DET3:
CHIP:
ID: "!DET.detector"
MINDIT: "!DET.mindit"
FULLWELL: "!DET.full_well"
RON: "!DET.readout_noise"
DARK: "!DET.dark_current"
GAIN: "!DET.gain.4"
MINDIT: ["!DET.mindit", "[s]"]
FULLWELL: ["!DET.full_well", "[e]"]
RON: ["!DET.readout_noise", "[e] per CDS readout"]
DARK: ["!DET.dark_current", "[e/s]"]
GAIN: ["!DET.gain.4", "[e/ADU]"]
REFPIX: ["!DET.border.4", "b l t r"]
15 changes: 8 additions & 7 deletions METIS/headers/FITS_det_lm_keywords.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
HIERARCH:
ESO:
DET1:
DIT: "!OBS.dit"
DIT: ["!OBS.dit", "[s]"]
NDIT: "!OBS.ndit"
MODE: "!DET.mode"
CUBE:
Expand All @@ -17,9 +17,10 @@
DET1:
CHIP:
ID: "!DET.detector"
MODE: "!DET.mode"
MINDIT: "!DET.mindit"
FULLWELL: "!DET.full_well"
RON: "!DET.readout_noise"
DARK: "!DET.dark_current"
GAIN: "!DET.gain"
MODE: ["!DET.mode", "Readout mode"]
MINDIT: ["!DET.mindit", "[s]"]
FULLWELL: ["!DET.full_well", "[e]"]
RON: ["!DET.readout_noise", "[e] per CDS readout"]
DARK: ["!DET.dark_current", "[e/s]"]
GAIN: ["!DET.gain", "[e/ADU]"]
REFPIX: ["#reference_pixel_mask.border", "b l t r"]
15 changes: 8 additions & 7 deletions METIS/headers/FITS_det_n_keywords.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
HIERARCH:
ESO:
DET2:
DIT: "!OBS.dit"
DIT: ["!OBS.dit", "[s]"]
NDIT: "!OBS.ndit"
MODE: "!DET.mode"
CUBE:
Expand All @@ -22,9 +22,10 @@
DET2:
CHIP:
ID: "!DET.detector"
MODE: "!DET.mode"
MINDIT: "!DET.mindit"
FULLWELL: "!DET.full_well"
RON: "!DET.readout_noise"
DARK: "!DET.dark_current"
GAIN: "!DET.gain"
MODE: ["!DET.mode", "Readout mode"]
MINDIT: ["!DET.mindit", "[s]"]
FULLWELL: ["!DET.full_well", "[e]"]
RON: ["!DET.readout_noise", "[e] per CDS readout"]
DARK: ["!DET.dark_current", "[e/s]"]
GAIN: ["!DET.gain", "[e/ADU]"]
REFPIX: ["#reference_pixel_mask.border", "b l t r"]
2 changes: 2 additions & 0 deletions METIS/tests/test_readout_exptime.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ def test_readout_exptime():
# The first readout might ignore the exptime.
metis_l = sim.OpticalTrain(cmd_l)
metis_l["exposure_output"].set_mode("sum")
metis_l["reference_pixel_mask"].include = False
metis_l.observe(star, update=True)
result_first = metis_l.readout(exptime=0.1)[0]
# We need to copy the first readeout, because
Expand All @@ -45,6 +46,7 @@ def test_readout_exptime():
# The second readout might not properly have the detector reset.
metis_l = sim.OpticalTrain(cmd_l)
metis_l["exposure_output"].set_mode("sum")
metis_l["reference_pixel_mask"].include = False
metis_l.observe(star, update=True)
result_temp = metis_l.readout(exptime=.1)[0]
result_temp_copy = copy.deepcopy(result_temp)
Expand Down