Merge dev_master in preparation for release

.github/workflows/tests.yml

@@ -14,60 +14,59 @@ on:
 
 jobs:
   tests_master:
-    name: Test against ScopeSim master
+    name: Test against ScopeSim release
     runs-on: ${{ matrix.os }}
     # Run if our target is IRDB master, or when this is ran manually.
     if: github.base_ref == 'master' || github.base_ref == ''
     strategy:
       fail-fast: false
       matrix:
         os: [ubuntu-latest]
-        python-version: ['3.9', '3.10', '3.11', '3.12']
+        python-version: ['3.10', '3.11', '3.12']
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
           pip install -r requirements.github_actions.txt
-          pip uninstall -y scopesim scopesim_templates
-          pip install git+https://github.com/AstarVienna/ScopeSim.git@master
+          pip uninstall -y scopesim_templates
           pip install git+https://github.com/AstarVienna/ScopeSim_Templates.git
       - name: Run Pytest
         run: pytest
       - name: Store badge report files
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: badge-report
           path: _REPORTS
 
   tests_devmaster:
-    name: Test against ScopeSim dev_master
+    name: Test against ScopeSim main
     runs-on: ${{ matrix.os }}
     # Run if our target is IRDB dev_master, or when this is ran manually.
     if: github.base_ref == 'dev_master' || github.base_ref == ''
     strategy:
       fail-fast: false
       matrix:
         os: [ubuntu-latest]
-        python-version: ['3.9', '3.10', '3.11', '3.12']
+        python-version: ['3.10', '3.11', '3.12']
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
           pip install -r requirements.github_actions.txt
           pip uninstall -y scopesim scopesim_templates
-          pip install git+https://github.com/AstarVienna/ScopeSim.git@dev_master
+          pip install git+https://github.com/AstarVienna/ScopeSim.git
           pip install git+https://github.com/AstarVienna/ScopeSim_Templates.git
       - name: Run Pytest
         run: pytest
@@ -84,9 +83,9 @@ jobs:
     # https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows
     if: github.ref == 'dev_master' || github.ref == 'master' || github.base_ref == ''
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           # No matrix is used since this is a time-consuming tosk.
           python-version: 3.11
@@ -97,7 +96,7 @@ jobs:
           python -m pip install --upgrade pip
           pip install -r requirements.github_actions.txt
           pip uninstall -y scopesim scopesim_templates
-          pip install git+https://github.com/AstarVienna/ScopeSim.git@dev_master
+          pip install git+https://github.com/AstarVienna/ScopeSim.git
           pip install git+https://github.com/AstarVienna/ScopeSim_Templates.git
       - name: Run Notebooks
         env:
@@ -125,9 +124,9 @@ jobs:
     # https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows
     if: github.ref == 'dev_master' || github.ref == 'master' || github.base_ref == ''
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           # No matrix is used since this is a time-consuming tosk.
           python-version: 3.11
@@ -138,7 +137,7 @@ jobs:
           python -m pip install --upgrade pip
           pip install -r requirements.github_actions.txt
           pip uninstall -y scopesim scopesim_templates
-          pip install git+https://github.com/AstarVienna/ScopeSim.git@dev_master
+          pip install git+https://github.com/AstarVienna/ScopeSim.git
           pip install git+https://github.com/AstarVienna/ScopeSim_Templates.git
       - name: Run Notebooks
         env:

ELT/tests/test_TER_properties.py

@@ -20,6 +20,7 @@
 
 
 def test_eso_vs_scopesim_throughput():
+    rc.__currsys__["!TEL.temperature"] = 7
     slist = sim.effects.SurfaceList(filename="LIST_mirrors_ELT.tbl")
     wave = np.linspace(0.3, 2.5, 100) * u.um
     if PLOTS:

HAWKI/default.yaml

@@ -3,6 +3,7 @@ object : configuration
 alias : OBS
 name : HAWKI_default_configuration
 description : default parameters needed for a HAWKI simulation
+status: experimental
 date_modified: 2022-02-22
 changes:
   - 2022-02-22 (MV) formatting

HAWKI/test_hawki/test_full_package_hawki.py

@@ -126,8 +126,8 @@ def test_works_seamlessly_for_hawki_package(self, capsys):
 
         # test assert there are 4 detectors, each 2048x2048 pixels
         hdu = opt.readout()[0]
-        assert len(opt.detector_arrays[0].detectors) == 4
-        for detector in opt.detector_arrays[0].detectors:
+        assert len(opt.detector_managers[0]) == 4
+        for detector in opt.detector_managers[0]:
             assert detector.hdu.header["NAXIS1"] == 2048
             assert detector.hdu.header["NAXIS2"] == 2048
 

LFOA/default.yaml

@@ -3,6 +3,7 @@ object : configuration
 alias : OBS
 name : LFOA_default_configuration
 description : default parameters needed for a LFOA simulation
+status: experimental
 
 packages :
 - LFOA

METIS/METIS_DET_IFU.yaml

@@ -71,3 +71,9 @@ effects:
     kwargs:
       noise_std: "!DET.readout_noise"
       n_channels: 32
+
+  - name: quantization
+    description: Turn photon count into integers
+    class: Quantization
+    kwargs:
+      dtype: uint16

METIS/METIS_DET_IMG_LM.yaml

@@ -90,3 +90,9 @@ effects:
     kwargs:
       noise_std: "!DET.readout_noise"
       n_channels: 32
+
+  - name: quantization
+    description: Turn photon count into integers
+    class: Quantization
+    kwargs:
+      dtype: uint16

METIS/METIS_DET_IMG_N_Aquarius.yaml

@@ -99,3 +99,9 @@ effects:
       chop_offsets: "!OBS.chop_offsets"
       nod_offsets: "!OBS.nod_offsets"
       pixel_scale: "!INST.pixel_scale"
+
+  - name: quantization
+    description: Turn photon count into integers
+    class: Quantization
+    kwargs:
+      dtype: uint16

METIS/METIS_DET_IMG_N_GeoSnap.yaml

@@ -102,3 +102,9 @@ effects:
       chop_offsets: "!OBS.chop_offsets"
       nod_offsets: "!OBS.nod_offsets"
       pixel_scale: "!INST.pixel_scale"
+
+  - name: quantization
+    description: Turn photon count into integers
+    class: Quantization
+    kwargs:
+      dtype: uint16

METIS/code/2023-06-20-spectra_Grism-L_band.dat

@@ -0,0 +1,141 @@
+# author : Conchi Cardenas Vazquez
+# date_created : 2023-06-20
+# source : Final LSS design for manufacturing
+# wavelength_unit : um
+# xi_unit : arcsec
+# x_unit : mm
+# y_unit : mm
+#
+# comments :
+# - WARNING : Origin of coordinates at the detector: Detector sensitive surface, bottom-left corner.
+# - lambda: 11 points
+# - Field of View on-sky:	11 points
+# - conf#2
+# - L-band
+# - spectra lenght = 1760 px
+# - Field of View on-sky: s [arcsec], with respect to the optical axis.
+# - Slit @CFO FP2 on-axis.
+# - Coords at the detector: x, y [mm]
+#
+wavelength	xi	x	y
+2.90	5	34.999538	33.745033
+2.90	4	31.685914	33.727450
+2.90	3	28.371944	33.713754
+2.90	2	25.057988	33.703953
+2.90	1	21.744409	33.698053
+2.90	0	18.431569	33.696056
+2.90	-1	15.119834	33.697959
+2.90	-2	11.809567	33.703757
+2.90	-3	8.501130	33.713441
+2.90	-4	5.194883	33.726997
+2.90	-5	1.891181	33.744408
+3.03	5	34.994055	30.515995
+3.03	4	31.681510	30.498397
+3.03	3	28.368629	30.484687
+3.03	2	25.055769	30.474876
+3.03	1	21.743290	30.468969
+3.03	0	18.431554	30.466970
+3.03	-1	15.120922	30.468875
+3.03	-2	11.811755	30.474679
+3.03	-3	8.504413	30.484373
+3.03	-4	5.199252	30.497942
+3.03	-5	1.896626	30.515369
+3.16	5	34.988580	27.305202
+3.16	4	31.677111	27.287605
+3.16	3	28.365316	27.273895
+3.16	2	25.053551	27.264083
+3.16	1	21.742172	27.258176
+3.16	0	18.431539	27.256176
+3.16	-1	15.122009	27.258082
+3.16	-2	11.813942	27.263886
+3.16	-3	8.507693	27.273580
+3.16	-4	5.203617	27.287149
+3.16	-5	1.902064	27.304575
+3.29	5	34.983130	24.110293
+3.29	4	31.672729	24.092716
+3.29	3	28.362016	24.079020
+3.29	2	25.051341	24.069217
+3.29	1	21.741059	24.063315
+3.29	0	18.431524	24.061317
+3.29	-1	15.123093	24.063221
+3.29	-2	11.816121	24.069020
+3.29	-3	8.510962	24.078705
+3.29	-4	5.207965	24.092260
+3.29	-5	1.907478	24.109667
+3.42	5	34.977720	20.929352
+3.42	4	31.668379	20.911812
+3.42	3	28.358739	20.898144
+3.42	2	25.049146	20.888361
+3.42	1	21.739953	20.882471
+3.42	0	18.431510	20.880476
+3.42	-1	15.124171	20.882376
+3.42	-2	11.818287	20.888164
+3.42	-3	8.514208	20.897829
+3.42	-4	5.212282	20.911357
+3.42	-5	1.912853	20.928726
+3.55	5	34.972370	17.760795
+3.55	4	31.664076	17.743311
+3.55	3	28.355496	17.729686
+3.55	2	25.046974	17.719932
+3.55	1	21.738859	17.714060
+3.55	0	18.431497	17.712071
+3.55	-1	15.125239	17.713965
+3.55	-2	11.820431	17.719736
+3.55	-3	8.517422	17.729372
+3.55	-4	5.216555	17.742857
+3.55	-5	1.918170	17.760170
+3.68	5	34.967098	14.603291
+3.68	4	31.659833	14.585883
+3.68	3	28.352298	14.572316
+3.68	2	25.044833	14.562603
+3.68	1	21.737780	14.556754
+3.68	0	18.431485	14.554774
+3.68	-1	15.126292	14.556660
+3.68	-2	11.822547	14.562407
+3.68	-3	8.520592	14.572002
+3.68	-4	5.220768	14.585430
+3.68	-5	1.923410	14.602669
+3.81	5	34.961925	11.455706
+3.81	4	31.655669	11.438394
+3.81	3	28.349158	11.424899
+3.81	2	25.042729	11.415238
+3.81	1	21.736720	11.409421
+3.81	0	18.431473	11.407450
+3.81	-1	15.127328	11.409327
+3.81	-2	11.824626	11.415043
+3.81	-3	8.523706	11.424588
+3.81	-4	5.224904	11.437943
+3.81	-5	1.928552	11.455087
+3.94	5	34.956871	8.317054
+3.94	4	31.651598	8.299858
+3.94	3	28.346088	8.286453
+3.94	2	25.040672	8.276855
+3.94	1	21.735684	8.271075
+3.94	0	18.431462	8.269118
+3.94	-1	15.128342	8.270982
+3.94	-2	11.826660	8.276661
+3.94	-3	8.526752	8.286143
+3.94	-4	5.228948	8.299410
+3.94	-5	1.933577	8.316439
+4.07	5	34.951959	5.186466
+4.07	4	31.647640	5.169408
+4.07	3	28.343101	5.156108
+4.07	2	25.038670	5.146585
+4.07	1	21.734676	5.140850
+4.07	0	18.431452	5.138908
+4.07	-1	15.129330	5.140758
+4.07	-2	11.828641	5.146393
+4.07	-3	8.529716	5.155801
+4.07	-4	5.232882	5.168964
+4.07	-5	1.938462	5.185856
+4.20	5	34.947210	2.063164
+4.20	4	31.643811	2.046264
+4.20	3	28.340211	2.033088
+4.20	2	25.036733	2.023652
+4.20	1	21.733701	2.017969
+4.20	0	18.431443	2.016044
+4.20	-1	15.130287	2.017877
+4.20	-2	11.830559	2.023461
+4.20	-3	8.532585	2.032783
+4.20	-4	5.236688	2.045824
+4.20	-5	1.943185	2.062559