Skip to content
Merged
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: 2 additions & 0 deletions ZShooter_v2/ZShooter_ALTDETECT.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -46,3 +46,5 @@ properties:
dark_k: 0.006388888888888889 # 23 e/hour/pixel
excess_noise_factor_k: 1.0
avalanche_gain_k: 1
x_size_k: 2048
y_size_k: 2048
50 changes: 50 additions & 0 deletions ZShooter_v2/ZShooter_ALTDETECT4k.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
# Alternative detector engineering package; optical prescription is unchanged.
object: detector
alias: DET
name: zshooter_alternative_detectors_4k
properties:
detector_mode: SPEC_ALTDETECT4K
detector_type_b: CCD
ron_b: 2.5
dark_b: 0.0005555555555555556 # 2 e/hour/pixel
qe_class_b: SpectralQuantumEfficiency
qe_kwargs_b:
filename: detector_specs/ccd_uv_enhanced_TER.dat
detector_type_g: CCD
ron_g: 2.5
dark_g: 0.0005555555555555556 # 2 e/hour/pixel
qe_class_g: SpectralQuantumEfficiency
qe_kwargs_g:
filename: detector_specs/ccd_ml_uv_enhanced_TER.dat
detector_type_r: CCD
ron_r: 2.5
dark_r: 0.0005555555555555556 # 2 e/hour/pixel
qe_class_r: SpectralQuantumEfficiency
qe_kwargs_r:
filename: detector_specs/ccd_ml2_uv_enhanced_hirho_TER.dat
detector_type_yj: H2RG
pixel_size_yj: 0.018
pixel_scale_yj: 0.1884654 # Same 10.4703 arcsec/mm camera plate scale
usable_well_yj: 60000
ron_yj: 6.0
dark_yj: 0.006388888888888889 # 23 e/hour/pixel
excess_noise_factor_yj: 1.0
avalanche_gain_yj: 1
detector_type_h: H2RG
pixel_size_h: 0.018
pixel_scale_h: 0.1884654 # Same 10.4703 arcsec/mm camera plate scale
usable_well_h: 60000
ron_h: 6.0
dark_h: 0.006388888888888889 # 23 e/hour/pixel
excess_noise_factor_h: 1.0
avalanche_gain_h: 1
detector_type_k: H4RG
pixel_size_k: 0.010
pixel_scale_k: 0.104703 # Same 10.4703 arcsec/mm camera plate scale
usable_well_k: 60000
ron_k: 6.0
dark_k: 0.006388888888888889 # 23 e/hour/pixel
excess_noise_factor_k: 1.0
avalanche_gain_k: 1
x_size_k: 4096
y_size_k: 4096
8 changes: 5 additions & 3 deletions ZShooter_v2/ZShooter_DET.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,8 @@ properties :
plate_scale_yj: 10.4703
plate_scale_h: 10.4703
plate_scale_k: 10.4703
x_size_k: 2048
y_size_k: 2048
# tapered_qe_example:
# enabled: False
# description: >
Expand Down Expand Up @@ -320,7 +322,7 @@ effects :
detector: "!DET.detector_type_h"

- name: detector_k
description: Single 2k x 2k detector for ZShooter_v2 K arm
description: Single detector for ZShooter_v2 K arm
include: True
class: DetectorList
kwargs:
Expand All @@ -331,8 +333,8 @@ effects :
id: [5]
x_cen: [0.0]
y_cen: [0.0]
x_size: [2048]
y_size: [2048]
x_size: ["!DET.x_size_k"]
y_size: ["!DET.y_size_k"]
pixel_size: ['!DET.pixel_size_k']
angle: [0.0]
gain: [1.0]
Expand Down
82 changes: 82 additions & 0 deletions ZShooter_v2/ZShooter_IMAGER.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
object: instrument
alias: INST
name: ZIMAGE
description: Effects from the ZIMAGE optics

properties:
imager_filter_v: g

# There are 3 image planes in ZIMAGE: 3 filters. We use the DichroicTree effect to establish the branching
# in the beginning of the flow, using image_plane_id as the identifying key. Though physically there may be other
# optical elements in between dichroics, here all dichroics are considered together in a tree. Other effects that
# act selectively on different arms can be orchestrated using SelectorWheel effects.

effects:
- name: preoptics
class: SurfaceList
include: True
kwargs:
filename: "optics/LIST_zimage_common_optics.dat"

- name: dichroic_tree
class: DichroicTree
include: True
kwargs:
z_order: [117, 217, 517]
tree_filename: "dichroics/zimage_dichroic_tree.dat"
dichroic_names:
- u-vz # First dichroic, splits beam into u and red
- v-z # Next dichroic, splits z band light
filename_format: "dichroics/TER_dichroic_{}.dat"

- name: channel_optics_selector
description: ZIMAGE channel optics
class: SelectorWheel
include: True
kwargs:
z_order: [220, 520]
selector_key: "image_plane_id"
wheel:
- selector_value: [0]
effect_class: SurfaceList
effect_kwargs:
filename: "optics/LIST_zimage_u_optics.dat"

- selector_value: [1]
effect_class: SurfaceList
effect_kwargs:
filename: "optics/LIST_zimage_v_optics.dat"

- selector_value: [2]
effect_class: SurfaceList
effect_kwargs:
filename: "optics/LIST_zimage_z_optics.dat"

- name: filter_wheel_selector
description: ZIMAGE v-channel filter wheel
class: SelectorWheel
include: True
kwargs:
z_order: [224, 524]
selector_key: "image_plane_id"
allowed_missing_selector_values: [0, 2]
wheel:
- selector_value: [1]
effect_class: FilterWheel
effect_kwargs:
filter_names: [g, r, i]
filename_format: "filters/sloan_{}.dat"
current_filter: "!INST.imager_filter_v"

- name: detector_qe_selector
description: ZIMAGE detector quantum efficiency
class: SelectorWheel
include: True
kwargs:
z_order: [513]
selector_key: "image_plane_id"
wheel:
- selector_value: [0, 1, 2]
effect_class: QuantumEfficiencyCurve
effect_kwargs:
filename: "detector_specs/quest2_TER.dat"
Loading