Skip to content

Move slit to MICADO.yaml; general spec mode #308

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
oczoske wants to merge 4 commits into
base: dev_master
Choose a base branch
from
Draft

Move slit to MICADO.yaml; general spec mode #308

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a079304
Move slit to MICADO.yaml; general spec mode
oczoske Feb 3, 2026
b383a76
initialise OBS.slit to false for imaging
oczoske Feb 3, 2026
fd21630
Offset slits
oczoske Feb 3, 2026
cc3fd9a
dark adjusted; sub_pixel True; minor changes
oczoske Feb 4, 2026
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
21 changes: 21 additions & 0 deletions MICADO/MASK_slit_15000x20_offset.dat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
# description : Slit mask for the offset long slit (15 arcsec x 20 mas)
# author : Kieran Leschinski, Oliver Czoske
# source : ELT-TRE-MCD-56300-0014_3.0
# date_created : 2026-02-03
# date_modified : 2026-02-03
# status : FDR design
# type : aperture:slit_geometry
# x_unit : arcsec
# y_unit : arcsec
# changes :
# - 2019-07-10 (KL) Created the file
# - 2020-03-24 (KL) Changed geometry to 15000x50mas
# - 2023-07-13 (OC) Changed geometry to 15000x20mas
# - 2023-07-24 (OC) Position in x corrected
# - 2026-02-03 (OC) Initialised from MASK_slit_15000x20.dat
#
x y
-5.0 1.190
10.0 1.190
10.0 1.210
-5.0 1.210
20 changes: 20 additions & 0 deletions MICADO/MASK_slit_3000x16_offset.dat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# description : Slit mask for the offset short, narrow slit (3 arcsec x 16 mas)
# author : Kieran Leschinski, Oliver Czoske
# source : ELT-TRE-MCD-56300-0014_3.0
# date_created : 2026-02-03
# date_modified : 2026-02-03
# status : FDR design
# type : aperture:slit_geometry
# x_unit : arcsec
# y_unit : arcsec
# changes :
# - 2019-07-10 (KL) Created the file
# - 2020-03-24 (KL) Changed geometry to 3000x20mas
# - 2023-07-13 (OC) Changed geometry to 3000x16mas
# - 2026-02-03 (OC) Initialised from MASK_slit_3000x16.dat
#
x y
-1.5 1.192
1.5 1.192
1.5 1.208
-1.5 1.208
20 changes: 20 additions & 0 deletions MICADO/MASK_slit_3000x48_offset.dat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# description : Slit mask for the offset short, wide slit (3 arcsec x 48 mas)
# author : Kieran Leschinski, Oliver Czoske
# source : ELT-TRE-MCD-56300-0014_3.0
# date_created : 2026-02-03
# date_modified : 2026-02-03
# status : FDR design
# type : aperture:slit_geometry
# x_unit : arcsec
# y_unit : arcsec
# changes :
# - 2019-07-10 (KL) Created the file
# - 2020-03-24 (KL) Changed geometry to 3000x50mas
# - 2023-07-13 (OC) Changed geometry to 3000x48mas
# - 2026-02-03 (OC) Initialised from MASK_slit_3000x48.dat
#
x y
-1.5 1.176
1.5 1.176
1.5 1.224
-1.5 1.224
16 changes: 16 additions & 0 deletions MICADO/MICADO.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,22 @@ effects:
pixel_scale : "!INST.pixel_scale"
filename : "INST_MICADO_wavefront_error_budget.dat"


- name: slit_wheel
description: collection of field masks and slits
class: SlitWheel
kwargs:
slit_names:
- 3000x16
- 3000x16_offset
- 3000x48
- 3000x48_offset
- 15000x20
- 15000x20_offset
filename_format: MASK_slit_{}.dat
current_slit: "!OBS.slit"
include: "!OBS.slit"

- name: filter_wheel_1
description: upper filter wheel
class: FilterWheel
Expand Down
3 changes: 2 additions & 1 deletion MICADO/MICADO_H4RG.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ effects:
class: DarkCurrent
# [e-/s] level of dark current for each detector
kwargs:
value: 0.1
value: 0.01 # ELT-TRE-MCD-56300-0173_1-4

- name: shot_noise
description: apply poisson shot noise to images
Expand All @@ -67,6 +67,7 @@ effects:
- name: border_reference_pixels
description: Blanks the signal on N edge row and column pixels
class: ReferencePixelBorder
include: False
kwargs:
border: [0, 0, 0, 0]

Expand Down
13 changes: 1 addition & 12 deletions MICADO/MICADO_SPEC.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,6 @@ properties :
decouple_detector_from_sky_headers: True # needed for slit spectroscopy

effects :
- name : spec_mode_optics
description : list of extra mirrors needed for the spectroscopy mode
class : SurfaceList
kwargs :
filename : LIST_MICADO_mirrors_spec.dat

- name : spectroscopic_slit_aperture
class : ApertureMask
kwargs :
filename : "!OBS.slit_file"

- name : grating_efficiency
description : grating efficiency for spectral orders
class : SpectralEfficiency
Expand Down Expand Up @@ -58,4 +47,4 @@ name : SPEC
properties :
obs_mode: "SPEC"
fits_ins_mode: "SPE"
fits_ins_mask: ""
fits_ins_mask: "Small"
34 changes: 28 additions & 6 deletions MICADO/default.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ properties :
declination : -30
hour_angle : 0
pupil_angle : 0
slit: false # overridden in spectroscopic modes
dit : 60
ndit : 1
catg : SCIENCE
Expand Down Expand Up @@ -115,12 +116,12 @@ mode_yamls :
- MICADO_SPEC.yaml
properties :
trace_file : TRACE_MICADO.fits
slit_file : MASK_slit_15000x20.dat
slit : 15000x20
filter_name_fw1 : Spec_HK
filter_name_fw2 : open
filter_name_pupil : open
fits_ins_filt : Spec_HK
fits_ins_slit : "Long"
fits_ins_slit : Long

- object : observation
alias: OBS
Expand All @@ -131,12 +132,12 @@ mode_yamls :
- MICADO_SPEC.yaml
properties :
trace_file : TRACE_MICADO.fits
slit_file : MASK_slit_3000x48.dat
slit : 3000x48
filter_name_fw1 : Spec_HK
filter_name_fw2 : open
filter_name_pupil : open
fits_ins_filt : Spec_HK
fits_ins_slit : "Wide"
fits_ins_slit : Wide

- object : observation
alias : OBS
Expand All @@ -147,12 +148,30 @@ mode_yamls :
- MICADO_SPEC.yaml
properties :
trace_file : TRACE_MICADO.fits
slit_file : MASK_slit_3000x16.dat
slit: 3000x16
filter_name_fw1 : Spec_IJ
filter_name_fw2 : open
filter_name_pupil : open
fits_ins_filt : Spec_IJ
fits_ins_slit : "Short"
fits_ins_slit : Short

- object: observation
alias: OBS
name: SPEC
description: "spectrograph: all slits"
status: experimental
yamls:
- MICADO_SPEC.yaml
properties: # Todo: these parameters all need to be changeable
trace_file: TRACE_MICADO.fits
slit: 3000x16
filter_name_fw1: Spec_IJ
filter_name_fw2: open
filter_name_pupil: open
tech: SPEC
fits_ins_mode: SPE
fits_ins_filt: Spec_IJ
fits_ins_slit: Short

---
### default simulation parameters needed for a MICADO simulation
Expand All @@ -170,6 +189,9 @@ properties :
wave_mid : 1.6
wave_max : 2.5

sub_pixel:
flag: True

computing :
preload_field_of_views : True

Expand Down