Merge pull request #41 from AstarVienna/dev_master

Dev master

scopesim_templates/__init__.py

@@ -14,5 +14,5 @@
 from .stellar.clusters import cluster
 from .extragalactic.galaxies import galaxy, galaxy3d, elliptical
 from .calibration.calibration import empty_sky
-from .calibration.micado import darkness, flatlamp
-from .calibration import micado
+from .micado import darkness, flatlamp
+from . import micado

scopesim_templates/calibration/__init__.py

@@ -1,2 +1 @@
 from .calibration import *
-from . import micado

scopesim_templates/micado/__init__.py

@@ -0,0 +1,31 @@
+from .darkness import darkness as _darkness
+from .flatlamp import flatlamp as _flatlamp
+from .cluster import cluster as _cluster
+from .viking_fields import viking_fields
+from ..utils.general_utils import add_function_call_str
+
+from . import spectral_calibrations
+
+@add_function_call_str
+def darkness():
+    return _darkness()
+
+
+@add_function_call_str
+def empty_sky():
+    # Include empty_sky for backwards compatibility reasons.
+    # TODO: Remove empty_sky when it is not used in MicadoWISE anymore.
+    return _darkness()
+
+
+@add_function_call_str
+def flatlamp():
+    return _flatlamp()
+
+
+@add_function_call_str
+def cluster():
+    return _cluster()
+
+
+__all__ = [darkness, flatlamp, empty_sky, cluster]

scopesim_templates/calibration/micado/cluster.py → scopesim_templates/micado/cluster.py

@@ -1,7 +1,10 @@
 """A standard cluster for MICADO."""
+from scopesim_templates.utils.general_utils import function_call_str, add_function_call_str
+
 import scopesim_templates.stellar.clusters
 
 
+@add_function_call_str
 def cluster():
     """A basic cluster."""
     return scopesim_templates.stellar.clusters.cluster(mass=10000, distance=2000, core_radius=.1)