Merge pull request #92 from AstarVienna/dev_master

Release MICADO 2023-03-08
AstarVienna · Mar 8, 2023 · 143264e · 143264e
2 parents 8e9562c + afd9a75
commit 143264e
Show file tree

Hide file tree

Showing 63 changed files with 27,269 additions and 3,923 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -67,7 +67,7 @@ jobs:
 
   job_notebooks:
     # Run the notebooks. This is a time-consuming step, but important to catch
-    # errors. It is therefor only ran on the master and dev_master branches,
+    # errors. It is therefore only ran on the master and dev_master branches,
     # or when manually triggered. It is not ran on pull requests.
     runs-on: ubuntu-latest
     # Run if we are on the master or dev_master branch, or if this job permissions:
@@ -92,4 +92,6 @@ jobs:
           pip install git+https://github.com/AstarVienna/ScopeSim.git@dev_master
           pip install git+https://github.com/AstarVienna/ScopeSim_Templates.git
       - name: Run MICADO Notebooks
-        run: jupytext --execute MICADO/docs/example_notebooks/*.ipynb
+        run: |
+          sed -i "s/USE_FULL_DETECTOR = True/USE_FULL_DETECTOR = False/g" MICADO/docs/example_notebooks/*.ipynb
+          jupytext --execute MICADO/docs/example_notebooks/*.ipynb
diff --git a/LaPalma/LaPalma.yaml b/LaPalma/LaPalma.yaml
@@ -11,9 +11,9 @@ changes:
 
 
 properties :
-    location :      lasilla
-    altitude :      2400        # m
-    longitude :     -17.89203   # deg east
+    location :      lapalma
+    altitude :      2348        # m
+    longitude :     17.89203    # deg east
     latitude :      28.75661    # deg north
     temperature :   7           # deg celcius
     humidity :      0.1         # [0.1]

diff --git a/MAORY/LIST_mirrors_maory_mms.tbl b/MAORY/LIST_mirrors_maory_mms.tbl
@@ -23,6 +23,5 @@ M8          0.85    0.      0.      !ATMO.temperature   reflection      TER_MAOR
 DM9         0.75    0.      0.      !ATMO.temperature   reflection      TER_MAORY_mirror_mgf2agal.dat
 DM10        0.75    0.      0.      !ATMO.temperature   reflection      TER_MAORY_mirror_mgf2agal.dat
 Dichroic    0.6     0.      0.      !ATMO.temperature   reflection      TER_MAORY_lgs_dichroic.dat
-M10         0.6     0.      0.      !ATMO.temperature   reflection      TER_MAORY_mirror_silver.dat
 M11         0.8     0.      45.     !ATMO.temperature   reflection      TER_MAORY_mirror_silver.dat
 M12         0.8     0.      0.      !ATMO.temperature   reflection      TER_MAORY_mirror_silver.dat
diff --git a/MAORY/TER_MAORY_entrance_window.dat b/MAORY/TER_MAORY_entrance_window.dat
@@ -1,18 +1,24 @@
 # name : Entrance window spectral response
-# description : Throughput of all 4 surfaces of the entrance window
+# description : Throughput of all 2 surfaces of the entrance window
 # author : Kieran Leschinski
 # sources:
 # date_created : 2016
-# date_modified : 2018-11-19
-# status : Idea - guess pulled out of thin air
+# date_modified : 2022-10-28
+# status : MORFEO design
 # type : window:transmission
 # wavelength_unit : um
 #
 # changes :
 # - 2018-11-19 (KL) updated meta data to new format
+# - 2022-10-28 (KL) Chat with Carmelo, updated transmission guess
 #
 wavelength  transmission    reflection      emissivity
 0.5         0               1               0
-0.51        0.95            0               0.05
-3.0         0.95            0               0.05
-3.01        0               1               0
+0.51        0.93            0               0.05
+1.5         0.935           0               0.065 
+2.0         0.936           0               0.064
+2.2         0.936           0               0.064 
+2.3         0.925           0               0.075 
+2.4         0.91            0               0.09 
+2.5         0.9             0               0.1 
+3.0         0               1               0
diff --git a/MAORY/TER_MAORY_lgs_dichroic.dat b/MAORY/TER_MAORY_lgs_dichroic.dat
@@ -1,15 +1,22 @@
-# source : Carmelo Archidiacono
+# source : E-MAO-SF0-INA-DER-001 from Carmelo Archidiacono
 # name : maory_lgs_dichroic_pickoff
 # date_created : 2020-06-21
-# date_modified : 2020-06-22
+# date_modified : 2022-10-28
 # wavelength_unit : um
 #
 # changes :
 # - 2020-06-23 (KL) Added meta data
 # - 2020-12-03 (KL) Expanded to full TER columns
+# - 2022-10-28 (KL) Updated TER columns based on E-MAO-SF0-INA-DER-001
 #
 wavelength      reflection  emissivity  transmission
-0.3             0.0001      0.0         0.9999
-0.6             0.0001      0.0         0.9999
-0.601           0.9999      0.0         0.0001
-3.0             0.9999      0.0         0.0001
+0.3             0.965       0.0         0.035
+0.560           0.965       0.0         0.035
+0.580           0.04        0.0         0.96
+0.589           0.04        0.0         0.96
+0.598           0.04        0.0         0.96
+0.620           0.965       0.0         0.035
+0.8             0.965       0.0         0.035
+1.0             0.979       0.0         0.021 
+2.4             0.98        0.0         0.02
+3.0             0.98        0.0         0.02
diff --git a/METIS/docs/example_notebooks/IMG_L_N-examples.ipynb b/METIS/docs/example_notebooks/IMG_L_N-examples.ipynb
@@ -594,9 +594,6 @@
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
    "version": "3.6.8"
-  },
-  "nbsphinx": {
-   "execute": "always"
   }
  },
  "nbformat": 4,

diff --git a/METIS/docs/example_notebooks/Introduction_to_Scopesim_for_METIS.ipynb b/METIS/docs/example_notebooks/Introduction_to_Scopesim_for_METIS.ipynb
@@ -219,9 +219,6 @@
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
    "version": "3.9.10"
-  },
-  "nbsphinx": {
-   "execute": "never"
   }
  },
  "nbformat": 4,

diff --git a/METIS/docs/example_notebooks/LSS-YSO_model_simulation.ipynb b/METIS/docs/example_notebooks/LSS-YSO_model_simulation.ipynb
@@ -786,9 +786,6 @@
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
    "version": "3.9.10"
-  },
-  "nbsphinx": {
-   "execute": "never"
   }
  },
  "nbformat": 4,

diff --git a/METIS/docs/example_notebooks/LSS_AGN-01_preparation.ipynb b/METIS/docs/example_notebooks/LSS_AGN-01_preparation.ipynb
@@ -490,9 +490,6 @@
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
    "version": "3.6.8"
-  },
-  "nbsphinx": {
-   "execute": "never"
   }
  },
  "nbformat": 4,

diff --git a/METIS/docs/example_notebooks/LSS_AGN-02_simulation.ipynb b/METIS/docs/example_notebooks/LSS_AGN-02_simulation.ipynb
@@ -173,11 +173,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "nbsphinx": {"execute": "never"},
    "version": "3.9.7"
-  },
-  "nbsphinx": {
-   "execute": "never"
   }
  },
  "nbformat": 4,

diff --git a/METIS/docs/example_notebooks/demos/demo_adc_wheel.ipynb b/METIS/docs/example_notebooks/demos/demo_adc_wheel.ipynb
@@ -191,9 +191,6 @@
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
    "version": "3.6.8"
-  },
-  "nbsphinx": {
-   "execute": "always"
   }
  },
  "nbformat": 4,

diff --git a/METIS/docs/example_notebooks/demos/demo_auto_exposure.ipynb b/METIS/docs/example_notebooks/demos/demo_auto_exposure.ipynb
@@ -332,9 +332,6 @@
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
    "version": "3.6.8"
-  },
-  "nbsphinx": {
-   "execute": "always"
   }
  },
  "nbformat": 4,

diff --git a/METIS/docs/example_notebooks/demos/demo_chopping_and_nodding.ipynb b/METIS/docs/example_notebooks/demos/demo_chopping_and_nodding.ipynb
@@ -287,9 +287,6 @@
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
    "version": "3.6.8"
-  },
-  "nbsphinx": {
-   "execute": "always"
   }
  },
  "nbformat": 4,

diff --git a/METIS/docs/example_notebooks/demos/demo_detector_modes.ipynb b/METIS/docs/example_notebooks/demos/demo_detector_modes.ipynb
@@ -386,10 +386,7 @@
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
    "version": "3.9.7"
-   },
-  "nbsphinx": {
-   "execute": "always"
-  }
+   }
  },
  "nbformat": 4,
  "nbformat_minor": 4

diff --git a/METIS/docs/example_notebooks/demos/demo_filter_wheel.ipynb b/METIS/docs/example_notebooks/demos/demo_filter_wheel.ipynb
@@ -326,9 +326,6 @@
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
    "version": "3.6.8"
-  },
-  "nbsphinx": {
-   "execute": "always"
   }
  },
  "nbformat": 4,

diff --git a/METIS/docs/example_notebooks/demos/demo_lss_simple.ipynb b/METIS/docs/example_notebooks/demos/demo_lss_simple.ipynb
@@ -176,9 +176,6 @@
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
    "version": "3.6.8"
-  },
-  "nbsphinx": {
-   "execute": "always"
   }
  },
  "nbformat": 4,

diff --git a/METIS/docs/example_notebooks/demos/demo_slit_wheel.ipynb b/METIS/docs/example_notebooks/demos/demo_slit_wheel.ipynb
@@ -149,9 +149,6 @@
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
    "version": "3.6.8"
-  },
-  "nbsphinx": {
-   "execute": "always"
   }
  },
  "nbformat": 4,