diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a13426a849271b43c9022d3e49ffd7d8555a76b2..a7a318bab08116ab58f64ac8de3d414385375613 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -40,14 +40,14 @@ simple_test:
# dev_master might have the same version numbers which will prevent
# pip from upgrading them.
- pip uninstall -y ScopeSIM
- - pip install ScopeSIM==0.5.4
+ - pip install ScopeSIM==0.6.2
#- pip install --upgrade git+https://github.com/AstarVienna/ScopeSim.git@master
- pip uninstall -y ScopeSIM_Templates
- - pip install ScopeSIM_Templates==0.4.2
+ - pip install ScopeSIM_Templates==0.4.4
#- pip install --upgrade git+https://github.com/AstarVienna/ScopeSim_Templates.git@master
- pip uninstall -y irdb
#- pip install --upgrade git+https://github.com/AstarVienna/irdb.git@master
- - python -c 'import scopesim; scopesim.download_packages(["Armazones", "ELT", "MICADO", "LFOA", "MAORY"])'
+ - python -c 'import scopesim; scopesim.download_packages(["Armazones", "ELT", "MICADO", "LFOA", "MORFEO"])'
script:
- PYTHONPATH=src bash conda-recipe/run_test.sh
diff --git a/.micadobuild.yml b/.micadobuild.yml
index 11758527b2b58e1715e039792983fb808659c510..0f7ab9e3ba25e34dd0ce80cca6e9c9c40c69bfc8 100644
--- a/.micadobuild.yml
+++ b/.micadobuild.yml
@@ -19,6 +19,11 @@ micadobuild_mr:
# Activate correct conda environment.
- eval "$(conda shell.bash hook)"
- conda activate micadowise
+ # Install latest version of ScopeSim and ScopeSim_Templates
+ - pip uninstall -y ScopeSIM
+ - pip install ScopeSIM==0.6.2
+ - pip uninstall -y ScopeSIM_Templates
+ - pip install ScopeSIM_Templates==0.4.4
# CVE-2022-24765 prevents git 2.35.2 from working in repository owned by
# someone else. The gitlab runner clone is owned by root. Therefore, it
# must be marked as safe.
diff --git a/build.sh b/build.sh
index 26ae4976371ab06f97a0f42147be606565208c6a..2a3e5f8f72a91362cc9d4e553983b77d4eef5a83 100755
--- a/build.sh
+++ b/build.sh
@@ -55,7 +55,7 @@ if [ "${DELETE}" = "YES" ] ; then
fi
# download the irdb packages, line below downloads zip files
-python -c 'import scopesim; scopesim.download_packages(["Armazones", "ELT", "MICADO", "LFOA", "MAORY"])'
+python -c 'import scopesim; scopesim.download_packages(["Armazones", "ELT", "MICADO", "LFOA", "MORFEO"])'
# TODO git checkout the irdb repo and point to it
#rm -Rf inst_pkgs
#git clone https://github.com/AstarVienna/irdb.git
diff --git a/conda-recipe/run_test.sh b/conda-recipe/run_test.sh
index 87711a29b94f01a07f660726d3b5879678124b89..08bd501980c6655e4ae7203e553159a1a25548d2 100755
--- a/conda-recipe/run_test.sh
+++ b/conda-recipe/run_test.sh
@@ -56,16 +56,16 @@ python -c "import skycalc_ipy" || pip install skycalc_ipy
# ScopeSIM should have a conda package
#python -c "import scopesim" || pip install git+https://github.com/AstarVienna/ScopeSim.git@master
-python -c "import scopesim" || pip install "ScopeSIM==0.5.4"
+python -c "import scopesim" || pip install "ScopeSIM==0.6.2"
# ScopeSim_Templates fetches data from the internet, which does not work
# when using conda-build.
#python -c "import scopesim_templates" || pip install -e git+https://github.com/AstarVienna/ScopeSim_Templates.git@master
-python -c "import scopesim_templates" || pip install "ScopeSIM_Templates==0.4.2"
+python -c "import scopesim_templates" || pip install "ScopeSIM_Templates==0.4.4"
# TODO: Fetch ScopeSim data package.
# IRDB
-python -c 'import scopesim; scopesim.download_packages(["Armazones", "ELT", "MICADO", "LFOA", "MAORY"])'
+python -c 'import scopesim; scopesim.download_packages(["Armazones", "ELT", "MICADO", "LFOA", "MORFEO"])'
# or install via pip install ?
#pip install git+https://github.com/AstarVienna/irdb.git@master
# or use git clone ?
diff --git a/micadowise.yml b/micadowise.yml
index 389eac33b9cc9d10c1df91ee05bd1c2576e83326..0cb34b9e9925634fbbf7c4fadc9b4289d332ade0 100644
--- a/micadowise.yml
+++ b/micadowise.yml
@@ -18,11 +18,8 @@ dependencies:
- pip
- pip:
- skycalc_ipy
- - "ScopeSim==0.5.4"
- - "scopesim_templates==0.4.2"
- # ScopeSIM 0.2.0 breaks simulating a cluster for large detectors.
- # - ScopeSim==0.1.4
- # dev_master should work again
+ - "ScopeSim==0.6.2"
+ - "scopesim_templates==0.4.4"
#- git+https://github.com/AstarVienna/ScopeSim.git@master
# - ScopeSim_Templates
#- git+https://github.com/AstarVienna/ScopeSim_Templates.git@dev_master
diff --git a/notebooks/LpuDpuExamples.ipynb b/notebooks/LpuDpuExamples.ipynb
index f1d79659297e0d3eca8337a1f9ea2243b399dc60..69b6f0429829182d1ede78c03210864e951ce13a 100644
--- a/notebooks/LpuDpuExamples.ipynb
+++ b/notebooks/LpuDpuExamples.ipynb
@@ -124,7 +124,7 @@
" 'description': 'parameters needed for a MICADO simulation',\n",
" 'name': 'MICADO_configuration',\n",
" 'object': 'observation',\n",
- " 'packages': ['Armazones', 'ELT', 'MAORY', 'MICADO'],\n",
+ " 'packages': ['Armazones', 'ELT', 'MORFEO', 'MICADO'],\n",
" 'properties': {'dit': 1.0, 'ndit': 1}},\n",
" {'alias': 'DET',\n",
" 'class': 'DetectorArray',\n",
@@ -276,7 +276,7 @@
"output_type": "stream",
"text": [
"WARNING - Package could not be found: /home/micado/micadowise/notebooks/inst_pkgs/ELT\n",
- "WARNING - Package could not be found: /home/micado/micadowise/notebooks/inst_pkgs/MAORY\n",
+ "WARNING - Package could not be found: /home/micado/micadowise/notebooks/inst_pkgs/MORFEO\n",
"WARNING - Package could not be found: /home/micado/micadowise/notebooks/inst_pkgs/MICADO\n",
"\n",
"Warning: header update failed, data will be saved with incomplete header.\n",
@@ -288,7 +288,7 @@
" 'description': 'parameters needed for a MICADO simulation',\n",
" 'name': 'MICADO_configuration',\n",
" 'object': 'observation',\n",
- " 'packages': ['Armazones', 'ELT', 'MAORY', 'MICADO'],\n",
+ " 'packages': ['Armazones', 'ELT', 'MORFEO', 'MICADO'],\n",
" 'properties': {'dit': 1.0, 'ndit': 1}},\n",
" {'alias': 'DET',\n",
" 'class': 'DetectorArray',\n",
@@ -440,7 +440,7 @@
"output_type": "stream",
"text": [
"WARNING - Package could not be found: /home/micado/micadowise/notebooks/inst_pkgs/ELT\n",
- "WARNING - Package could not be found: /home/micado/micadowise/notebooks/inst_pkgs/MAORY\n",
+ "WARNING - Package could not be found: /home/micado/micadowise/notebooks/inst_pkgs/MORFEO\n",
"WARNING - Package could not be found: /home/micado/micadowise/notebooks/inst_pkgs/MICADO\n",
"\n",
"Warning: header update failed, data will be saved with incomplete header.\n",
@@ -452,7 +452,7 @@
" 'description': 'parameters needed for a MICADO simulation',\n",
" 'name': 'MICADO_configuration',\n",
" 'object': 'observation',\n",
- " 'packages': ['Armazones', 'ELT', 'MAORY', 'MICADO'],\n",
+ " 'packages': ['Armazones', 'ELT', 'MORFEO', 'MICADO'],\n",
" 'properties': {'dit': 1.0, 'ndit': 1}},\n",
" {'alias': 'DET',\n",
" 'class': 'DetectorArray',\n",
@@ -604,7 +604,7 @@
"output_type": "stream",
"text": [
"WARNING - Package could not be found: /home/micado/micadowise/notebooks/inst_pkgs/ELT\n",
- "WARNING - Package could not be found: /home/micado/micadowise/notebooks/inst_pkgs/MAORY\n",
+ "WARNING - Package could not be found: /home/micado/micadowise/notebooks/inst_pkgs/MORFEO\n",
"WARNING - Package could not be found: /home/micado/micadowise/notebooks/inst_pkgs/MICADO\n",
"\n",
"Warning: header update failed, data will be saved with incomplete header.\n",
@@ -616,7 +616,7 @@
" 'description': 'parameters needed for a MICADO simulation',\n",
" 'name': 'MICADO_configuration',\n",
" 'object': 'observation',\n",
- " 'packages': ['Armazones', 'ELT', 'MAORY', 'MICADO'],\n",
+ " 'packages': ['Armazones', 'ELT', 'MORFEO', 'MICADO'],\n",
" 'properties': {'dit': 1.0, 'ndit': 1}},\n",
" {'alias': 'DET',\n",
" 'class': 'DetectorArray',\n",
@@ -768,7 +768,7 @@
"output_type": "stream",
"text": [
"WARNING - Package could not be found: /home/micado/micadowise/notebooks/inst_pkgs/ELT\n",
- "WARNING - Package could not be found: /home/micado/micadowise/notebooks/inst_pkgs/MAORY\n",
+ "WARNING - Package could not be found: /home/micado/micadowise/notebooks/inst_pkgs/MORFEO\n",
"WARNING - Package could not be found: /home/micado/micadowise/notebooks/inst_pkgs/MICADO\n",
"\n",
"Warning: header update failed, data will be saved with incomplete header.\n",
@@ -780,7 +780,7 @@
" 'description': 'parameters needed for a MICADO simulation',\n",
" 'name': 'MICADO_configuration',\n",
" 'object': 'observation',\n",
- " 'packages': ['Armazones', 'ELT', 'MAORY', 'MICADO'],\n",
+ " 'packages': ['Armazones', 'ELT', 'MORFEO', 'MICADO'],\n",
" 'properties': {'dit': 1.0, 'ndit': 1}},\n",
" {'alias': 'DET',\n",
" 'class': 'DetectorArray',\n",
@@ -932,7 +932,7 @@
"output_type": "stream",
"text": [
"WARNING - Package could not be found: /home/micado/micadowise/notebooks/inst_pkgs/ELT\n",
- "WARNING - Package could not be found: /home/micado/micadowise/notebooks/inst_pkgs/MAORY\n",
+ "WARNING - Package could not be found: /home/micado/micadowise/notebooks/inst_pkgs/MORFEO\n",
"WARNING - Package could not be found: /home/micado/micadowise/notebooks/inst_pkgs/MICADO\n",
"\n",
"Warning: header update failed, data will be saved with incomplete header.\n",
diff --git a/notebooks/SimulateRawScience.ipynb b/notebooks/SimulateRawScience.ipynb
index feecb0fba4ab8538d1c5f787f83cf15b0cff256a..73dca132360eb4fce4a446ab95dc4c22cb5a68ae 100644
--- a/notebooks/SimulateRawScience.ipynb
+++ b/notebooks/SimulateRawScience.ipynb
@@ -264,7 +264,7 @@
" 'alias': 'OBS',\n",
" 'name': 'MICADO_configuration',\n",
" 'description': 'parameters needed for a MICADO simulation',\n",
- " 'packages': ['Armazones', 'ELT', 'MAORY', 'MICADO'],\n",
+ " 'packages': ['Armazones', 'ELT', 'MORFEO', 'MICADO'],\n",
" 'properties': {'dit': 1.0, 'ndit': 1}},\n",
" {'class': 'Atmosphere',\n",
" 'description': 'The Atmosphere.',\n",
@@ -493,7 +493,7 @@
" 'description': 'parameters needed for a MICADO simulation',\n",
" 'name': 'MICADO_configuration',\n",
" 'object': 'observation',\n",
- " 'packages': ['Armazones', 'ELT', 'MAORY', 'MICADO'],\n",
+ " 'packages': ['Armazones', 'ELT', 'MORFEO', 'MICADO'],\n",
" 'properties': {'dit': 1.0, 'ndit': 1}},\n",
" {'alias': 'ATMO',\n",
" 'class': 'Atmosphere',\n",
@@ -707,7 +707,7 @@
"text": [
"WARNING - Package could not be found: /home/micado/micadowise/notebooks/inst_pkgs/Armazones\n",
"WARNING - Package could not be found: /home/micado/micadowise/notebooks/inst_pkgs/ELT\n",
- "WARNING - Package could not be found: /home/micado/micadowise/notebooks/inst_pkgs/MAORY\n",
+ "WARNING - Package could not be found: /home/micado/micadowise/notebooks/inst_pkgs/MORFEO\n",
"WARNING - Package could not be found: /home/micado/micadowise/notebooks/inst_pkgs/MICADO\n",
"\n",
"Warning: header update failed, data will be saved with incomplete header.\n",
diff --git a/notebooks/sci_raw_and_calib.ipynb b/notebooks/sci_raw_and_calib.ipynb
index fc663b838de5bad7e0ca00a6dc82d87f76e41d9c..b61d5a5c0544c4dd9e750208dd49f057f4167d8c 100644
--- a/notebooks/sci_raw_and_calib.ipynb
+++ b/notebooks/sci_raw_and_calib.ipynb
@@ -132,8 +132,8 @@
"<tr><td>MICADO_DET</td><td>border_reference_pixels</td><td>ReferencePixelBorder</td><td>True</td></tr>\n",
"<tr><td>MICADO_DET</td><td>readout_noise</td><td>PoorMansHxRGReadoutNoise</td><td>True</td></tr>\n",
"<tr><td>MICADO_DET</td><td>extra_fits_keywords</td><td>ExtraFitsKeywords</td><td>True</td></tr>\n",
- "<tr><td>MAORY</td><td>maory_surface_list</td><td>SurfaceList</td><td>True</td></tr>\n",
- "<tr><td>MAORY</td><td>maory_generic_psf</td><td>FieldConstantPSF</td><td>True</td></tr>\n",
+ "<tr><td>MORFEO</td><td>maory_surface_list</td><td>SurfaceList</td><td>True</td></tr>\n",
+ "<tr><td>MORFEO</td><td>maory_generic_psf</td><td>FieldConstantPSF</td><td>True</td></tr>\n",
"<tr><td>MICADO_IMG_LR</td><td>micado_wide_field_mirror_list</td><td>SurfaceList</td><td>True</td></tr>\n",
"<tr><td>MICADO_IMG_LR</td><td>micado_adc_3D_shift</td><td>AtmosphericDispersionCorrection</td><td>False</td></tr>\n",
"</table></div>"
@@ -160,8 +160,8 @@
" MICADO_DET border_reference_pixels ReferencePixelBorder True\n",
" MICADO_DET readout_noise PoorMansHxRGReadoutNoise True\n",
" MICADO_DET extra_fits_keywords ExtraFitsKeywords True\n",
- " MAORY maory_surface_list SurfaceList True\n",
- " MAORY maory_generic_psf FieldConstantPSF True\n",
+ " MORFEO maory_surface_list SurfaceList True\n",
+ " MORFEO maory_generic_psf FieldConstantPSF True\n",
"MICADO_IMG_LR micado_wide_field_mirror_list SurfaceList True\n",
"MICADO_IMG_LR micado_adc_3D_shift AtmosphericDispersionCorrection False"
]
@@ -303,8 +303,8 @@
"<tr><td>MICADO_DET</td><td>border_reference_pixels</td><td>ReferencePixelBorder</td><td>True</td></tr>\n",
"<tr><td>MICADO_DET</td><td>readout_noise</td><td>PoorMansHxRGReadoutNoise</td><td>False</td></tr>\n",
"<tr><td>MICADO_DET</td><td>extra_fits_keywords</td><td>ExtraFitsKeywords</td><td>True</td></tr>\n",
- "<tr><td>MAORY</td><td>maory_surface_list</td><td>SurfaceList</td><td>True</td></tr>\n",
- "<tr><td>MAORY</td><td>maory_generic_psf</td><td>FieldConstantPSF</td><td>True</td></tr>\n",
+ "<tr><td>MORFEO</td><td>maory_surface_list</td><td>SurfaceList</td><td>True</td></tr>\n",
+ "<tr><td>MORFEO</td><td>maory_generic_psf</td><td>FieldConstantPSF</td><td>True</td></tr>\n",
"<tr><td>MICADO_IMG_LR</td><td>micado_wide_field_mirror_list</td><td>SurfaceList</td><td>True</td></tr>\n",
"<tr><td>MICADO_IMG_LR</td><td>micado_adc_3D_shift</td><td>AtmosphericDispersionCorrection</td><td>False</td></tr>\n",
"</table></div>"
@@ -331,8 +331,8 @@
" MICADO_DET border_reference_pixels ReferencePixelBorder True\n",
" MICADO_DET readout_noise PoorMansHxRGReadoutNoise False\n",
" MICADO_DET extra_fits_keywords ExtraFitsKeywords True\n",
- " MAORY maory_surface_list SurfaceList True\n",
- " MAORY maory_generic_psf FieldConstantPSF True\n",
+ " MORFEO maory_surface_list SurfaceList True\n",
+ " MORFEO maory_generic_psf FieldConstantPSF True\n",
"MICADO_IMG_LR micado_wide_field_mirror_list SurfaceList True\n",
"MICADO_IMG_LR micado_adc_3D_shift AtmosphericDispersionCorrection False"
]
@@ -376,8 +376,8 @@
"<tr><td>MICADO_DET</td><td>border_reference_pixels</td><td>ReferencePixelBorder</td><td>True</td></tr>\n",
"<tr><td>MICADO_DET</td><td>readout_noise</td><td>PoorMansHxRGReadoutNoise</td><td>False</td></tr>\n",
"<tr><td>MICADO_DET</td><td>extra_fits_keywords</td><td>ExtraFitsKeywords</td><td>True</td></tr>\n",
- "<tr><td>MAORY</td><td>maory_surface_list</td><td>SurfaceList</td><td>True</td></tr>\n",
- "<tr><td>MAORY</td><td>maory_generic_psf</td><td>FieldConstantPSF</td><td>True</td></tr>\n",
+ "<tr><td>MORFEO</td><td>maory_surface_list</td><td>SurfaceList</td><td>True</td></tr>\n",
+ "<tr><td>MORFEO</td><td>maory_generic_psf</td><td>FieldConstantPSF</td><td>True</td></tr>\n",
"<tr><td>MICADO_IMG_LR</td><td>micado_wide_field_mirror_list</td><td>SurfaceList</td><td>True</td></tr>\n",
"<tr><td>MICADO_IMG_LR</td><td>micado_adc_3D_shift</td><td>AtmosphericDispersionCorrection</td><td>False</td></tr>\n",
"</table></div>"
@@ -404,8 +404,8 @@
" MICADO_DET border_reference_pixels ReferencePixelBorder True\n",
" MICADO_DET readout_noise PoorMansHxRGReadoutNoise False\n",
" MICADO_DET extra_fits_keywords ExtraFitsKeywords True\n",
- " MAORY maory_surface_list SurfaceList True\n",
- " MAORY maory_generic_psf FieldConstantPSF True\n",
+ " MORFEO maory_surface_list SurfaceList True\n",
+ " MORFEO maory_generic_psf FieldConstantPSF True\n",
"MICADO_IMG_LR micado_wide_field_mirror_list SurfaceList True\n",
"MICADO_IMG_LR micado_adc_3D_shift AtmosphericDispersionCorrection False"
]
diff --git a/notebooks/std_raw.ipynb b/notebooks/std_raw.ipynb
index ebbfb543ec674933ad1016140ba14eb366a4f381..ecfdff6a3d8f480a9a4f331bb84afe5f9b229b73 100644
--- a/notebooks/std_raw.ipynb
+++ b/notebooks/std_raw.ipynb
@@ -141,8 +141,8 @@
"<tr><td>MICADO_DET</td><td>border_reference_pixels</td><td>ReferencePixelBorder</td><td>True</td></tr>\n",
"<tr><td>MICADO_DET</td><td>readout_noise</td><td>PoorMansHxRGReadoutNoise</td><td>True</td></tr>\n",
"<tr><td>MICADO_DET</td><td>extra_fits_keywords</td><td>ExtraFitsKeywords</td><td>True</td></tr>\n",
- "<tr><td>MAORY</td><td>maory_surface_list</td><td>SurfaceList</td><td>True</td></tr>\n",
- "<tr><td>MAORY</td><td>maory_generic_psf</td><td>FieldConstantPSF</td><td>True</td></tr>\n",
+ "<tr><td>MORFEO</td><td>MORFEO_surface_list</td><td>SurfaceList</td><td>True</td></tr>\n",
+ "<tr><td>MORFEO</td><td>MORFEO_generic_psf</td><td>FieldConstantPSF</td><td>True</td></tr>\n",
"<tr><td>MICADO_IMG_LR</td><td>micado_wide_field_mirror_list</td><td>SurfaceList</td><td>True</td></tr>\n",
"<tr><td>MICADO_IMG_LR</td><td>micado_adc_3D_shift</td><td>AtmosphericDispersionCorrection</td><td>False</td></tr>\n",
"</table></div>"
@@ -169,8 +169,8 @@
" MICADO_DET border_reference_pixels ReferencePixelBorder True\n",
" MICADO_DET readout_noise PoorMansHxRGReadoutNoise True\n",
" MICADO_DET extra_fits_keywords ExtraFitsKeywords True\n",
- " MAORY maory_surface_list SurfaceList True\n",
- " MAORY maory_generic_psf FieldConstantPSF True\n",
+ " MORFEO MORFEO_surface_list SurfaceList True\n",
+ " MORFEO MORFEO_generic_psf FieldConstantPSF True\n",
"MICADO_IMG_LR micado_wide_field_mirror_list SurfaceList True\n",
"MICADO_IMG_LR micado_adc_3D_shift AtmosphericDispersionCorrection False"
]
@@ -312,9 +312,9 @@
"\n",
"extra_fits_keywords {'filename': 'FITS_extra_keywords.yaml', 'description': 'Extra FITS headers', 'history': [], 'name': 'extra_fits_keywords', 'z_order': [999], 'include': True, 'header_dict': None, 'yaml_string': None, 'decription': 'adds extra FITS keywords from a yaml file', 'image_plane_id': 0, 'temperature': -230, 'dit': '!OBS.dit', 'ndit': '!OBS.ndit', 'width': 4096, 'height': 4096, 'x': 0, 'y': 0, 'element_name': 'MICADO_DET'} \n",
"\n",
- "maory_surface_list {'filename': 'LIST_mirrors_maory_mms.tbl', 'description': 'list of surfaces in MAORY', 'history': ['ASCII table read from /Users/yixiancao/Work/MICADO/simcado2/imaging_sim/inst_pkgs/MAORY/LIST_mirrors_maory_mms.tbl'], 'name': 'maory_surface_list', 'temperature': 7, 'element_name': 'MAORY', 'comments': ['author : Kieran Leschinski', 'name : maory_mirror_list', 'source : Carmelo Archidiacono private email', 'date_created : 2018-11-19', 'date_modified : 2020-06-22', 'status : Design, new MAORY MMS design', 'outer_unit : m', 'inner_unit : m', 'angle_unit : degree', 'temperature_unit : deg_C', 'changes :', '- 2018-11-19 (KL) Added meta data, changed Dichr. filename', '- 2019-01-28 (KL) Fixed YAML format in meta data', '- 2020-06-22 (KL) Updated file to match the MMS configuration from Carmelo', '- 2020-08-17 (KL) Pegged temperature to atmosphere', '- 2020-12-03 (KL)', ''], 'author': 'Kieran Leschinski', 'source': 'Carmelo Archidiacono private email', 'date_created': datetime.date(2018, 11, 19), 'date_modified': datetime.date(2020, 6, 22), 'status': 'Design, new MAORY MMS design', 'outer_unit': 'm', 'inner_unit': 'm', 'angle_unit': 'degree', 'temperature_unit': 'deg_C', 'changes': ['2018-11-19 (KL) Added meta data, changed Dichr. filename', '2019-01-28 (KL) Fixed YAML format in meta data', '2020-06-22 (KL) Updated file to match the MMS configuration from Carmelo', '2020-08-17 (KL) Pegged temperature to atmosphere', '2020-12-03 (KL)'], 'z_order': [20, 120, 520], 'include': True, 'ignore_wings': False, 'wave_min': 0.7, 'wave_max': 2.5, 'wave_unit': 'um', 'wave_bin': 0.0001, 'bg_cell_width': 60, 'report_plot_include': True, 'report_table_include': True, 'minimum_throughput': 1e-06, 'etendue': <Quantity 0.01560376 arcsec2 m2>} \n",
+ "MORFEO_surface_list {'filename': 'LIST_mirrors_MORFEO_mms.tbl', 'description': 'list of surfaces in MORFEO', 'history': ['ASCII table read from /Users/yixiancao/Work/MICADO/simcado2/imaging_sim/inst_pkgs/MORFEO/LIST_mirrors_maory_mms.tbl'], 'name': 'maory_surface_list', 'temperature': 7, 'element_name': 'MORFEO', 'comments': ['author : Kieran Leschinski', 'name : maory_mirror_list', 'source : Carmelo Archidiacono private email', 'date_created : 2018-11-19', 'date_modified : 2020-06-22', 'status : Design, new MORFEO MMS design', 'outer_unit : m', 'inner_unit : m', 'angle_unit : degree', 'temperature_unit : deg_C', 'changes :', '- 2018-11-19 (KL) Added meta data, changed Dichr. filename', '- 2019-01-28 (KL) Fixed YAML format in meta data', '- 2020-06-22 (KL) Updated file to match the MMS configuration from Carmelo', '- 2020-08-17 (KL) Pegged temperature to atmosphere', '- 2020-12-03 (KL)', ''], 'author': 'Kieran Leschinski', 'source': 'Carmelo Archidiacono private email', 'date_created': datetime.date(2018, 11, 19), 'date_modified': datetime.date(2020, 6, 22), 'status': 'Design, new MORFEO MMS design', 'outer_unit': 'm', 'inner_unit': 'm', 'angle_unit': 'degree', 'temperature_unit': 'deg_C', 'changes': ['2018-11-19 (KL) Added meta data, changed Dichr. filename', '2019-01-28 (KL) Fixed YAML format in meta data', '2020-06-22 (KL) Updated file to match the MMS configuration from Carmelo', '2020-08-17 (KL) Pegged temperature to atmosphere', '2020-12-03 (KL)'], 'z_order': [20, 120, 520], 'include': True, 'ignore_wings': False, 'wave_min': 0.7, 'wave_max': 2.5, 'wave_unit': 'um', 'wave_bin': 0.0001, 'bg_cell_width': 60, 'report_plot_include': True, 'report_table_include': True, 'minimum_throughput': 1e-06, 'etendue': <Quantity 0.01560376 arcsec2 m2>} \n",
"\n",
- "maory_generic_psf {'filename': 'PSF_MCAO_ConstPSF_40_18_6.fits', 'description': 'MAORY field varying MCAO PSF', 'history': ['Opened handle to FITS file /Users/yixiancao/Work/MICADO/simcado2/imaging_sim/inst_pkgs/MAORY/PSF_MCAO_ConstPSF_40_18_6.fits'], 'name': 'maory_generic_psf', 'temperature': 7, 'element_name': 'MAORY', 'warning': 'Default PSF is not Field Varying. See Documentation', 'SIMPLE': True, 'BITPIX': 8, 'NAXIS': 0, 'EXTEND': True, 'AUTHOR': 'Kieran Leschinski', 'DATE_CRE': '2019-07-30', 'DATE_MOD': '2019-07-30', 'SOURCE': 'AnisoCADO', 'STATUS': 'Best guess for a MAORY ConstantPSF with AnisoCADO', 'ETYPE': 'CONSTPSF', 'ECAT': -1, 'EDATA': 1, 'XOFFSET': 0, 'YOFFSET': 0, 'z_order': [262, 662], 'include': True, 'flux_accuracy': 0.001, 'sub_pixel_flag': False, 'convolve_mode': 'same', 'bkg_width': -1, 'wave_key': 'WAVE0', 'normalise_kernel': True, 'rotational_blur_angle': 0, 'report_plot_include': True, 'report_table_include': False} \n",
+ "MORFEO_generic_psf {'filename': 'PSF_MCAO_ConstPSF_40_18_6.fits', 'description': 'MORFEO field varying MCAO PSF', 'history': ['Opened handle to FITS file /Users/yixiancao/Work/MICADO/simcado2/imaging_sim/inst_pkgs/MORFEO/PSF_MCAO_ConstPSF_40_18_6.fits'], 'name': 'maory_generic_psf', 'temperature': 7, 'element_name': 'MORFEO', 'warning': 'Default PSF is not Field Varying. See Documentation', 'SIMPLE': True, 'BITPIX': 8, 'NAXIS': 0, 'EXTEND': True, 'AUTHOR': 'Kieran Leschinski', 'DATE_CRE': '2019-07-30', 'DATE_MOD': '2019-07-30', 'SOURCE': 'AnisoCADO', 'STATUS': 'Best guess for a MORFEO ConstantPSF with AnisoCADO', 'ETYPE': 'CONSTPSF', 'ECAT': -1, 'EDATA': 1, 'XOFFSET': 0, 'YOFFSET': 0, 'z_order': [262, 662], 'include': True, 'flux_accuracy': 0.001, 'sub_pixel_flag': False, 'convolve_mode': 'same', 'bkg_width': -1, 'wave_key': 'WAVE0', 'normalise_kernel': True, 'rotational_blur_angle': 0, 'report_plot_include': True, 'report_table_include': False} \n",
"\n",
"micado_wide_field_mirror_list {'filename': 'LIST_MICADO_mirrors_wide.dat', 'description': 'list of extra mirrors needed for the wide field mode', 'history': ['ASCII table read from /Users/yixiancao/Work/MICADO/simcado2/imaging_sim/inst_pkgs/MICADO/LIST_MICADO_mirrors_wide.dat'], 'name': 'micado_wide_field_mirror_list', 'pixel_scale': 0.004, 'plate_scale': 0.26666666666, 'element_name': 'MICADO_IMG_LR', 'comments': ['author : Kieran Leschinski', \"source : Ric's SPIE 2018 PPT presentation\", 'date_created : 2018-11-19', 'date_modified : 2019-07-10', 'status : Design, pre PDR list of MICADO mirrors for wide-field mode', 'type : mirror:list', 'outer_unit : m', 'inner_unit : m', 'angle_unit : degree', 'temperature_unit : deg_C', 'report_table_caption: The list of surfaces from the rotating optics wheel that are added to the optical train when observing in the wide field mode', 'changes :', '- 2019-01-28 (KL) Changed column names and added units to header', '- 2019-07-10 (KL) Shortened the list to only the swappable mirrors', ''], 'author': 'Kieran Leschinski', 'source': \"Ric's SPIE 2018 PPT presentation\", 'date_created': datetime.date(2018, 11, 19), 'date_modified': datetime.date(2019, 7, 10), 'status': 'Design, pre PDR list of MICADO mirrors for wide-field mode', 'type': 'mirror:list', 'outer_unit': 'm', 'inner_unit': 'm', 'angle_unit': 'degree', 'temperature_unit': 'deg_C', 'report_table_caption': 'The list of surfaces from the rotating optics wheel that are added to the optical train when observing in the wide field mode', 'changes': ['2019-01-28 (KL) Changed column names and added units to header', '2019-07-10 (KL) Shortened the list to only the swappable mirrors'], 'z_order': [20, 120, 520], 'include': True, 'ignore_wings': False, 'wave_min': 0.7, 'wave_max': 2.5, 'wave_unit': 'um', 'wave_bin': 0.0001, 'bg_cell_width': 60, 'report_plot_include': True, 'report_table_include': True, 'minimum_throughput': 1e-06, 'etendue': <Quantity 0.01560376 arcsec2 m2>} \n",
"\n"
@@ -387,7 +387,7 @@
{
"data": {
"text/plain": [
- "FieldConstantPSF: \"maory_generic_psf\""
+ "FieldConstantPSF: \"MORFEO_generic_psf\""
]
},
"execution_count": 57,
@@ -396,7 +396,7 @@
}
],
"source": [
- "micado[\"maory_generic_psf\"]"
+ "micado[\"MORFEO_generic_psf\"]"
]
},
{
diff --git a/notebooks/std_raw.py b/notebooks/std_raw.py
index 3c5930a95dbefa3c726d898b2870631f6b7f6f4b..5b01d9ec329b7c481dd23056cee31f1c0b8a7c70 100644
--- a/notebooks/std_raw.py
+++ b/notebooks/std_raw.py
@@ -119,6 +119,6 @@ for effect_name in ["filter_wheel_1", "filter_wheel_2", "pupil_wheel"]:
micado.cmds.modes
-micado["maory_generic_psf"]
+micado["MORFEO_generic_psf"]
diff --git a/setup.cfg b/setup.cfg
index 5211331a456ad96db2f277fd7f0c0d376a397ed0..a12e0af830c0430362f7b2d744f3a2a24882b205 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -2,8 +2,10 @@
filterwarnings =
error
# Triggered by ScopeSIM:
- ignore:In a future version top level function calls will be removed:DeprecationWarning:scopesim
+ ignore:In a future version top level function calls will be removed:DeprecationWarning
ignore:Please use `zoom`:DeprecationWarning:scopesim
+ ignore:`np.bool8` is a deprecated alias for `np.bool_`:DeprecationWarning
+ ignore:Conversion of an array with ndim > 0 to a scalar is deprecated:DeprecationWarning
# Dividing by 0:
ignore:invalid value encountered in true_divide:RuntimeWarning
ignore:invalid value encountered in divide:RuntimeWarning
diff --git a/src/micado/main/ImstatExtra.py b/src/micado/main/ImstatExtra.py
index 23e5002999060fdfd296dd4fa1aadeef64855973..78ac35d6f8b05ff8c61fd80b05927b13044bbc29 100644
--- a/src/micado/main/ImstatExtra.py
+++ b/src/micado/main/ImstatExtra.py
@@ -22,8 +22,8 @@ class ImstatExtra(MObject):
# in particular in combination with storing to FITS files and
# reading the number back. At least for certain combinations
# of numpy and astropy, e.g. 1.21.1 and 4.3.post1.
- self.min = fitsfloat(float(numpy.round_(numpy.min(images), 14)))
- self.max = fitsfloat(float(numpy.round_(numpy.max(images), 14)))
- self.mean = fitsfloat(float(numpy.round_(numpy.mean(images), 14)))
- self.std = fitsfloat(float(numpy.round_(numpy.std(images), 14)))
- self.median = fitsfloat(float(numpy.round_(numpy.median(images), 14)))
+ self.min = fitsfloat(float(numpy.round(numpy.min(images), 14)))
+ self.max = fitsfloat(float(numpy.round(numpy.max(images), 14)))
+ self.mean = fitsfloat(float(numpy.round(numpy.mean(images), 14)))
+ self.std = fitsfloat(float(numpy.round(numpy.std(images), 14)))
+ self.median = fitsfloat(float(numpy.round(numpy.median(images), 14)))
diff --git a/src/micado/main/ObservingBlockExtra.py b/src/micado/main/ObservingBlockExtra.py
index 714f99f6e5531475898ec4a38e5187a94bac61eb..31e1c04c1ed7f303dd4ea324335d8a1e5eaab9e9 100644
--- a/src/micado/main/ObservingBlockExtra.py
+++ b/src/micado/main/ObservingBlockExtra.py
@@ -12,8 +12,8 @@ class ObservingBlockExtra(MObject):
"""An Observing Block."""
prepend_append = {
- "empty_sky": ("scopesim_templates.calibration.calibration.", "()"),
- "cluster": ("scopesim_templates.stellar.clusters.", "()"),
+ "empty_sky": ("scopesim_templates.micado.", "()"),
+ "cluster": ("scopesim_templates.micado.", "()"),
}
@classmethod
diff --git a/src/micado/main/RawExtra.py b/src/micado/main/RawExtra.py
index 920040515a54ac8fe5dc30ff83baa1460e211bd1..777cffd54a3a5f6c2af6be17cb10e11479c311a4 100644
--- a/src/micado/main/RawExtra.py
+++ b/src/micado/main/RawExtra.py
@@ -188,8 +188,8 @@ class RawExtra(BaseFrame):
# putting the necessary files on the dataserver with the
# corresponding object.
# scopesim.server.download_package("telescopes/ELT")
- # scopesim.server.download_package("instrumnents/MICADO")
- # scopesim.server.download_package("instrumnents/MAORY")
+ # scopesim.server.download_package("instruments/MICADO")
+ # scopesim.server.download_package("instruments/MORFEO")
# scopesim.server.download_package("locations/Armazones")
# The download is not necessary anymore, because the files
# are now available in a submodule.
diff --git a/src/micado/main/TemplateExtra.py b/src/micado/main/TemplateExtra.py
index 19bef4dfc13d13f033b263f0485f81b6db4f0a29..d311187655bf859a13de1cecd0f1b8cbbe649072 100644
--- a/src/micado/main/TemplateExtra.py
+++ b/src/micado/main/TemplateExtra.py
@@ -70,7 +70,7 @@ class TemplateExtra(MObject):
"name": "MICADO_configuration",
"description": "parameters needed for a MICADO simulation",
# Packages are needed to find files.
- "packages": ["Armazones", "ELT", "MAORY", "MICADO"],
+ "packages": ["Armazones", "ELT", "MORFEO", "MICADO"],
"properties": {"dit": self.det__dit, "ndit": self.det__ndit},
}
diff --git a/src/micado/test/functional/stack_test.py b/src/micado/test/functional/stack_test.py
index b5659b12b697f4db27c2720a1600be1cc977aae7..b44c95eef304d7532404b40a89113a964276343b 100644
--- a/src/micado/test/functional/stack_test.py
+++ b/src/micado/test/functional/stack_test.py
@@ -34,7 +34,7 @@ def test_stack():
scopesim.server.download_package("telescopes/ELT")
scopesim.server.download_package("instruments/MICADO")
- scopesim.server.download_package("instruments/MAORY")
+ scopesim.server.download_package("instruments/MORFEO")
scopesim.server.download_package("locations/Armazones")
filt1, filt2, inst, ro = get_filt_inst_ro()
diff --git a/src/micado/toolbox/download_scopesim_data.py b/src/micado/toolbox/download_scopesim_data.py
index 6e40918ca0abd0a7ef53203f1745f8a58e3a930f..09492ed06695ecab1a513f8bf602e4ea13719cae 100644
--- a/src/micado/toolbox/download_scopesim_data.py
+++ b/src/micado/toolbox/download_scopesim_data.py
@@ -8,8 +8,8 @@ def main():
"""Download data necessary for ScopeSIM."""
scopesim.server.download_package("telescopes/ELT")
scopesim.server.download_package("telescopes/ELT")
- scopesim.server.download_package("instrumnents/MICADO")
- scopesim.server.download_package("instrumnents/MAORY")
+ scopesim.server.download_package("instruments/MICADO")
+ scopesim.server.download_package("instruments/MORFEO")
scopesim.server.download_package("locations/Armazones")
diff --git a/src/micado/util/irdb.py b/src/micado/util/irdb.py
index b02ac6299ae646e55303857eb4da7ca51977e652..5188e0b71d076fecc02c74122f14a5c0c526d1d3 100644
--- a/src/micado/util/irdb.py
+++ b/src/micado/util/irdb.py
@@ -22,7 +22,7 @@ import yaml
# PATH_IRDB = Path(irdb.__path__[0])
-def get_path_irdb(needed=["Armazones", "ELT", "MICADO", "LFOA", "MAORY"]):
+def get_path_irdb(needed=["Armazones", "ELT", "MICADO", "LFOA", "MORFEO"]):
"""return path to irdb"""
for test_path in scopesim.rc.__search_path__:
if os.path.exists(test_path):