AstarVienna · teutoburg · Aug 22, 2024 · Sep 17, 2024 · Oct 28, 2024 · Mar 16, 2025
diff --git a/ELT/ELT.yaml b/ELT/ELT.yaml
@@ -21,6 +21,13 @@ effects :
     kwargs :
       filename : LIST_ELT_combined.tbl
 
+  - name : telescope_fits_keywords
+    description : FITS keywords specific to the telescope
+    class : ExtraFitsKeywords
+    include : True
+    kwargs :
+      filename: FITS_telescope_keywords.yaml
+
 #  - name : scope_vibration
 #    description : residual vibration of telescope
 #    class : Vibration

diff --git a/ELT/FITS_telescope_keywords.yaml b/ELT/FITS_telescope_keywords.yaml
@@ -0,0 +1,11 @@
+- ext_type: PrimaryHDU
+  keywords:
+    HIERARCH:
+      WISE:
+        TEL:
+          NAME: "ELT"
+          TELESCOP: "ELT"
+          TER:
+            FILENAME: "!TEL.ter_curve.filename"
+          REF:
+            FILENAME: "#telescope_reflection.filename"
diff --git a/METIS/METIS.yaml b/METIS/METIS.yaml
@@ -57,12 +57,19 @@ effects:
       minimum_throughput: !!float 0.
 
   - name : common_fits_keywords
-    decription : FITS keywords common to all modes
+    description : FITS keywords common to all modes
     class : ExtraFitsKeywords
     include : True
     kwargs :
       filename: headers/FITS_common_keywords.yaml
 
+  - name: cfo_fits_keywords
+    description: FITS keywords to CFO elements
+    class: ExtraFitsKeywords
+    include: True
+    kwargs:
+      filename: headers/FITS_cfo_keywords.yaml
+
 #  - name : metis_adc_residuals
 #    class : AtmosphericDispersionCorrection
 #    include : False

diff --git a/METIS/METIS_DET_IFU.yaml b/METIS/METIS_DET_IFU.yaml
@@ -7,6 +7,7 @@ description: A set of 4 H2RG detectors
 date_modified: 2021-12-16
 changes:
   - 2021-12-16 (OC) some rearrangements
+  - 2024-10-11 (OC) add ADConversion, gain from B.Serra (2024-10-09)
 
 properties:
   image_plane_id: 0
@@ -15,6 +16,11 @@ properties:
   ndit: "!OBS.ndit"
   mindit: 1.3               # seconds, Roy van Boekel, pers. communication
   full_well: !!float 1.E5   # electrons, E-TNT-MPIA-1004, v1-0
+  gain:
+    1: 2.0            # electrons/ADU, email B.Serra 2024-10-09
+    2: 2.0
+    3: 2.0
+    4: 2.0
   dark_current: 0.1         # [e-/s]
   readout_noise: 70         # electrons, AI on RvB: check
   layout:
@@ -72,8 +78,16 @@ effects:
       noise_std: "!DET.readout_noise"
       n_channels: 32
 
-  - name: quantization
-    description: Turn photon count into integers
-    class: Quantization
+  - name: ad_conversion
+    description: Apply gain and convert electron count into integers
+    class: ADConversion
     kwargs:
       dtype: uint16
+      gain: "!DET.gain"
+
+  - name: det_ifu_fits_keywords
+    descriptions: FITS keywords specific to IFU detectors
+    class: ExtraFitsKeywords
+    include: True
+    kwargs:
+      filename: headers/FITS_det_ifu_keywords.yaml
diff --git a/METIS/METIS_DET_IMG_LM.yaml b/METIS/METIS_DET_IMG_LM.yaml
@@ -10,6 +10,8 @@ changes:
   - 2022-01-25 (KL, OC) added DetectorModePropertiesSetter effect
   - 2022-01-26 (OC) added DET.detector
   - 2022-02-21 (OC) rename effects
+  - 2024-10-11 (OC) rename quantization to ADConversion, gain values
+                    from email by B.Serra (2024-10-09)
 
 properties:
   detector:  HAWAII2RG
@@ -40,12 +42,14 @@ effects:
           description: "HAWAII2RG, fast mode"
           "!DET.mindit": 0.04
           "!DET.full_well": !!float 1e5
+          "!DET.gain": 4.0     # e/ADU (email B.Serra)
           "!DET.readout_noise": 70
           "!DET.dark_current": 0.05
         slow:
           description: "HAWAII2RG, slow mode"
           "!DET.mindit": 1.3
           "!DET.full_well": !!float 1e5
+          "!DET.gain":  2.5    # e/ADU (email B.Serra)
           "!DET.readout_noise": 15
           "!DET.dark_current": 0.05
 
@@ -91,8 +95,16 @@ effects:
       noise_std: "!DET.readout_noise"
       n_channels: 32
 
-  - name: quantization
-    description: Turn photon count into integers
-    class: Quantization
+  - name: ad_conversion
+    description: Apply gain and convert electron counts into integers
+    class: ADConversion
     kwargs:
       dtype: uint16
+      gain: "!DET.gain"
+
+  - name: det_lm_fits_keywords
+    descriptions: FITS keywords specific to LM detector
+    class: ExtraFitsKeywords
+    include: True
+    kwargs:
+      filename: headers/FITS_det_lm_keywords.yaml
diff --git a/METIS/METIS_DET_IMG_N_Aquarius.yaml b/METIS/METIS_DET_IMG_N_Aquarius.yaml
@@ -20,6 +20,7 @@ properties:
   full_well: !!float 1.e6  # electrons, low-capacity mode
   dark_current: 13         # [e-/s] E-REP-NOVA-MET-1191, v2-0
   readout_noise: 12
+  gain: 15    # wild guess to make full_well fit into int16
   layout:
     file_name: "FPA_metis_img_nq_aquarius_layout.dat"
   qe_curve:
@@ -100,8 +101,9 @@ effects:
       nod_offsets: "!OBS.nod_offsets"
       pixel_scale: "!INST.pixel_scale"
 
-  - name: quantization
-    description: Turn photon count into integers
-    class: Quantization
+  - name: ad_conversion
+    description: Apply gain and convert electron count into integers
+    class: ADConversion
     kwargs:
       dtype: uint16
+      gain: "!DET.gain"
diff --git a/METIS/METIS_DET_IMG_N_GeoSnap.yaml b/METIS/METIS_DET_IMG_N_GeoSnap.yaml
@@ -10,6 +10,10 @@ changes:
   - 2022-01-25 (KL, OC) added DetectorModePropertiesSetter effect
   - 2022-01-26 (OC) added DET.detector, linearity set explicitely
   - 2022-02-21 (OC) rename effects
+  - 2024-08-22 (OC) rename quantization to ADConversion, add gain
+                    from Bowens2024 for high-capacity and a guess
+                    for low-capacity
+  - 2024-10-11 (OC) gain values from email by B.Serra (2024-10-09)
 
 properties:
   detector: Teledyne GeoSnap
@@ -38,6 +42,7 @@ effects:
           description:               "Geosnap, high-capacity mode"
           "!DET.mindit":             0.011          # seconds
           "!DET.full_well":          !!float 2.8e6  # electrons
+          "!DET.gain":               201            # electron/ADU (email B.Serra)
           "!DET.readout_noise":      300            # electrons (DCS)
           "!DET.dark_current":       !!float 1e5    # electrons/second
           "!DET.linearity.incident": [0, !!float 2.8e6, !!float 1e99]
@@ -46,6 +51,7 @@ effects:
           description:               "Geosnap, low-capacity mode"
           "!DET.mindit":             0.011          # seconds
           "!DET.full_well":          !!float 1.8e5  # electrons
+          "!DET.gain":               14             # electron/ADU (email B.Serra)
           "!DET.readout_noise":      35             # electrons (DCS)
           "!DET.dark_current":       !!float 1e5    # electrons/second
           "!DET.linearity.incident": [0, !!float 1.8e5, !!float 1e99]
@@ -103,8 +109,16 @@ effects:
       nod_offsets: "!OBS.nod_offsets"
       pixel_scale: "!INST.pixel_scale"
 
-  - name: quantization
-    description: Turn photon count into integers
-    class: Quantization
+  - name: ad_conversion
+    description: Apply gain and convert electron count into integers
+    class: ADConversion
     kwargs:
       dtype: uint16
+      gain: "!DET.gain"
+
+  - name: det_n_fits_keywords
+    descriptions: FITS keywords specific to N detector
+    class: ExtraFitsKeywords
+    include: True
+    kwargs:
+      filename: headers/FITS_det_n_keywords.yaml
diff --git a/METIS/METIS_IMG_LM.yaml b/METIS/METIS_IMG_LM.yaml
@@ -12,6 +12,7 @@ changes:
   - 2022-01-12 (OC) change default bkg_width to -1
   - 2022-02-17 (OC) increase spectral_bin_width for imaging
   - 2022-02-21 (OC) renamed effects
+  - 2025-04-16 (OC) add ExtraFitsKeywords
 
 properties:
   pixel_scale: 0.00547         # arcsec / pixel, METIS_1097
@@ -81,6 +82,13 @@ effects:
       wave_key: "WAVELENG"
       bkg_width: -1
 
+  - name: img_lm_fits_keywords
+    descriptions: FITS keywords specific to IMG-LM
+    class: ExtraFitsKeywords
+    include: True
+    kwargs:
+      filename: headers/FITS_img_lm_keywords.yaml
+
 ---
 ### default simulation parameters needed for a METIS simulation
 object: simulation

diff --git a/METIS/METIS_IMG_N.yaml b/METIS/METIS_IMG_N.yaml
@@ -75,6 +75,14 @@ effects:
       wave_key: "WAVELENG"
       bkg_width: -1
 
+  - name: img_n_fits_keywords
+    descriptions: FITS keywords specific to IMG-N
+    class: ExtraFitsKeywords
+    include: True
+    kwargs:
+      filename: headers/FITS_img_n_keywords.yaml
+
+
 ---
 ### default simulation parameters needed for a METIS simulation
 object: simulation

diff --git a/METIS/METIS_LMS.yaml b/METIS/METIS_LMS.yaml
@@ -56,7 +56,12 @@ effects:
       col_number_start: 1
       slice_samples: 5    # number of samples along slice width
 
-
+  - name: lms_fits_keywords
+    description: FITS keywords specific to LMS elements
+    class: ExtraFitsKeywords
+    include: True
+    kwargs:
+      filename: headers/FITS_lms_keywords.yaml
 
 ---
 ### default simulation parameters needed for a METIS simulation

diff --git a/METIS/METIS_LSS.yaml b/METIS/METIS_LSS.yaml
@@ -34,6 +34,13 @@ effects:
       s_colname: "xi"
       col_number_start: 1
 
+  - name: lss_fits_keywords
+    descriptions: FITS keywords specific to LSS
+    class: ExtraFitsKeywords
+    include: True
+    kwargs:
+      filename: headers/FITS_lss_keywords.yaml
+
 ---
 ### default simulation parameters needed for a METIS simulation
 object: simulation

diff --git a/METIS/METIS_WCU.yaml b/METIS/METIS_WCU.yaml
@@ -38,6 +38,12 @@ effects:
         transmissions: [0.6098, 0.6312, 0.5879, 0.6073, 0.5795, 0.7342, 0.7509, 0.7429, 0.6170, 0.4362, 0.4476, 0.6098, 0.6312, 0.6076, 0.8201]
       current_mask: "open"
 
+  - name: wcu_fits_keywords
+    description: FITS keywords specific to the WCU
+    class: ExtraFitsKeywords
+    include: True
+    kwargs:
+      filename: headers/FITS_wcu_keywords.yaml
 ---
 # Required parameters to replace telescope
 alias: TEL