From a9e5c37e78c65d20794915faa53db80cc7481294 Mon Sep 17 00:00:00 2001
From: LukasK13 <spam.lukas.klass@gmail.com>
Date: Sat, 16 May 2020 15:52:44 +0200
Subject: [PATCH] Configuration updated

---
 esbo-etc_defaults.xml | 77 +++++++++++++++++++++++--------------------
 1 file changed, 41 insertions(+), 36 deletions(-)

diff --git a/esbo-etc_defaults.xml b/esbo-etc_defaults.xml
index 760f209..afa33e2 100644
--- a/esbo-etc_defaults.xml
+++ b/esbo-etc_defaults.xml
@@ -1,55 +1,60 @@
 <root>
     <common>
-        <wl_min val="400" val_unit="nm" comment="Shortest wavelength used for binning input spectra"/>
-        <wl_max val="500" val_unit="nm" comment="Shortest wavelength used for binning input spectra"/>
-        <wl_delta val="10" val_unit="nm" comment="Wavelength increment used for binning input spectra"/>
+        <wl_min val="3" val_unit="um" comment="Shortest wavelength used for binning input spectra"/>
+        <wl_max val="5" val_unit="um" comment="Shortest wavelength used for binning input spectra"/>
+        <wl_delta val="1" val_unit="nm" comment="Wavelength increment used for binning input spectra"/>
 <!--        <res val="1000" val_unit=""-->
 <!--                   comment="Resolving power for common spectral binning. A linear binning wavelength integral is estimated as wl_min/R"/>-->
-        <d_aperture val="5" val_unit="m" comment="Diameter of the telescope aperture"/>
-        <jitter_rms val="0.1" val_unit="arcsec" comment="Sigma RMS of the telescope jitter"/>
+        <d_aperture val="0.5" val_unit="m" comment="Diameter of the telescope aperture"/>
+        <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"/>
     </common>
 
-    <noise>
-        <EnableJitter val="False"/>
-        <EnableShotNoise val="True"/>
-        <EnableReadoutNoise val="True"/>
-    </noise>
-
     <astroscene>
-        <target type="BlackBodyTarget" temp="5778" temp_unit="K" mag="10" band="V"
-                comment="Modeling the sun as mag 10 star"/>
-        <optical_component type="Atmosphere" transmittance="data/atmosphere/transmittance.csv"
-                           emission="data/atmosphere/emission.csv" comment="Including the atmosphere"/>
-        <optical_component type="StrayLight" emission="data/strayLight/emission.csv"
-                           comment="Including arbitrary noise sources"/>
+        <target type="BlackBodyTarget" temp="5778" temp_unit="K" mag="10" mag_unit="mag" band="M" size="point"
+                comment="Modeling the sun as mag 10 star. Size can be point or extended"/>
+        <optical_component type="Atmosphere" transmittance="data/atmosphere/ESBO-DS_transmittance.txt"
+                           emission="data/atmosphere/ESBO-DS_emission.txt" comment="Including the atmosphere"/>
+<!--        <optical_component type="StrayLight" emission="data/strayLight/emission.csv"-->
+<!--                           comment="Including arbitrary noise sources"/>-->
     </astroscene>
 
     <common_optics>
-        <optical_component type="Mirror" reflectance="data/mirror/reflectance.csv"
-                           emissivity="data/mirror/emissivity.csv" temp="70" temp_unit="K" comment="M1"/>
-        <optical_component type="Mirror" reflectance="data/mirror/reflectance.csv"
-                           emissivity="data/mirror/emissivity.csv" temp="70" temp_unit="K" comment="M2"/>
-        <optical_component type="Mirror" reflectance="data/mirror/reflectance.csv"
-                           emissivity="data/mirror/emissivity.csv" temp="70" temp_unit="K" comment="M3"/>
-<!--        <optical_component type="Filter" band="B"-->
-<!--                           emissivity="data/filter/emissivity.csv" val="70" val_unit="K" comment="Filter wheel"/>-->
-        <optical_component type="Filter" start="400" start_unit="nm" end="480" end_unit="nm"
-                           emissivity="data/filter/emissivity.csv" temp="70" temp_unit="K" comment="Filter wheel"/>
+        <optical_component type="Mirror" reflectance="data/mirror/Reflectance_UV-enhanced-aluminium-mirror.txt"
+                           emissivity="1" temp="70" temp_unit="K" obstruction="0.04" comment="M1"/>
+        <optical_component type="Mirror" reflectance="data/mirror/Reflectance_UV-enhanced-aluminium-mirror.txt"
+                           emissivity="1" temp="70" temp_unit="K" comment="M2"/>
+        <optical_component type="Mirror" reflectance="data/mirror/Reflectance_UV-enhanced-aluminium-mirror.txt"
+                           emissivity="1" temp="70" temp_unit="K" comment="M3"/>
+<!--        <optical_component type="Filter" band="M"-->
+<!--                           emissivity="data/filter/emissivity.csv" temp="70" temp_unit="K" comment="Filter wheel"/>-->
+<!--        <optical_component type="Filter" start="400" start_unit="nm" end="480" end_unit="nm"-->
+<!--                           emissivity="data/filter/emissivity.csv" temp="70" temp_unit="K" comment="Filter wheel"/>-->
     </common_optics>
 
     <instrument>
-        <optical_component type="Lens" transmittance="data/lens/transmittance.csv"
-                           emissivity="data/lens/emissivity.csv" temp="70" temp_unit="K" comment="M4"/>
-        <sensor type="CCD">
-            <f_number val="18.5" val_unit="" comment="The working f/#"/>
-            <pixel_geometry val="1024, 1024" val_unit="" comment="Pixel geometry"/>
+        <optical_component type="Lens" transmittance="data/lens/Reflectance_UV-enhanced-aluminium-mirror.txt"
+                           emissivity="1" temp="70" temp_unit="K" comment="M4"/>
+        <sensor type="Imager">
+            <f_number val="13" val_unit="" comment="The working f/#"/>
+            <pixel_geometry val="1024, 1024" val_unit="pix" comment="Pixel geometry"/>
+            <center_offset val="0.0, 0.0" val_unit="pix" comment="Shift of the array center"/>
             <pixel>
-                <quantum_efficiency val="data/ccd/qe.csv" comment="Quantum efficiency of the detector pixel"/>
-                <pixel_size val="15" val_unit="micron"/>
-                <dark_current val="20" val_unit="1/s" comment="Detector dark current"/>
-                <sigma_read_out val="10.0" val_unit="" comment="Detector readout noise in e-rms"/>
+                <quantum_efficiency val="data/ccd/PCO-Edge-42-QE.txt" comment="Quantum efficiency of the detector pixel"/>
+                <pixel_size val="6.5" val_unit="um"/>
+                <dark_current val="0.6" val_unit="electron / (pix * s)" comment="Detector dark current"/>
+                <sigma_read_out val="1.4" val_unit="electron(1/2) / pix" comment="Detector readout noise in e-rms"/>
+                <well_capacity val="30000" val_unit="electron" comment="Well capacity of a pixel"/>
             </pixel>
+            <photometric_aperture comment="The photometric aperture used to calculate signal and noise.">
+                <shape val="square" comment="Shape of the photometric aperture. Can be square / circle"/>
+                <contained_energy val="80" comment="Contained energy for calculating the SNR. Can be Peak, FWHM, Min or the percentage of encircled energy."/>
+<!--                <contained_pixels val="100" val_unit="pix" comment="Number of contained pixels."/>-->
+            </photometric_aperture>
         </sensor>
     </instrument>
 </root>