Sync with upstream

.github/workflows/badge_report.yml

@@ -27,10 +27,10 @@ jobs:
     name: Generate Badges
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
 
       - name: Set up Python
-        uses: actions/setup-python@v6
+        uses: actions/setup-python@v7
         with:
           python-version: 3.12
 

.github/workflows/internal_tests.yml

@@ -46,10 +46,10 @@ jobs:
     name: Run internal tests
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
 
       - name: Set up Python
-        uses: actions/setup-python@v6
+        uses: actions/setup-python@v7
         with:
           # No matrix is used since this is a time-consuming task.
           python-version: 3.13
@@ -64,8 +64,8 @@ jobs:
         run: |
           echo "Re-installing ScopeSim from source" >> $GITHUB_STEP_SUMMARY
           pip uninstall -y scopesim scopesim_templates
-          pip install git+https://github.com/AstarVienna/ScopeSim.git@${{ inputs.ScopeSim }}
           pip install git+https://github.com/AstarVienna/ScopeSim_Templates.git@${{ inputs.ScopeSim_Templates }}
+          pip install git+https://github.com/AstarVienna/ScopeSim.git@${{ inputs.ScopeSim }}
 
       - name: Run Pytest for internal tests
         run: pytest -m "irdb"

.github/workflows/notebooktests.yml

@@ -50,10 +50,10 @@ jobs:
     name: Run MICADO Notebooks
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
 
       - name: Set up Python
-        uses: actions/setup-python@v6
+        uses: actions/setup-python@v7
         with:
           # No matrix is used since this is a time-consuming task.
           python-version: 3.13
@@ -68,8 +68,8 @@ jobs:
         run: |
           echo "Re-installing ScopeSim from source" >> $GITHUB_STEP_SUMMARY
           pip uninstall -y scopesim scopesim_templates
-          pip install git+https://github.com/AstarVienna/ScopeSim.git@${{ inputs.ScopeSim }}
-          pip install git+https://github.com/AstarVienna/ScopeSim_Templates.git@${{ inputs.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:
@@ -89,9 +89,9 @@ jobs:
     name: Run MOSAIC Notebooks
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
       - name: Set up Python
-        uses: actions/setup-python@v6
+        uses: actions/setup-python@v7
         with:
           # No matrix is used since this is a time-consuming task.
           python-version: 3.13
@@ -105,8 +105,8 @@ jobs:
         run: |
           echo "Re-installing ScopeSim from source" >> $GITHUB_STEP_SUMMARY
           pip uninstall -y scopesim scopesim_templates
-          pip install git+https://github.com/AstarVienna/ScopeSim.git@${{ inputs.ScopeSim }}
-          pip install git+https://github.com/AstarVienna/ScopeSim_Templates.git@${{ inputs.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
@@ -123,9 +123,9 @@ jobs:
     name: Run METIS Notebooks
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
       - name: Set up Python
-        uses: actions/setup-python@v6
+        uses: actions/setup-python@v7
         with:
           # No matrix is used since this is a time-consuming task.
           python-version: 3.13
@@ -139,8 +139,8 @@ jobs:
         run: |
           echo "Re-installing ScopeSim from source" >> $GITHUB_STEP_SUMMARY
           pip uninstall -y scopesim scopesim_templates
-          pip install git+https://github.com/AstarVienna/ScopeSim.git@${{ inputs.ScopeSim }}
-          pip install git+https://github.com/AstarVienna/ScopeSim_Templates.git@${{ inputs.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
@@ -157,9 +157,9 @@ jobs:
     name: Run METIS Demo Notebooks
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
       - name: Set up Python
-        uses: actions/setup-python@v6
+        uses: actions/setup-python@v7
         with:
           # No matrix is used since this is a time-consuming task.
           python-version: 3.13
@@ -173,8 +173,8 @@ jobs:
         run: |
           echo "Re-installing ScopeSim from source" >> $GITHUB_STEP_SUMMARY
           pip uninstall -y scopesim scopesim_templates
-          pip install git+https://github.com/AstarVienna/ScopeSim.git@${{ inputs.ScopeSim }}
-          pip install git+https://github.com/AstarVienna/ScopeSim_Templates.git@${{ inputs.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

.github/workflows/tests.yml

@@ -53,12 +53,12 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest]
-        python-version: ['3.10', '3.11', '3.12', '3.13']
+        python-version: ['3.12', '3.13', '3.14']
 
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
       - name: Set up Python
-        uses: actions/setup-python@v6
+        uses: actions/setup-python@v7
         with:
           python-version: ${{ matrix.python-version }}
 
@@ -72,8 +72,8 @@ jobs:
         run: |
           echo "Re-installing ScopeSim from source" >> $GITHUB_STEP_SUMMARY
           pip uninstall -y scopesim scopesim_templates
-          pip install git+https://github.com/AstarVienna/ScopeSim.git@${{ inputs.ScopeSim }}
           pip install git+https://github.com/AstarVienna/ScopeSim_Templates.git@${{ inputs.ScopeSim_Templates }}
+          pip install git+https://github.com/AstarVienna/ScopeSim.git@${{ inputs.ScopeSim }}
 
       - name: Run Pytest
         run: pytest

GTC/GTC.yaml

@@ -8,6 +8,7 @@ date_created: 2022-03-02
 date_modified: 2022-03-02
 changes:
   - 2022-02-17 (KL) Created file based on ELT.yaml
+  - 2026-07-07 (OC) Added interpolation parameters for PSF
 
 
 properties:
@@ -54,3 +55,18 @@ effects:
   kwargs:
     filename: PSF_GTC_OSIRIS.fits
     warning: "Default PSF for r-band from GTC website"
+    interp_psf: "!SIM.psf.interp_psf"
+    interp_order: "!SIM.psf.interp_order"
+
+
+---
+### default simulation parameters
+object: simulation
+alias: SIM
+name: GTC_simulation_parameters
+description: RC simulation parameters for GTC simulations
+
+properties:
+  psf:
+    interp_psf: True
+    interp_order: 1

METIS/Leiden_sky.yaml

@@ -5,9 +5,10 @@ object: Leiden sky
 alias: OBS
 name: Leiden_sky
 description: Leiden sky and telescope
-data_modified: 2025-08-26
+data_modified: 2026-08-13
 changes:
   - 2025-08-26 (OC) file created
+  - 2026-08-13 (OC) explicit parameter in AtmoLibraryTERCurve
 
 properties:
   location:    Leiden
@@ -21,6 +22,7 @@ effects:
     class:       AtmoLibraryTERCurve
     include:     True
     kwargs:
+      parameter: "pwv"
       pwv:       "!ATMO.pwv"
       remote_filename: "!ATMO.spectrum.filename"
 

METIS/METIS_IMG_LM.yaml

@@ -18,7 +18,7 @@ properties:
   pixel_scale: 0.00547         # arcsec / pixel, METIS_1097
   plate_scale: 0.30389         # arcsec / mm
   filter_file_format: "filters/TC_filter_{}.dat"
-  include_illumination: False     
+  include_illumination: False
 
 effects:
   - name: img_lm_optics
@@ -87,6 +87,8 @@ effects:
       filename_format: "METIS_psfs/PSF_{}.fits"
       wave_key: "WAVELENG"
       bkg_width: -1
+      interp_psf: "!SIM.psf.interp_psf"
+      interp_order: "!SIM.psf.interp_order"
 
   - name: img_lm_fits_keywords
     descriptions: FITS keywords specific to IMG-LM
@@ -99,7 +101,7 @@ effects:
     description: Large-scale illumination variation across the image plane
     class: Illumination
     include: "!INST.include_illumination"
-    
+
 ---
 ### default simulation parameters needed for a METIS simulation
 object: simulation
@@ -111,3 +113,6 @@ properties:
   spectral:
     spectral_bin_width: 1.e-3  # microns, defines fov wavelengths
     spectral_resolution: 5000  # defines skycalc resolution
+  psf:
+    interp_psf: True
+    interp_order: 1

METIS/METIS_IMG_N.yaml

@@ -80,19 +80,21 @@ effects:
       filename_format: "METIS_psfs/PSF_{}.fits"
       wave_key: "WAVELENG"
       bkg_width: -1
+      interp_psf: "!SIM.psf.interp_psf"
+      interp_order: "!SIM.psf.interp_order"
 
   - name: img_n_fits_keywords
     descriptions: FITS keywords specific to IMG-N
     class: ExtraFitsKeywords
     include: True
     kwargs:
       filename: headers/FITS_img_n_keywords.yaml
-  
+
   - name: illumination
     description: Large-scale illumination variation across the image plane
     class: Illumination
     include: "!INST.include_illumination"
-    
+
 ---
 ### default simulation parameters needed for a METIS simulation
 object: simulation
@@ -104,3 +106,6 @@ properties:
   spectral:
     spectral_bin_width: 1.e-3  # microns, defines fov wavelengths
     spectral_resolution: 5000  # defines skycalc resolution
+  psf:
+    interp_psf: True
+    interp_order: 1

METIS/METIS_LMS.yaml

@@ -64,6 +64,8 @@ effects:
       filename_format: "METIS_psfs/PSF_{}.fits"
       wave_key: "WAVELENG"
       bkg_width: -1
+      interp_psf: "!SIM.psf.interp_psf"
+      interp_order: "!SIM.psf.interp_order"
 
   - name: lms_spectral_traces
     description: list of spectral order trace geometry on the focal plane
@@ -94,3 +96,6 @@ properties:
   spectral:
     spectral_bin_width: 1.e-5    # microns, defines fov wavelengths
     spectral_resolution: 200000  # defines skycalc resolution
+  psf:
+    interp_psf: False
+    interp_order: 1