Skip to content

Commit 160d77d

Browse files
oczoskeoczoske
authored
Oc/subsystem fits keywords (#229)
2 parents 1a109e0 + 4034814 commit 160d77d

19 files changed

+277
-6
lines changed

‎METIS/METIS.yaml‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,12 +57,19 @@ effects:
5757
minimum_throughput: !!float 0.
5858

5959
- name : common_fits_keywords
60-
decription : FITS keywords common to all modes
60+
description : FITS keywords common to all modes
6161
class : ExtraFitsKeywords
6262
include : True
6363
kwargs :
6464
filename: headers/FITS_common_keywords.yaml
6565

66+
- name: cfo_fits_keywords
67+
description: FITS keywords to CFO elements
68+
class: ExtraFitsKeywords
69+
include: True
70+
kwargs:
71+
filename: headers/FITS_cfo_keywords.yaml
72+
6673
# - name : metis_adc_residuals
6774
# class : AtmosphericDispersionCorrection
6875
# include : False

‎METIS/METIS_DET_IFU.yaml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,3 +84,10 @@ effects:
8484
kwargs:
8585
dtype: uint16
8686
gain: "!DET.gain"
87+
88+
- name: det_ifu_fits_keywords
89+
descriptions: FITS keywords specific to IFU detectors
90+
class: ExtraFitsKeywords
91+
include: True
92+
kwargs:
93+
filename: headers/FITS_det_ifu_keywords.yaml

‎METIS/METIS_DET_IMG_LM.yaml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,3 +101,10 @@ effects:
101101
kwargs:
102102
dtype: uint16
103103
gain: "!DET.gain"
104+
105+
- name: det_lm_fits_keywords
106+
descriptions: FITS keywords specific to LM detector
107+
class: ExtraFitsKeywords
108+
include: True
109+
kwargs:
110+
filename: headers/FITS_det_lm_keywords.yaml

‎METIS/METIS_DET_IMG_N_GeoSnap.yaml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,3 +115,10 @@ effects:
115115
kwargs:
116116
dtype: uint16
117117
gain: "!DET.gain"
118+
119+
- name: det_n_fits_keywords
120+
descriptions: FITS keywords specific to N detector
121+
class: ExtraFitsKeywords
122+
include: True
123+
kwargs:
124+
filename: headers/FITS_det_n_keywords.yaml

‎METIS/METIS_IMG_LM.yaml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ changes:
1212
- 2022-01-12 (OC) change default bkg_width to -1
1313
- 2022-02-17 (OC) increase spectral_bin_width for imaging
1414
- 2022-02-21 (OC) renamed effects
15+
- 2025-04-16 (OC) add ExtraFitsKeywords
1516

1617
properties:
1718
pixel_scale: 0.00547 # arcsec / pixel, METIS_1097
@@ -81,6 +82,13 @@ effects:
8182
wave_key: "WAVELENG"
8283
bkg_width: -1
8384

85+
- name: img_lm_fits_keywords
86+
descriptions: FITS keywords specific to IMG-LM
87+
class: ExtraFitsKeywords
88+
include: True
89+
kwargs:
90+
filename: headers/FITS_img_lm_keywords.yaml
91+
8492
---
8593
### default simulation parameters needed for a METIS simulation
8694
object: simulation

‎METIS/METIS_IMG_N.yaml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,14 @@ effects:
7575
wave_key: "WAVELENG"
7676
bkg_width: -1
7777

78+
- name: img_n_fits_keywords
79+
descriptions: FITS keywords specific to IMG-N
80+
class: ExtraFitsKeywords
81+
include: True
82+
kwargs:
83+
filename: headers/FITS_img_n_keywords.yaml
84+
85+
7886
---
7987
### default simulation parameters needed for a METIS simulation
8088
object: simulation

‎METIS/METIS_LMS.yaml‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,12 @@ effects:
5656
col_number_start: 1
5757
slice_samples: 5 # number of samples along slice width
5858

59-
59+
- name: lms_fits_keywords
60+
description: FITS keywords specific to LMS elements
61+
class: ExtraFitsKeywords
62+
include: True
63+
kwargs:
64+
filename: headers/FITS_lms_keywords.yaml
6065

6166
---
6267
### default simulation parameters needed for a METIS simulation

‎METIS/METIS_LSS.yaml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,13 @@ effects:
3434
s_colname: "xi"
3535
col_number_start: 1
3636

37+
- name: lss_fits_keywords
38+
descriptions: FITS keywords specific to LSS
39+
class: ExtraFitsKeywords
40+
include: True
41+
kwargs:
42+
filename: headers/FITS_lss_keywords.yaml
43+
3744
---
3845
### default simulation parameters needed for a METIS simulation
3946
object: simulation

‎METIS/default.yaml‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ mode_yamls:
7474
- METIS_IMG_LM.yaml
7575
- METIS_DET_IMG_LM.yaml
7676
properties:
77+
ins_mode: IMG_LM # use as FITS header keyword
7778
psf_file: PSF_SCAO_9mag_06seeing.fits
7879
filter_name: Lp
7980
nd_filter_name: open
@@ -93,6 +94,7 @@ mode_yamls:
9394
- METIS_IMG_N.yaml
9495
- METIS_DET_IMG_N_GeoSnap.yaml
9596
properties:
97+
ins_mode: IMG_N # use as FITS header keyword
9698
psf_file: PSF_SCAO_9mag_06seeing.fits
9799
filter_name: N2
98100
nd_filter_name: open
@@ -115,11 +117,14 @@ mode_yamls:
115117
- METIS_LSS.yaml
116118
- METIS_DET_IMG_LM.yaml
117119
properties:
120+
ins_mode: LSS_L # use as FITS header keyword
118121
psf_file: PSF_LM_9mag_06seeing.fits
119122
trace_file: TRACE_LSS_L.fits
120123
efficiency_file: TER_grating_L.fits
121124
slit: C-38_1
122125
adc: const_90
126+
grism_opti9: GRISM_L
127+
grism_opti12: open
123128
filter_name: L_spec
124129
nd_filter_name: open
125130
detector_readout_mode: slow
@@ -137,11 +142,14 @@ mode_yamls:
137142
- METIS_LSS.yaml
138143
- METIS_DET_IMG_LM.yaml
139144
properties:
145+
ins_mode: IMG_M # use as FITS header keyword
140146
psf_file: PSF_LM_9mag_06seeing.fits
141147
trace_file: TRACE_LSS_M.fits
142148
efficiency_file: TER_grating_M.fits
143149
slit: C-38_1
144150
adc: const_90
151+
grism_opti9: GRISM_M
152+
grism_opti12: open
145153
filter_name: M_spec
146154
nd_filter_name: open
147155
detector_readout_mode: slow
@@ -159,13 +167,18 @@ mode_yamls:
159167
- METIS_LSS.yaml
160168
- METIS_DET_IMG_N_GeoSnap.yaml
161169
properties:
170+
ins_mode: IMG_N # use as FITS header keyword
162171
psf_file: PSF_N_9mag_06seeing.fits
163172
trace_file: TRACE_LSS_N.fits
164173
efficiency_file: TER_grating_N.fits
165174
slit: D-57_1
166175
adc: false
176+
grism_opti9: open
177+
grism_opti12: GRISM_N
167178
filter_name: N_spec
168179
nd_filter_name: open
180+
chop_offsets: [3, 0] # perpendicular chopping and nodding
181+
nod_offsets: [0, 3]
169182
detector_readout_mode: low_capacity
170183

171184
- object: observation
@@ -180,6 +193,7 @@ mode_yamls:
180193
- METIS_LMS.yaml
181194
- METIS_DET_IFU.yaml
182195
properties:
196+
ins_mode: LMS # use as FITS header keyword
183197
psf_file: PSF_LM_9mag_06seeing.fits
184198
slit: false
185199
adc: false
@@ -199,6 +213,7 @@ mode_yamls:
199213
- METIS_LMS_EXT.yaml
200214
- METIS_DET_IFU.yaml
201215
properties:
216+
ins_mode: LMS # use as FITS header keyword
202217
slit: false
203218
adc: false
204219
detector_readout_mode: slow
@@ -213,6 +228,7 @@ mode_yamls:
213228
- METIS_IMG_LM.yaml
214229
- METIS_DET_IMG_LM.yaml
215230
properties:
231+
ins_mode: IMG_LM # use as FITS header keyword
216232
psf_file: PSF_SCAO_9mag_06seeing.fits # REPLACE!
217233
filter_name: Lp
218234
nd_filter_name: open
@@ -230,6 +246,7 @@ mode_yamls:
230246
- METIS_IMG_N.yaml
231247
- METIS_DET_IMG_N_GeoSnap.yaml
232248
properties:
249+
ins_mode: IMG_N # use as FITS header keyword
233250
psf_file: PSF_SCAO_9mag_06seeing.fits # REPLACE!
234251
filter_name: N2
235252
nd_filter_name: open
@@ -250,11 +267,14 @@ mode_yamls:
250267
- METIS_LSS.yaml
251268
- METIS_DET_IMG_LM.yaml
252269
properties:
270+
ins_mode: LSS_L # use as FITS header keyword
253271
psf_file: PSF_LM_9mag_06seeing.fits # REPLACE!
254272
trace_file: TRACE_LSS_L.fits
255273
efficiency_file: TER_grating_L.fits
256274
slit: C-38_1
257275
adc: const_90
276+
grism_opti9: GRISM_L
277+
grism_opti12: open
258278
filter_name: L_spec
259279
nd_filter_name: open
260280
detector_readout_mode: slow
@@ -270,11 +290,14 @@ mode_yamls:
270290
- METIS_LSS.yaml
271291
- METIS_DET_IMG_LM.yaml
272292
properties:
293+
ins_mode: LSS_M # use as FITS header keyword
273294
psf_file: PSF_LM_9mag_06seeing.fits # REPLACE!
274295
trace_file: TRACE_LSS_M.fits
275296
efficiency_file: TER_grating_M.fits
276297
slit: C-38_1
277298
adc: const_90
299+
grism_opti9: GRISM_M
300+
grism_opti12: open
278301
filter_name: M_spec
279302
nd_filter_name: open
280303
detector_readout_mode: slow
@@ -290,13 +313,18 @@ mode_yamls:
290313
- METIS_LSS.yaml
291314
- METIS_DET_IMG_N_GeoSnap.yaml
292315
properties:
316+
ins_mode: LSS_N # use as FITS header keyword
293317
psf_file: PSF_N_9mag_06seeing.fits # REPLACE!
294318
trace_file: TRACE_LSS_N.fits
295319
efficiency_file: TER_grating_N.fits
296320
slit: D-57_1
297321
adc: false
322+
grism_opti9: open
323+
grism_opti12: GRISM_N
298324
filter_name: N_spec
299325
nd_filter_name: open
326+
chop_offsets: [3, 0] # perpendicular chopping and nodding
327+
nod_offsets: [0, 3]
300328
detector_readout_mode: low_capacity
301329

302330
- object: observation
@@ -309,6 +337,7 @@ mode_yamls:
309337
- METIS_LMS.yaml
310338
- METIS_DET_IFU.yaml
311339
properties:
340+
ins_mode: LMS # use as FITS header keyword
312341
psf_file: PSF_LM_9mag_06seeing.fits # REPLACE!
313342
slit: false
314343
adc: false
@@ -326,6 +355,7 @@ mode_yamls:
326355
- METIS_LMS_EXT.yaml
327356
- METIS_DET_IFU.yaml
328357
properties:
358+
ins_mode: LMS # use as FITS header keyword
329359
slit: false
330360
adc: false
331361
detector_readout_mode: slow

‎METIS/headers/FITS_cfo_keywords.yaml‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
- ext_type: PrimaryHDU
2+
keywords:
3+
4+
HIERARCH:
5+
ESO:
6+
INS:
7+
OPTI1: # CFO PP1 mask wheel
8+
# TODO: There are no names yet. We use the
9+
# transmission, which is returned as an
10+
# inconvenient list.
11+
DESC: "CFO PP1 mask wheel"
12+
NAME: "#cold_stop.transmission!"
13+
OPTI2: # CFO PP1 ADC wheel
14+
DESC: "ADC wheel"
15+
NAME: "#adc_wheel.current_adc!"
16+
OPTI3: # CFO FP2 mask/slit wheel
17+
DESC: "Slit wheel"
18+
NAME: "#slit_wheel.current_slit!"

0 commit comments

Comments
 (0)