From 4aa35f53c0be178e2b2085586142a6e5c4ad86eb Mon Sep 17 00:00:00 2001
From: LukasK13 <spam.lukas.klass@gmail.com>
Date: Sat, 23 May 2020 16:25:00 +0200
Subject: [PATCH] output path renamed

---
 esbo-etc_defaults.xml      | 8 +++++---
 esbo_etc/classes/Config.py | 6 ++++--
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/esbo-etc_defaults.xml b/esbo-etc_defaults.xml
index afa33e2..ffec30b 100644
--- a/esbo-etc_defaults.xml
+++ b/esbo-etc_defaults.xml
@@ -9,9 +9,11 @@
         <psf val="Airy" osf="10" osf_unit="" comment="PSF of the optical system. Can be Airy or a file"/>
 <!--        <psf val="data/psf_2um.txt" osf="10" osf_unit="" comment="PSF of the optical system. Can be Airy or a file"/>-->
 <!--        <jitter_sigma val="10" val_unit="arcsec" comment="Sigma of the telescope jitter"/>-->
-        <output_path val="output" comment="Output directory to store output files"/>
-        <exposure_time val="0.01" val_unit="s" comment="The exposure time"/>
-        <snr val="10" val_unit="" comment="Desired signal to noise ratio"/>
+        <output path="output" format="fits" comment="Output directory to store output files"/>
+        <exposure_time val="0.1, 1.2" val_unit="s" comment="The exposure time"/>
+<!--        <snr val="10, 10, 10" val_unit="" comment="Desired signal to noise ratio"/>-->
+<!--        <snr val="data/snr.csv" comment="Desired signal to noise ratio"/>-->
+<!--        <snr val="10" val_unit="" comment="Desired signal to noise ratio"/>-->
     </common>
 
     <astroscene>
diff --git a/esbo_etc/classes/Config.py b/esbo_etc/classes/Config.py
index efea093..cdd8e50 100644
--- a/esbo_etc/classes/Config.py
+++ b/esbo_etc/classes/Config.py
@@ -138,8 +138,10 @@ class Configuration(object):
             mes = self.conf.common.jitter_sigma.check_quantity("val", u.arcsec)
             mes is not None and error("Configuration check: common -> jitter_sigma: " + mes)
         if hasattr(self.conf.common, "output_path"):
-            mes = self.conf.common.output_path.check_path("val")
-            mes is not None and error("Configuration check: common -> output_path: " + mes)
+            mes = self.conf.common.output.check_path("path")
+            mes is not None and error("Configuration check: common -> output: " + mes)
+            mes = self.conf.common.output.check_selection("format", ["csv", "CSV", "fits", "FITS"])
+            mes is not None and error("Configuration check: common -> output: " + mes)
         else:
             setattr(self.conf.common, "output_path", Entry(val="."))
         if hasattr(self.conf.common, "exposure_time"):