Fix and cleanup WFC3 package 2/2

HST/HST.yaml

@@ -1,18 +1,18 @@
-### HST TELESCOPE
-object : telescope
-alias : TEL
-name : HST
-description : The Hubble Space Telescope common optics
+object: telescope
+alias: TEL
+name: HST
+description: The Hubble Space Telescope common optics
 
-properties :
-    temperature : 15
+properties:
+  temperature: 15
+  telescope: HST
 
-effects :
--   name : scope_surface_list
-    description : list of HST surfaces
-    class : SurfaceList
-    kwargs :
-        filename : LIST_mirrors_HST.tbl
+effects:
+  - name: scope_surface_list
+    description: list of HST surfaces
+    class: SurfaceList
+    kwargs:
+      filename: LIST_mirrors_HST.tbl
 
 ---
 alias: ATMO

WFC3/WFC3_IR.yaml

@@ -1,27 +1,33 @@
-###
-object : instrument
-alias : INST
-name : WFC3
-description : base configuration for WFC3
+object: instrument
+alias: INST
+name: WFC3
+description: base configuration for WFC3
 
-properties :
-    temperature : -49
-    pixel_scale: 0.13         # arcsec / pixel
-    plate_scale: 13           # arcsec / mm
+properties:
+  temperature: -49
+  pixel_scale: 0.13  # arcsec / pixel
+  plate_scale: 13    # arcsec / mm
 
-effects :
--   name: wfc3_ir_channel_surfaces
-    description : surfaces list for the IR channel
+effects:
+  - name: wfc3_ir_channel_surfaces
+    description: surfaces list for the IR channel
     class: SurfaceList
     kwargs:
-        filename: LIST_WFC3_mirrors_IR.dat
+      filename: LIST_WFC3_mirrors_IR.dat
 
--   name: wfc3_ir_filter
-    description : transmission curve for filter
+  - name: wfc3_ir_filter
+    description: transmission curve for filter
+    # TODO: Replace with proper FilterWheel effect
     class: FilterCurve
     kwargs:
-        filter_name: "!OBS.filter_name"
-        filename_format: "TER_filter_{}.dat"
-        minimum_throughput: 1.e-4
-        outer: 0.1
-        outer_unit: "m"
+      filter_name: "!OBS.filter_name"
+      filename_format: "filters/TER_filter_{}.dat"
+      minimum_throughput: 1.e-4
+      outer: 0.1
+      outer_unit: "m"
+
+  - name: psf
+    class: FieldVaryingPSF
+    kwargs:
+      filename: "PSF_WFC3_IR_FV.fits"
+      wave_key: "WAVELENG"

WFC3/WFC3_IR_DET.yaml

@@ -1,67 +1,72 @@
-### WFC3 IR DETECTOR
-object : detector
-alias : DET
-name : wfc3_ir_detector_array
-description : A single 1014x1014 HgCdTe detector
+object: detector
+alias: DET
+name: wfc3_ir_detector_array
+description: A single 1014x1014 HgCdTe detector
 source: "https://hst-docs.stsci.edu/display/WFC3IHB/5.7+IR+Detector+Characteristics+and+Performance"
 
 properties:
-    image_plane_id: 0
-    temperature: -85
-    dit: "!OBS.dit"
-    ndit: "!OBS.ndit"
+  image_plane_id: 0
+  temperature: -85
+  dit: "!OBS.dit"
+  ndit: "!OBS.ndit"
 
 effects:
-    - name: WFC3_IR_Detector
-      class: DetectorList
-      include: True
-      kwargs:
-        array_dict: {id: [1], pixsize: [0.01], angle: [0.], gain: [1.0],
-                     x_cen: [0], y_cen: [0], xhw: [5.12], yhw: [5.12]}
-        x_cen_unit: mm
-        y_cen_unit: mm
-        xhw_unit: mm
-        yhw_unit: mm
-        pixsize_unit: mm
-        angle_unit: deg
-        gain_unit: electron/adu
+  - name: WFC3_IR_Detector
+    class: DetectorList
+    include: True
+    kwargs:
+      array_dict:
+        id: [1]
+        pixsize: [0.01]
+        angle: [0.]
+        gain: [1.0]
+        x_cen: [0]
+        y_cen: [0]
+        xhw: [5.12]
+        yhw: [5.12]
+      x_cen_unit: mm
+      y_cen_unit: mm
+      xhw_unit: mm
+      yhw_unit: mm
+      pixsize_unit: mm
+      angle_unit: deg
+      gain_unit: electron/adu
 
-    - name: qe_curve
-      description: Quantum efficiency curve
-      class: QuantumEfficiencyCurve
-      kwargs:
-        filename: wfc3_ir_qe_003_syn.dat
+  - name: qe_curve
+    description: Quantum efficiency curve
+    class: QuantumEfficiencyCurve
+    kwargs:
+      filename: wfc3_ir_qe_003_syn.dat
 
-    - name: exposure_integration
-      description: Summing up sky signal for all DITs and NDITs
-      class: ExposureIntegration
+  - name: exposure_integration
+    description: Summing up sky signal for all DITs and NDITs
+    class: ExposureIntegration
 
-    - name: detector_border
-      decription: blacks out the pixels at the edge of the detector
-      class: ReferencePixelBorder
-      kwargs:
-        width: 5
-        edges: ["all"]
+  - name: detector_border
+    decription: blacks out the pixels at the edge of the detector
+    class: ReferencePixelBorder
+    kwargs:
+      border: [5, 5, 5, 5]
 
-    - name: dark_current
-      description: WFC3-IR dark current
-      class: DarkCurrent
-      # [e-/s] level of dark current for each detector
-      kwargs:
-        value: 0.048
+  - name: dark_current
+    description: WFC3-IR dark current
+    class: DarkCurrent
+    # [e-/s] level of dark current for each detector
+    kwargs:
+      value: 0.048
 
-    - name: detector_linearity
-      description : Linearity characteristics of H4RG chips
-      class: LinearityCurve
-      kwargs:
-          filename : FPA_linearity.dat
+  - name: detector_linearity
+    description: Linearity characteristics of H4RG chips
+    class: LinearityCurve
+    kwargs:
+      filename: FPA_linearity.dat
 
-    - name: shot_noise
-      description : apply poisson shot noise to images
-      class: ShotNoise
+  - name: shot_noise
+    description: apply poisson shot noise to images
+    class: ShotNoise
 
-    - name : readout_noise
-      description : Readout noise frames
-      class : BasicReadoutNoise
-      kwargs :
-          noise_std : 12      # as high as 20 for a single read cycle
+  - name: readout_noise
+    description: Readout noise frames
+    class: BasicReadoutNoise
+    kwargs:
+      noise_std: 12  # as high as 20 for a single read cycle

WFC3/default.yaml

@@ -3,54 +3,64 @@
 # all spectral curves found on the stsynphot site
 # https://stsynphot.readthedocs.io/en/latest/stsynphot/data_hst.html
 
-object : configuration
-alias : OBS
-name : HST_WFC3_default_config
-description : defatult configuration for HST WFC3 UVIS and NIR imaging
+object: configuration
+alias: OBS
+name: HST_WFC3_default_config
+description: defatult configuration for HST WFC3 UVIS and NIR imaging
 status: experimental
+needs_scopesim: "v0.11.2a2"
+date_modified: 2025-12-05
+changes:
+  - 2019-11-20 (KL) initial version
+  - 2020-04-22 (KL) harmonize modes format
+  - 2024-11-19 (FH) add package status keyword
+  - 2025-12-05 (FH) clean up yaml
 
 packages:
-- HST
-- WFC3
+  - HST
+  - WFC3
 
 yamls:
-- HST.yaml
-- WFC3.yaml
-
-mode_yamls:
--   name: IR_channel
-    description: The NIR imaging channel
-    yamls:
-    - WFC3_IR.yaml
-    - WFC3_IR_DET.yaml
-
--   name: UVIS_channel
-    description: The UV and Visual imaging channel
-    yamls:
-    - WFC3_UVIS.yaml
-    - WFC3_UVIS_DET.yaml
+  - HST.yaml
+  - WFC3.yaml
 
 properties:
   instrument: WFC3
   modes: [IR_channel]
-  filter_name: F160W
+  filter_name: F160W  # default needed by effect
   dit: 60
   ndit: 1
 
+mode_yamls:
+  - object: observation
+    alias: OBS
+    name: IR_channel
+    description: The NIR imaging channel
+    status: experimental
+    yamls:
+      - WFC3_IR.yaml
+      - WFC3_IR_DET.yaml
 
----
+  - object: observation
+    alias: OBS
+    name: UVIS_channel
+    description: The UV and Visual imaging channel
+    status: concept
+    yamls:
+      - WFC3_UVIS.yaml
+      - WFC3_UVIS_DET.yaml
 
-# default simulation parameters
-object : simulation
-alias : SIM
-name : WFC3_simulation_paramters
-description : RC simulation paramters which need to change for a WFC3
+---
+object: simulation
+alias: SIM
+name: WFC3_simulation_paramters
+description: RC simulation paramters which need to change for a WFC3
 
-properties :
-  random :
-    seed : 9001
+properties:
+  random:
+    seed: 9001
 
-  spectral :
-    wave_min : 0.8
-    wave_mid : 1.3
-    wave_max : 1.8
+  spectral:
+    wave_min: 0.8
+    wave_mid: 1.3
+    wave_max: 1.8