Merge pull request #98 from AstarVienna/hb/morfeo

Rename MAORY to MORFEO
AstarVienna · Jul 10, 2023 · 975804d · 975804d
2 parents ebda0e6 + e87496d
commit 975804d
Show file tree

Hide file tree

Showing 32 changed files with 71 additions and 71 deletions.
diff --git a/HAWKI/TER_mirror_gold.dat b/HAWKI/TER_mirror_gold.dat
@@ -2,7 +2,7 @@
 # source : Ric Davies
 # date_created : 2016-11-22
 # date_modified : 2019-01-28
-# status : Design, pre PDR list of MAORY mirrors
+# status : Design, pre PDR list of MORFEO mirrors
 # type : mirror:reflection
 # wavelength_unit : um
 # description : Unprotected Gold

diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1,6 +1,6 @@
 include Armazones/*
 include ELT/*
-include MAORY/*
+include MORFEO/*
 include MICADO/*
 include SimpleCADO/*
 include test_package/*
diff --git a/MICADO/default.yaml b/MICADO/default.yaml
@@ -7,7 +7,7 @@ description : default parameters needed for a MICADO simulation
 packages :
 - Armazones
 - ELT
-- MAORY
+- MORFEO
 - MICADO
 
 yamls :
@@ -50,7 +50,7 @@ mode_yamls :
   name : MCAO
   description : "MCAO optical system"
   yamls :
-  - MAORY.yaml
+  - MORFEO.yaml
 
 - object : observation
   alias: OBS

diff --git a/MICADO/docs/example_notebooks/1_scopesim_MCAO_4mas_galaxy-TLDR.ipynb b/MICADO/docs/example_notebooks/1_scopesim_MCAO_4mas_galaxy-TLDR.ipynb
@@ -8,7 +8,7 @@
     "# Observing a galaxy with MICADO in wide-field MCAO mode\n",
     "\n",
     "In this example we will generate a basic galaxy object with the help of the ``ScopeSim_templates`` package.\n",
-    "We will then create a model of the ELT+MAORY+MICADO optical system using the ``MICADO`` package. "
+    "We will then create a model of the ELT+MORFEO+MICADO optical system using the ``MICADO`` package. "
    ]
   },
   {

diff --git a/MICADO/docs/example_notebooks/1_scopesim_MCAO_4mas_galaxy.ipynb b/MICADO/docs/example_notebooks/1_scopesim_MCAO_4mas_galaxy.ipynb
@@ -8,7 +8,7 @@
     "# Observing a galaxy with MICADO in wide-field MCAO mode\n",
     "\n",
     "In this example we will generate a basic galaxy object with the help of the ``ScopeSim_templates`` package.\n",
-    "We will then create a model of the ELT+MAORY+MICADO optical system using the ``MICADO`` package. "
+    "We will then create a model of the ELT+MORFEO+MICADO optical system using the ``MICADO`` package. "
    ]
   },
   {
@@ -37,9 +37,9 @@
    "source": [
     "### Download the relevant scopesim instrument packages\n",
     "\n",
-    "We will need the ``MICADO_Sci`` package, as well as the support packages for ``Armazones``, the ``ELT``, and ``MAORY``. If you have not yet downloaded the packages, you can use the ``download_packages`` command. \n",
+    "We will need the ``MICADO_Sci`` package, as well as the support packages for ``Armazones``, the ``ELT``, and ``MORFEO``. If you have not yet downloaded the packages, you can use the ``download_packages`` command. \n",
     "\n",
-    "    sim.download_packages([\"Armazones\", \"ELT\", \"MAORY\", \"MICADO\"])\n",
+    "    sim.download_packages([\"Armazones\", \"ELT\", \"MORFEO\", \"MICADO\"])\n",
     "    \n",
     ".. note:: In ScopeSim v0.5 both download_packages (new format) and download_package (old format) exist.\n",
     "\n",

diff --git a/MICADO/docs/example_notebooks/2_scopesim_SCAO_1.5mas_astrometry.ipynb b/MICADO/docs/example_notebooks/2_scopesim_SCAO_1.5mas_astrometry.ipynb
@@ -38,9 +38,9 @@
    "source": [
     "As always, the first step is to make sure all instrument packages are present in the working directory.\n",
     "The assumption is that SCAO observations will use the MICADO internal SCAO system. \n",
-    "Hence the MAORY package is not required for this optical models.\n",
+    "Hence the MORFEO package is not required for this optical models.\n",
     "\n",
-    "    sim.download_packages([\"Armazones\", \"ELT\", \"MAORY\", \"MICADO\"])\n",
+    "    sim.download_packages([\"Armazones\", \"ELT\", \"MORFEO\", \"MICADO\"])\n",
     "    \n",
     ".. note:: In ScopeSim v0.5 both download_packages (new format) and download_package (old format) exist.\n",
     "\n",

diff --git a/MICADO/docs/example_notebooks/3_scopesim_SCAO_4mas_fv-psf.ipynb b/MICADO/docs/example_notebooks/3_scopesim_SCAO_4mas_fv-psf.ipynb
@@ -43,9 +43,9 @@
     "The PSF field-variation is complex and computationally expensive.\n",
     "Hence this functionality is not inluded in the ``MICADO`` package.\n",
     "For use cases requireing field variations we must use the pipeline-oriented ``MICADO`` package.\n",
-    "As we will be using the SCAO mode, we can ignore the ``MAORY`` module.\n",
+    "As we will be using the SCAO mode, we can ignore the ``MORFEO`` module.\n",
     "\n",
-    "    sim.download_packages([\"Armazones\", \"ELT\", \"MAORY\", \"MICADO\"])\n",
+    "    sim.download_packages([\"Armazones\", \"ELT\", \"MORFEO\", \"MICADO\"])\n",
     "    \n",
     ".. note:: In ScopeSim v0.5 both download_packages (new format) and download_package (old format) exist.\n",
     "\n",

diff --git a/MICADO/docs/example_notebooks/6_basic_spectroscopy.ipynb b/MICADO/docs/example_notebooks/6_basic_spectroscopy.ipynb
@@ -73,7 +73,7 @@
    "source": [
     "If you have not do so already, please download the relevant instrument packages using the following code in a new cell:\n",
     "\n",
-    "    sim.download_packages([\"Armazones\", \"ELT\", \"MAORY\", \"MICADO\"])\n",
+    "    sim.download_packages([\"Armazones\", \"ELT\", \"MORFEO\", \"MICADO\"])\n",
     "    \n",
     ".. note:: In ScopeSim v0.5 both download_packages (new format) and download_package (old format) exist.\n",
     "\n",

diff --git a/MICADO/docs/example_notebooks/MICADO_4_stars.ipynb b/MICADO/docs/example_notebooks/MICADO_4_stars.ipynb
@@ -34,7 +34,7 @@
     "# These notebooks should run on anyones computer.\n",
     "\n",
     "# Gijs's local computer\n",
-    "# sim.download_packages([\"Armazones\", \"ELT\", \"MAORY\", \"MICADO\"])\n",
+    "# sim.download_packages([\"Armazones\", \"ELT\", \"MORFEO\", \"MICADO\"])\n",
     "\n",
     "# Kieran's computer -> redirects ScopeSim to folder containing IRDB \n",
     "# MicadoWise could do this too and clone daily from github to save running time\n",

diff --git a/MICADO/test_micado/test_micado_compiles.py b/MICADO/test_micado/test_micado_compiles.py
@@ -35,7 +35,7 @@
 class TestInit:
     def test_all_packages_are_available(self):
         rc_local_path = rc.__config__["!SIM.file.local_packages_path"]
-        for pkg_name in ["Armazones", "ELT", "MAORY", "MICADO"]:
+        for pkg_name in ["Armazones", "ELT", "MORFEO", "MICADO"]:
             assert os.path.isdir(os.path.join(rc_local_path, pkg_name))
 
 
@@ -59,14 +59,14 @@ def test_user_commands_can_change_modes(self):
         cmd = scopesim.UserCommands(use_instrument="MICADO")
         cmd.set_modes(["MCAO", "SPEC_3000x50"])
 
-        assert "MAORY" in [yd["name"] for yd in cmd.yaml_dicts]
+        assert "MORFEO" in [yd["name"] for yd in cmd.yaml_dicts]
         assert "MICADO_SPEC" in [yd["name"] for yd in cmd.yaml_dicts]
 
     def test_user_commands_can_change_modes_via_init(self):
         cmd = scopesim.UserCommands(use_instrument="MICADO",
                                     set_modes=["MCAO", "SPEC_3000x50"])
 
-        assert "MAORY" in [yd["name"] for yd in cmd.yaml_dicts]
+        assert "MORFEO" in [yd["name"] for yd in cmd.yaml_dicts]
         assert "MICADO_SPEC" in [yd["name"] for yd in cmd.yaml_dicts]
 
 

diff --git a/MICADO_Sci/MICADO_Sci_MCAO.yaml b/MICADO_Sci/MICADO_Sci_MCAO.yaml
@@ -1,6 +1,6 @@
 #
 ##### MCAO
-#* MAORY TER
+#* MORFEO TER
 #* Detector Window
 #* PSF
 #    * MCAO StrehlPSF (max SR JHK-13/30/50)
@@ -16,14 +16,14 @@ properties:
         wavelength: "!OBS.filter_name"
 
 effects:
--   name: maory_mms_ter
-    description: Combined TER curve for MAORY MMS relay optics module
+-   name: morfeo_mms_ter
+    description: Combined TER curve for MORFEO MMS relay optics module
     class: TERCurve
     kwargs:
-        filename: TER_MAORY_MMS.dat
+        filename: TER_MORFEO_MMS.dat
 
--   name: maory_const_psf
-    description: field constant PSF as produced by MAORY
+-   name: morfeo_const_psf
+    description: field constant PSF as produced by MORFEO
     class: AnisocadoConstPSF
     kwargs:
         filename: "MICADO_AnisoCADO_rms_map.fits"

diff --git a/MICADO_Sci/TER_MAORY_MMS.dat → MICADO_Sci/TER_MORFEO_MMS.dat b/MICADO_Sci/TER_MAORY_MMS.dat → MICADO_Sci/TER_MORFEO_MMS.dat
@@ -1,5 +1,5 @@
 # author : Auto-compiled from source
-# source : LIST_mirrors_maory_mms.tbl
+# source : LIST_mirrors_morfeo_mms.tbl
 # description : SurfaceList collapsed into single TERCurve
 # date_created : 2020-08-25
 # date_modified : 2020-08-25

diff --git a/MICADO_Sci/code/compile.py b/MICADO_Sci/code/compile.py
@@ -13,8 +13,8 @@
 
 PLOTS = False
 
-MAORY_DIR = pth.abspath(pth.join(pth.dirname(__file__), "../../MAORY/"))
-rc.__search_path__.insert(0, MAORY_DIR)
+MORFEO_DIR = pth.abspath(pth.join(pth.dirname(__file__), "../../MORFEO/"))
+rc.__search_path__.insert(0, MORFEO_DIR)
 MICADO_DIR = pth.abspath(pth.join(pth.dirname(__file__), "../../MICADO/"))
 rc.__search_path__.insert(0, MICADO_DIR)
 MICADO_SCI_DIR = pth.abspath(pth.join(pth.dirname(__file__), "../"))
@@ -68,9 +68,9 @@ def compress_surface_list_to_ter(f_in, f_out, header_list=[], **kwargs):
 compress_surface_list_to_ter(f_in="LIST_RO_SCAO_mirrors.dat",
                              f_out="TER_MICADO_RO.dat", **kwargs)
 
-# MAORY common optics
-compress_surface_list_to_ter(f_in="LIST_mirrors_maory_mms.tbl",
-                             f_out="TER_MAORY_MMS.dat", **kwargs)
+# MORFEO common optics
+compress_surface_list_to_ter(f_in="LIST_mirrors_morfeo_mms.tbl",
+                             f_out="TER_MORFEO_MMS.dat", **kwargs)
 
 
 def generate_anisocado_strehl_map_for_micado():

diff --git a/MICADO_Sci/default.yaml b/MICADO_Sci/default.yaml
@@ -13,7 +13,7 @@ description : default parameters needed for a MICADO-Sci simulation
 packages :
 - Armazones
 - ELT
-- MAORY
+- MORFEO
 - MICADO
 - MICADO_Sci
 

diff --git a/MICADO_Sci/sci_readme.md b/MICADO_Sci/sci_readme.md
@@ -21,7 +21,7 @@
     * SCAO AnisoCADO ConstPSF   [MICADO_Sci_SCAO.yaml:INST]  
 
 #### MCAO
-* MAORY TER             [MICADO_Sci_MCAO.yaml:INST]
+* MORFEO TER             [MICADO_Sci_MCAO.yaml:INST]
 * Detector Window       [MICADO_sci_detector.yaml:DET, (w,h) in MICADO_Sci_MCAO.yaml:DET]
 * PSF
     * MCAO StrehlPSF (max SR JHK-13/30/50)  [MICADO_Sci_SCAO.yaml:INST]

diff --git a/MAORY/LIST_mirrors_maory_mms.tbl → MORFEO/LIST_mirrors_morfeo_mms.tbl b/MAORY/LIST_mirrors_maory_mms.tbl → MORFEO/LIST_mirrors_morfeo_mms.tbl
@@ -1,9 +1,9 @@
 # author : Kieran Leschinski
-# name : maory_mirror_list
+# name : morfeo_mirror_list
 # source : Carmelo Archidiacono private email
 # date_created : 2018-11-19
 # date_modified : 2020-06-22
-# status : Design, new MAORY MMS design
+# status : Design, new MORFEO MMS design
 # outer_unit : m
 # inner_unit : m
 # angle_unit : degree
@@ -17,11 +17,11 @@
 #
 name        outer   inner   angle   temperature         action          filename
 SchPlate    1.1     0.      0.      !ATMO.temperature   transmission    TER_entrance_window.dat
-M6          1.1     0.      0.      !ATMO.temperature   reflection      TER_MAORY_mirror_silver.dat
-M7          0.7     0.      0.      !ATMO.temperature   reflection      TER_MAORY_mirror_silver.dat
-M8          0.85    0.      0.      !ATMO.temperature   reflection      TER_MAORY_mirror_silver.dat
-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
-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
+M6          1.1     0.      0.      !ATMO.temperature   reflection      TER_MORFEO_mirror_silver.dat
+M7          0.7     0.      0.      !ATMO.temperature   reflection      TER_MORFEO_mirror_silver.dat
+M8          0.85    0.      0.      !ATMO.temperature   reflection      TER_MORFEO_mirror_silver.dat
+DM9         0.75    0.      0.      !ATMO.temperature   reflection      TER_MORFEO_mirror_mgf2agal.dat
+DM10        0.75    0.      0.      !ATMO.temperature   reflection      TER_MORFEO_mirror_mgf2agal.dat
+Dichroic    0.6     0.      0.      !ATMO.temperature   reflection      TER_MORFEO_lgs_dichroic.dat
+M11         0.8     0.      45.     !ATMO.temperature   reflection      TER_MORFEO_mirror_silver.dat
+M12         0.8     0.      0.      !ATMO.temperature   reflection      TER_MORFEO_mirror_silver.dat
diff --git a/MAORY/MAORY.yaml → MORFEO/MORFEO.yaml b/MAORY/MAORY.yaml → MORFEO/MORFEO.yaml
@@ -1,23 +1,23 @@
-### MAORY RELAY OPTICS
+### MORFEO RELAY OPTICS
 object : relay_optics
 alias : RO
-name : MAORY
-description : MAORY AO relay module
+name : MORFEO
+description : MORFEO AO relay module
 
 properties :
     temperature : "!ATMO.temperature"
 
 
 effects :
--   name: maory_surface_list
-    description : list of surfaces in MAORY
+-   name: morfeo_surface_list
+    description : list of surfaces in MORFEO
     class: SurfaceList
     kwargs:
-        # filename: LIST_mirrors_MCAO_MAORY.tbl     # 2020-06-30 (KL) File obsolete
-        filename: LIST_mirrors_maory_mms.tbl
+        # filename: LIST_mirrors_MCAO_MORFEO.tbl     # 2020-06-30 (KL) File obsolete
+        filename: LIST_mirrors_morfeo_mms.tbl
 
--   name : maory_generic_psf
-    description : MAORY field varying MCAO PSF
+-   name : morfeo_generic_psf
+    description : MORFEO field varying MCAO PSF
     class : FieldConstantPSF
     kwargs:
         filename : PSF_MCAO_ConstPSF_40_18_6.fits
@@ -26,8 +26,8 @@ effects :
 
 ####################### Alternative effects ####################################
 
-#-   name : maory_psf
-#    description : MAORY field varying MCAO PSF
+#-   name : morfeo_psf
+#    description : MORFEO field varying MCAO PSF
 #    class : FieldVaryingPSF
 #    include : False
 #    kwargs:

diff --git a/MAORY/PSF_MCAO_ConstPSF_40_18_6.fits → MORFEO/PSF_MCAO_ConstPSF_40_18_6.fits b/MAORY/PSF_MCAO_ConstPSF_40_18_6.fits → MORFEO/PSF_MCAO_ConstPSF_40_18_6.fits
diff --git a/MAORY/TER_MAORY_entrance_window.dat → MORFEO/TER_MORFEO_entrance_window.dat b/MAORY/TER_MAORY_entrance_window.dat → MORFEO/TER_MORFEO_entrance_window.dat
diff --git a/MAORY/TER_MAORY_lgs_dichroic.dat → MORFEO/TER_MORFEO_lgs_dichroic.dat b/MAORY/TER_MAORY_lgs_dichroic.dat → MORFEO/TER_MORFEO_lgs_dichroic.dat
@@ -1,5 +1,5 @@
 # source : E-MAO-SF0-INA-DER-001 from Carmelo Archidiacono
-# name : maory_lgs_dichroic_pickoff
+# name : morfeo_lgs_dichroic_pickoff
 # date_created : 2020-06-21
 # date_modified : 2022-10-28
 # wavelength_unit : um

diff --git a/MAORY/TER_MAORY_mirror_aluminium.dat → MORFEO/TER_MORFEO_mirror_aluminium.dat b/MAORY/TER_MAORY_mirror_aluminium.dat → MORFEO/TER_MORFEO_mirror_aluminium.dat
diff --git a/MAORY/TER_MAORY_mirror_gold.dat → MORFEO/TER_MORFEO_mirror_gold.dat b/MAORY/TER_MAORY_mirror_gold.dat → MORFEO/TER_MORFEO_mirror_gold.dat
@@ -3,7 +3,7 @@
 # description : Unprotected Gold
 # date_created : 2016-11-22
 # date_modified : 2020-08-25
-# status : Design, pre PDR list of MAORY mirrors
+# status : Design, pre PDR list of MORFEO mirrors
 # wavelength_unit : um
 #
 # changes :

diff --git a/MAORY/TER_MAORY_mirror_mgf2agal.dat → MORFEO/TER_MORFEO_mirror_mgf2agal.dat b/MAORY/TER_MAORY_mirror_mgf2agal.dat → MORFEO/TER_MORFEO_mirror_mgf2agal.dat
diff --git a/MAORY/TER_MAORY_mirror_silver.dat → MORFEO/TER_MORFEO_mirror_silver.dat b/MAORY/TER_MAORY_mirror_silver.dat → MORFEO/TER_MORFEO_mirror_silver.dat
@@ -3,7 +3,7 @@
 # description : Unprotected Silver
 # date_created : 2016-11-22
 # date_modified : 2020-08-25
-# status : Design, pre PDR list of MAORY mirrors
+# status : Design, pre PDR list of MORFEO mirrors
 # wavelength_unit : um
 #
 # notes:

diff --git a/MAORY/TER_mirror_silver.dat → MORFEO/TER_mirror_silver.dat b/MAORY/TER_mirror_silver.dat → MORFEO/TER_mirror_silver.dat
@@ -1,5 +1,5 @@
 # source : Carmelo Archidiacono
-# name : maory_silver_mirror_coating
+# name : morfeo_silver_mirror_coating
 # date_created : 2020-06-21
 # date_modified : 2020-06-22
 # wavelength_unit : um

diff --git a/MAORY/utils.py → MORFEO/utils.py b/MAORY/utils.py → MORFEO/utils.py
@@ -4,7 +4,7 @@
 
 def make_standard_scao_constpsf():
     waves = [1.2, 1.6, 2.15]
-    nmRms = [310, 310, 310]     # achieves the 40-18-6 Strehls for MAORY
+    nmRms = [310, 310, 310]     # achieves the 40-18-6 Strehls for MORFEO
     offset = [0, 0]
     psfs = []
     for wave, rms in zip(waves, nmRms):
@@ -17,7 +17,7 @@ def make_standard_scao_constpsf():
             "DATE_CRE" : "2019-07-30",
             "DATE_MOD" : "2019-07-30",
             "SOURCE" : "AnisoCADO",
-            "STATUS" : "Best guess for a MAORY ConstantPSF with AnisoCADO",
+            "STATUS" : "Best guess for a MORFEO ConstantPSF with AnisoCADO",
             "ETYPE" : "CONSTPSF",
             "ECAT" : (-1, "Field constant. No layer catalogue"),
             "EDATA" : (1, "PSFs begin from EXT 1"),

diff --git a/MAORY/version.yaml → MORFEO/version.yaml b/MAORY/version.yaml → MORFEO/version.yaml
diff --git a/README.md b/README.md
@@ -43,7 +43,7 @@ The data is split in the following way:
 
 * Armazones
 * ELT
-* MAORY
+* MORFEO
 * MICADO
 * METIS (under construction)
 

diff --git a/docs/source/Package_structure_unfinished.rst b/docs/source/Package_structure_unfinished.rst
@@ -21,7 +21,7 @@ RC parameter ``scopesim.__rc__["!SIM.file.local_packages_path"]``::
     packages :
     - Armazones
     - ELT
-    - MAORY
+    - MORFEO
     - MICADO
 
 Next a list of the yaml files containing the default setup for the optical
@@ -31,7 +31,7 @@ one of the packages listed above::
     yamls :
     - Armazones.yaml
     - ELT.yaml
-    - MAORY.yaml
+    - MORFEO.yaml
     - MICADO.yaml
     - MODE_IMG_wide.yaml
     - H4RG.yaml

diff --git a/docs/source/package_structure.rst b/docs/source/package_structure.rst
@@ -63,15 +63,15 @@ The default yaml file contains a list of everything needed for an
 ``OpticalTrain`` to be successfully built. This means it needs to reference any
 other packages which are needed for the full optical system. In the case of
 MICADO this means including the the location (Armazones), the telescope (ELT),
-and possibly an external relay optics (MAORY). These packages willl need to be
+and possibly an external relay optics (MORFEO). These packages willl need to be
 downloaded separately but should still be references in the ``default.yaml``
 file with the ``packages`` list.
 
 The default file should also contain a list of all the yaml files needed for the
 default configuration of the instrument, including those yaml files which are
 contained in other packages. This is only necessary if the package
 is a "primary package" - i.e. one that will be used to create detector readout
-images, e.g. MICADO. If the package is a "support package" (e.g. ELT, MAORY),
+images, e.g. MICADO. If the package is a "support package" (e.g. ELT, MORFEO),
 then this list isn't needed. **This list is referenced using the ``yamls``
 keyword**
 
@@ -89,13 +89,13 @@ Here is an example ot the ``OBS`` optical element yaml dictionary in a
     packages:
     - Armazones
     - ELT
-    - MAORY
+    - MORFEO
     - MICADO
 
     yamls:
     - Armazones.yaml
     - ELT.yaml
-    - MAORY.yaml
+    - MORFEO.yaml
     - MICADO.yaml
     - MICADO_IMG_wide.yaml
     - MICADO_H4RG.yaml