Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
61 commits
Select commit Hold shift + click to select a range
00c609e
Start IFU mode, image slicer
oczoske Apr 7, 2026
44ed9ab
Preliminary introduction of SpectralTraceList
oczoske Apr 8, 2026
11d077d
Redefine offset via meta keywords
oczoske May 7, 2026
81481e5
Resolved conflict
oczoske May 16, 2026
0490feb
Use merged aperture/trace file
oczoske May 16, 2026
d3abde1
IFU trace file
oczoske May 20, 2026
069c87a
Example notebook for MICADO_IFU
oczoske May 22, 2026
0339368
link_irdb not needed, apparently
oczoske May 22, 2026
b0c5c14
Add missing TECH keywords to most modes
teutoburg May 29, 2026
2d2f8d4
Merge branch 'dev_master' into fh/tech
teutoburg Jun 29, 2026
5242440
Convert METIS demo notebooks to MyST md format
teutoburg Aug 17, 2026
cac8530
Ensure exactly one (1) H1-level (`#`) in each notebook
teutoburg Aug 17, 2026
0ba0384
Added MICADO verification notebook for scopesim_targets' flat lamp; a…
janusbrink Sep 1, 2026
4565612
Add flag keywords for MICADO detector window
teutoburg Sep 10, 2026
bf4cd49
Add flag keywords for MICADO detector window (#374)
teutoburg Sep 10, 2026
806f318
Reduce mIFU bundles to 169
oczoske Oct 29, 2025
73d1fd7
Reference border not needed at this stage
oczoske Sep 10, 2026
96682c9
tests and fix filename error
oczoske Sep 10, 2026
c42f2a3
Minor changes to notebook
oczoske Sep 14, 2026
7d0f4a6
MOSAIC updates (#287)
oczoske Sep 15, 2026
7c3a992
Fixed typo and updates to reference values in the comments. Updated p…
janusbrink Sep 15, 2026
c2e7af9
Added MICADO verification notebook for scopesim_targets' flat lamp (#…
teutoburg Sep 15, 2026
4f88129
MICADO MCA verification notebook - fixed air column RH setting
janusbrink Sep 16, 2026
48bd457
Include dark current in AutoExposure
oczoske Sep 17, 2026
8365b06
Provisional: offsets in both table and meta
oczoske Sep 17, 2026
2e950c0
Include dark current in AutoExposure (#375)
oczoske Sep 17, 2026
4c86d8c
Merge branch 'dev_master' into fh/mystnbs
teutoburg Sep 18, 2026
2858976
Merge branch 'dev_master' into oc/asymm_slit
oczoske Sep 18, 2026
aea1e98
Restructure default.yaml
oczoske Sep 18, 2026
6d71ac4
Slit offsets for image slicer IFUs and offset slits (#343)
oczoske Sep 18, 2026
4de58d2
Merge branch 'dev_master' into fh/tech
teutoburg Sep 18, 2026
39c72c0
Exclude 'lms_extended' mode for now
teutoburg Sep 18, 2026
eba1d19
Remove deprecated SPEC_..x.. modes
oczoske Sep 18, 2026
41fdc10
Replace None with Null in yamls
oczoske Sep 18, 2026
68b767d
Seeds None -> Null
oczoske Sep 18, 2026
44cd37f
Bring tests and yamls up to date (#376)
oczoske Sep 18, 2026
8aef06f
Merge branch 'dev_master' into fh/tech
teutoburg Sep 18, 2026
1354c84
Add missing TECH keywords to most modes (#357)
teutoburg Sep 18, 2026
819ea81
Largely cosmetic updates to notebooks (Scopesim #1034)
oczoske Sep 20, 2026
d948d40
Update first batch of MICADO notebooks
oczoske Sep 20, 2026
c6d4ec3
Import myst nb tests from scopesim-targets
teutoburg Sep 20, 2026
2fcacfe
Move IRDB linking to setup cell
teutoburg Sep 20, 2026
ae7c62a
two more MICADO notebooks
oczoske Sep 20, 2026
83fb62b
Update needs-scopesim keywords to v0.12.0rc2
teutoburg Sep 21, 2026
9b4bc93
Merge branch 'dev_master' into fh/mystnbs
teutoburg Sep 21, 2026
2e4e6b0
Small cleanup in some notebooks
teutoburg Sep 21, 2026
ea0b68b
Update Ubuntu and Python for RTD build
teutoburg Sep 21, 2026
0309fe9
Keep symlinks away from RTD
teutoburg Sep 21, 2026
ab283d8
Increase offset back to 3 arcsec; last batch of nbs
oczoske Sep 21, 2026
8f22f8d
Notebook updates after test against Scopesim 0.12.0rc1 (#378)
oczoske Sep 22, 2026
6b17817
Update needs-scopesim keywords to v0.12.0rc2 (#377)
teutoburg Sep 22, 2026
b685678
Convert and fix METIS demo notebooks (#371)
teutoburg Sep 22, 2026
a8a71ae
Update badge reports in preparation for release
teutoburg Sep 22, 2026
1677e74
Correct contact email addresses in docs
teutoburg Sep 22, 2026
f1fb7b8
Post-3.12 timezone import
teutoburg Sep 23, 2026
2fff699
Add missing package locations
teutoburg Sep 23, 2026
ec74ae6
Remove deprecated function
teutoburg Sep 23, 2026
ece30e0
Cleanup
teutoburg Sep 23, 2026
8b120c3
Comment out NIRCam.yaml in default.yaml
teutoburg Oct 8, 2026
4cf2524
MICADO MCA verification notebook - fixed air column RH setting (#380)
teutoburg Oct 8, 2026
14d3078
Skip NIRCam in package YAML checks
teutoburg Oct 8, 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
19 changes: 8 additions & 11 deletions .github/workflows/notebooktests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,9 @@ on:
required: false
default: main

env:
MPLBACKEND: Agg # headless matplotlib

jobs:
micado_notebooks:
name: Run MICADO Notebooks
Expand Down Expand Up @@ -158,11 +161,13 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v7

- name: Set up Python
uses: actions/setup-python@v7
with:
# No matrix is used since this is a time-consuming task.
python-version: 3.13

- name: Install dependencies
run: |
python -m pip install --upgrade pip
Expand All @@ -175,14 +180,6 @@ jobs:
pip uninstall -y scopesim scopesim_templates
pip install --pre git+https://github.com/AstarVienna/ScopeSim_Templates.git@${{ inputs.ScopeSim_Templates }}
pip install --pre git+https://github.com/AstarVienna/ScopeSim.git@${{ inputs.ScopeSim }}
- name: Run Notebooks
env:
PYDEVD_DISABLE_FILE_VALIDATION: 1
run: |
echo "## METIS Demo Notebooks tested" >> $GITHUB_STEP_SUMMARY
for fn in METIS/docs/example_notebooks/demos/*.ipynb
do
echo "${fn}"
echo "- ${fn}" >> $GITHUB_STEP_SUMMARY
/usr/bin/time -v jupytext --execute --update "${fn}"
done

- name: Execute MyST notebooks
run: pytest METIS/docs/example_notebooks/demos --notebooks
4 changes: 2 additions & 2 deletions .readthedocs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
version: 2

build:
os: "ubuntu-24.04"
os: "ubuntu-26.04"
tools:
python: "3.11"
python: "3.13"
jobs:
post_install:
- pytest ./MICADO/test_micado/ -m validation --junit-xml=./MICADO/test_micado/validation_results.xml --tb=line -o junit_suite_name=MICADO || true
Expand Down
4 changes: 2 additions & 2 deletions HAWKI/default.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ status: experimental
date_modified: 2022-02-22
changes:
- 2022-02-22 (MV) formatting
- 2026-01-02 (OC) random seed to None
- 2026-01-02 (OC) random seed to Null

packages:
- Paranal
Expand Down Expand Up @@ -40,7 +40,7 @@ description : RC simulation parameters that need to change for a HAWKI run

properties :
random :
seed : None # 9001
seed: Null

spectral :
wave_min : 0.85
Expand Down
2 changes: 1 addition & 1 deletion LFOA/default.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ description : RC simulation parameters

properties :
random :
seed : None # 9001
seed : Null

spectral :
wave_min : 0.3
Expand Down
9 changes: 6 additions & 3 deletions METIS/METIS_DET_IFU.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ properties:
dit: "!OBS.dit"
ndit: "!OBS.ndit"
mindit: 1.3 # seconds, Roy van Boekel, pers. communication
include_prnu: False
include_prnu: False
full_well: 1.e+5 # electrons, E-TNT-MPIA-1004, v1-0
gain:
1: 2.0 # electrons/ADU, email B.Serra 2024-10-09
Expand Down Expand Up @@ -58,6 +58,9 @@ effects:
include: True
kwargs:
fill_frac: "!OBS.auto_exposure.fill_frac"
full_well: "!DET.full_well"
dark_current: "!DET.dark_current"
mindit: "!DET.mindit"

- name: reference_pixel_mask
description: Mask for reference pixels
Expand All @@ -71,11 +74,11 @@ effects:
class: ExposureIntegration

- name: prnu
description: Pixel-to-pixel response non-uniformity
description: Pixel-to-pixel response non-uniformity
class: PixelResponseNonUniformity
include: "!DET.include_prnu"
kwargs:
prnu_std: 0.005
prnu_std: 0.005
prnu_seed: 42

- name: dark_current
Expand Down
5 changes: 4 additions & 1 deletion METIS/METIS_DET_IFU_SMPL.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ properties:
temperature: -233
dit: "!OBS.dit"
ndit: "!OBS.ndit"
mindit: 1.3 # seconds, Roy van Boekel, pers. communication
mindit: 1.3 # seconds, Roy van Boekel, pers. communication
full_well: 1.e+5 # electrons, E-TNT-MPIA-1004, v1-0
gain: 2
dark_current: 0.1 # [e-/s]
Expand Down Expand Up @@ -46,6 +46,9 @@ effects:
include: True
kwargs:
fill_frac: "!OBS.auto_exposure.fill_frac"
full_well: "!DET.full_well"
dark_current: "!DET.dark_current"
mindit: "!DET.mindit"

- name: exposure_action
description: Summing up sky signal for all DITs and NDITs
Expand Down
3 changes: 2 additions & 1 deletion METIS/METIS_DET_IMG_LM.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ properties:
temperature: -230
dit: "!OBS.dit"
ndit: "!OBS.ndit"
include_prnu: False
include_prnu: False
layout:
file_name: "FPA_metis_img_lm_layout.dat"
qe_curve:
Expand Down Expand Up @@ -70,6 +70,7 @@ effects:
kwargs:
fill_frac: "!OBS.auto_exposure.fill_frac"
full_well: "!DET.full_well"
dark_current: "!DET.dark_current"
mindit: "!DET.mindit"

- name: reference_pixel_mask
Expand Down
7 changes: 5 additions & 2 deletions METIS/METIS_DET_IMG_N_Aquarius.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ properties:
temperature: -265
dit: "!OBS.dit"
ndit: "!OBS.ndit"
include_prnu: False
include_prnu: False
mindit: 0.008 # seconds, E-REP-NOVA-MET-1191, v2-0
full_well: 1.e+6 # electrons, low-capacity mode
dark_current: 13 # [e-/s] E-REP-NOVA-MET-1191, v2-0
Expand Down Expand Up @@ -65,13 +65,16 @@ effects:
include: true
kwargs:
fill_frac: "!OBS.auto_exposure.fill_frac"
full_well: "!DET.full_well"
dark_current: "!DET.dark_current"
mindit: "!DET.mindit"

- name: exposure_integration
description: Summing up sky signal for all DITs and NDITs
class: ExposureIntegration

- name: prnu
description: Pixel-to-pixel response non-uniformity
description: Pixel-to-pixel response non-uniformity
class: PixelResponseNonUniformity
include: "!DET.include_prnu"
kwargs:
Expand Down
3 changes: 2 additions & 1 deletion METIS/METIS_DET_IMG_N_GeoSnap.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ properties:
temperature: -240
dit: "!OBS.dit"
ndit: "!OBS.ndit"
include_prnu: False
include_prnu: False
border: [28, 28, 28, 28]
layout:
file_name: "FPA_metis_img_n_geosnap_layout.dat"
Expand Down Expand Up @@ -74,6 +74,7 @@ effects:
kwargs:
fill_frac: "!OBS.auto_exposure.fill_frac"
full_well: "!DET.full_well"
dark_current: "!DET.dark_current"
mindit: "!DET.mindit"

- name: reference_pixel_mask
Expand Down
31 changes: 24 additions & 7 deletions METIS/default.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ alias: OBS
name: METIS_default_configuration
description: default parameters needed for a METIS simulation
status: development
needs_scopesim: "v0.11.3"
date_modified: 2025-10-09
needs_scopesim: "v0.12.0rc2"
date_modified: 2026-05-29
changes:
- 2021-12-16 (OC) chopnod defaults to perpendicular
- 2021-12-16 (OC) default slits renamed
Expand All @@ -23,6 +23,7 @@ changes:
- 2025-09-29 (OC) version bump
- 2025-10-09 (OC) proper MJD value
- 2026-03-31 (OC) set wave_min to 2.65um for bluest LMS settings
- 2026-05-29 (FH) added tech keyword to most modes

packages:
- Armazones
Expand Down Expand Up @@ -53,7 +54,6 @@ properties:
# corresponding yaml file with the keywords.
tplname: "METIS_img_lm_obs_GenericOffset"
catg: "SCIENCE"
tech: "IMAGE,LM"
type: "OBJECT"
# More default properties for the observation
mjdobs: "61529.104"
Expand Down Expand Up @@ -82,6 +82,7 @@ mode_yamls:
- METIS_DET_IMG_LM.yaml
properties:
ins_mode: IMG_LM # use as FITS header keyword
tech: IMAGE,LM
psf_file: PSF_SCAO_9mag_06seeing.fits
filter_name: Lp
nd_filter_name: open
Expand All @@ -102,6 +103,7 @@ mode_yamls:
- METIS_DET_IMG_N_GeoSnap.yaml
properties:
ins_mode: IMG_N # use as FITS header keyword
tech: IMAGE,N
psf_file: PSF_SCAO_9mag_06seeing.fits
filter_name: N2
nd_filter_name: open
Expand All @@ -125,6 +127,7 @@ mode_yamls:
- METIS_DET_IMG_LM.yaml
properties:
ins_mode: LSS_L # use as FITS header keyword
tech: LSS,LM
psf_file: PSF_LM_9mag_06seeing.fits
trace_file: TRACE_LSS_L.fits
efficiency_file: TER_grating_L.fits
Expand All @@ -150,6 +153,7 @@ mode_yamls:
- METIS_DET_IMG_LM.yaml
properties:
ins_mode: IMG_M # use as FITS header keyword
tech: LSS,LM
psf_file: PSF_LM_9mag_06seeing.fits
trace_file: TRACE_LSS_M.fits
efficiency_file: TER_grating_M.fits
Expand All @@ -175,6 +179,7 @@ mode_yamls:
- METIS_DET_IMG_N_GeoSnap.yaml
properties:
ins_mode: IMG_N # use as FITS header keyword
tech: LSS,N
psf_file: PSF_N_9mag_06seeing.fits
trace_file: TRACE_LSS_N.fits
efficiency_file: TER_grating_N.fits
Expand All @@ -201,6 +206,7 @@ mode_yamls:
- METIS_DET_IFU.yaml
properties:
ins_mode: LMS # use as FITS header keyword
tech: IFU
psf_file: PSF_LM_9mag_06seeing.fits
slit: false
adc: false
Expand All @@ -212,7 +218,7 @@ mode_yamls:
alias: OBS
name: lms_extended
description: "METIS LM-band integral-field spectroscopy, extended mode"
status: experimental
status: concept
yamls:
- Armazones.yaml
- ELT.yaml
Expand All @@ -238,6 +244,7 @@ mode_yamls:
- METIS_DET_IFU_SMPL.yaml
properties:
ins_mode: LMS_cube # use as FITS header keyword
tech: IFU
psf_file: PSF_LM_9mag_06seeing.fits
interp_psf: False
slit: false
Expand All @@ -259,6 +266,7 @@ mode_yamls:
- METIS_DET_IMG_LM.yaml
properties:
ins_mode: IMG_LM # use as FITS header keyword
tech: IMAGE,LM
pupil_mask: PPS-LM
psf_file: none
psf_name: "!OBS.pupil_mask"
Expand All @@ -280,6 +288,7 @@ mode_yamls:
- METIS_DET_IMG_N_GeoSnap.yaml
properties:
ins_mode: IMG_N # use as FITS header keyword
tech: IMAGE,N
pupil_mask: PPS-N
psf_file: none
psf_name: "!OBS.pupil_mask"
Expand All @@ -304,6 +313,7 @@ mode_yamls:
- METIS_DET_IMG_LM.yaml
properties:
ins_mode: LSS_L # use as FITS header keyword
tech: LSS,LM
pupil_mask: PPS-CFO2
psf_file: none
psf_name: "!OBS.pupil_mask"
Expand All @@ -330,6 +340,7 @@ mode_yamls:
- METIS_DET_IMG_LM.yaml
properties:
ins_mode: LSS_M # use as FITS header keyword
tech: LSS,LM
pupil_mask: PPS-CFO2
psf_file: none
psf_name: "!OBS.pupil_mask"
Expand All @@ -356,6 +367,7 @@ mode_yamls:
- METIS_DET_IMG_N_GeoSnap.yaml
properties:
ins_mode: LSS_N # use as FITS header keyword
tech: LSS,N
pupil_mask: PPS-CFO2
psf_file: none
psf_name: "!OBS.pupil_mask"
Expand Down Expand Up @@ -383,6 +395,7 @@ mode_yamls:
- METIS_DET_IFU.yaml
properties:
ins_mode: LMS # use as FITS header keyword
tech: IFU
pupil_mask: PPS-LMS
psf_file: none
psf_name: "!OBS.pupil_mask"
Expand All @@ -396,7 +409,7 @@ mode_yamls:
alias: OBS
name: wcu_lms_extended
description: "METIS LM-band integral-field spectroscopy, extended mode with WCU"
status: experimental
status: concept
yamls:
- METIS_WCU.yaml
- METIS.yaml
Expand Down Expand Up @@ -427,6 +440,7 @@ mode_yamls:
- METIS_DET_IMG_LM.yaml
properties:
ins_mode: LSS_L # use as FITS header keyword
tech: LSS,LM
psf_file: PSF_LM_9mag_06seeing.fits # REPLACE!
trace_file: TRACE_LSS_L.fits
efficiency_file: TER_grating_L.fits
Expand All @@ -451,6 +465,7 @@ mode_yamls:
- METIS_DET_IMG_LM.yaml
properties:
ins_mode: LSS_M # use as FITS header keyword
tech: LSS,LM
psf_file: PSF_LM_9mag_06seeing.fits # REPLACE!
trace_file: TRACE_LSS_M.fits
efficiency_file: TER_grating_M.fits
Expand All @@ -475,6 +490,7 @@ mode_yamls:
- METIS_DET_IMG_N_GeoSnap.yaml
properties:
ins_mode: LSS_N # use as FITS header keyword
tech: LSS,N
psf_file: PSF_N_9mag_06seeing.fits # REPLACE!
trace_file: TRACE_LSS_N.fits
efficiency_file: TER_grating_N.fits
Expand All @@ -500,6 +516,7 @@ mode_yamls:
- METIS_DET_IFU.yaml
properties:
ins_mode: LMS # use as FITS header keyword
tech: IFU
psf_file: PSF_LM_9mag_06seeing.fits # REPLACE!
slit: false
adc: false
Expand All @@ -511,7 +528,7 @@ mode_yamls:
alias: OBS
name: leiden_lms_extended
description: "METIS LM-band integral-field spectroscopy, extended mode with Leiden sky"
status: experimental
status: concept
yamls:
- Leiden_sky.yaml
- METIS.yaml
Expand All @@ -532,7 +549,7 @@ description: RC simulation parameters which need to change for a METIS run

properties:
random:
seed: None # 9001
seed: Null # 9001

spectral:
wave_min: 2.65
Expand Down
Loading
Loading