From f21449d977a04ca7790ab9b45dc47d7911ea0327 Mon Sep 17 00:00:00 2001
From: LukasK13 <spam.lukas.klass@gmail.com>
Date: Tue, 21 Jul 2020 13:45:40 +0200
Subject: [PATCH] Path updated

---
 Jenkinsfile                           |  5 +-
 esbo-etc_defaults.xml                 | 79 ++++++++++++++-------------
 esbo_etc/classes/sensor/Heterodyne.py |  4 +-
 3 files changed, 46 insertions(+), 42 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index a99e9f3..bd969cb 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -28,13 +28,16 @@ pipeline {
                 // clear out old files
                 sh 'rm -rf ${BUILD_DIR}'
                 sh 'rm -f ${SPHINX_DIR}/sphinx-build.log'
-                sh 'ls ${WORKSPACE}'
+                sh 'ls'
+                sh 'pyenv/bin/sphinx-build -b html docs/source docs/build/html'
+                /*
                 sh '''
                    ${WORKSPACE}/pyenv/bin/sphinx-build \
                    -q -w ${SPHINX_DIR}/sphinx-build.log \
                    -b html \
                    -d ${SPHINX_DIR}/${BUILD_DIR}/doctrees ${SPHINX_DIR}/${SOURCE_DIR} ${SPHINX_DIR}/${BUILD_DIR}
                 '''
+                */
                 archiveArtifacts 'docs/build/html'
             }
             post {
diff --git a/esbo-etc_defaults.xml b/esbo-etc_defaults.xml
index be173ce..88d84ab 100644
--- a/esbo-etc_defaults.xml
+++ b/esbo-etc_defaults.xml
@@ -1,62 +1,63 @@
 <root>
     <common>
-        <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="0.5" val_unit="m" comment="Diameter of the telescope aperture"/>
+        <wl_min val="207.5" val_unit="um" comment="Shortest wavelength used for binning input spectra"/>
+        <wl_max val="207.8" val_unit="um" comment="Shortest wavelength used for binning input spectra"/>
+        <wl_delta val="0.15" val_unit="nm" comment="Wavelength increment used for binning input spectra"/>
+        <res val="1.3127e6" 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"/>
         <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="output" format="fits" comment="Output directory to store output files"/>
-        <exposure_time val="0.1, 1.2" val_unit="s" comment="The exposure time"/>
+        <exposure_time val="2300" 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>
-        <target type="BlackBodyTarget" temp="5778" temp_unit="K" mag="10" mag_unit="mag" band="M"
-                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"/>
+        <target type="BlackBodyTarget" temp="26" temp_unit="K"/>
+<!--        <target type="FileTarget" file="data/target/science_case_point.csv"/>-->
+<!--        <target type="FileTarget" file="data/target/science_case.csv"/>-->
+        <optical_component type="Atmosphere" transmittance="data/atmosphere/science_case_hcl.csv"/>
+        <optical_component type="CosmicBackground" temp="2.725" temp_unit="K"/>
+        <optical_component type="Atmosphere" transmittance="data/atmosphere/science_case.csv"
+        emission="data/atmosphere/science_case_emission.csv"/>
 <!--        <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_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"/>-->
+        <optical_component type="Mirror" reflectance="data/mirror/science_case.csv"
+                           emissivity="0.05" temp="-15" temp_unit="Celsius" obstruction="0.004"
+                           obstructor_temp="-20" obstructor_temp_unit="Celsius" obstructor_emissivity="0.05"
+                           comment="M1"/>
+        <optical_component type="Mirror" reflectance="data/mirror/science_case.csv"
+                           emissivity="0.05" temp="-20" temp_unit="Celsius" comment="M2"/>
+        <optical_component type="Mirror" reflectance="data/mirror/science_case.csv"
+                           emissivity="0.05" temp="-20" temp_unit="Celsius" comment="M3"/>
+        <optical_component type="Mirror" reflectance="data/mirror/science_case.csv"
+                           emissivity="0.05" temp="-20" temp_unit="Celsius" comment="M4"/>
+        <optical_component type="Mirror" reflectance="data/mirror/science_case.csv"
+                           emissivity="0.05" temp="-20" temp_unit="Celsius" comment="M5"/>
+        <optical_component type="Mirror" reflectance="data/mirror/science_case.csv"
+                           emissivity="0.05" temp="4" temp_unit="K" comment="M6"/>
+        <optical_component type="Mirror" reflectance="data/mirror/science_case.csv"
+                           emissivity="0.05" temp="4" temp_unit="K" comment="M7"/>
+        <optical_component type="Mirror" reflectance="data/mirror/science_case.csv"
+                           emissivity="0.05" temp="4" temp_unit="K" comment="M8"/>
     </common_optics>
 
     <instrument>
-        <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/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 type="Heterodyne">
+            <aperture_efficiency val="0.55" val_unit=""/>
+            <main_beam_efficiency val="0.67" val_unit=""/>
+            <receiver_temp val="1050" val_unit="K"/>
+            <eta_fss val="0.97" val_unit=""/>
+            <lambda_line val="207.613" val_unit="um"/>
+            <kappa val="1" val_unit=""/>
+<!--            <n_on val="10" val_unit=""/>-->
         </sensor>
     </instrument>
 </root>
diff --git a/esbo_etc/classes/sensor/Heterodyne.py b/esbo_etc/classes/sensor/Heterodyne.py
index baa4aef..81e8ecc 100644
--- a/esbo_etc/classes/sensor/Heterodyne.py
+++ b/esbo_etc/classes/sensor/Heterodyne.py
@@ -314,8 +314,8 @@ class Heterodyne(ASensor):
         else:
             signal = SpectralQty(signal.wl, signal.qty.to(u.W / (u.m ** 2 * u.Hz * u.sr),
                                                           equivalencies=u.spectral_density(signal.wl)))
-            t_signal = signal * (u.sr * self.__main_beam_efficiency * self.__lambda_line ** 2 / (
-                    2 * k_B) * self.__eta_fss)
+            t_signal = signal * (self.__main_beam_efficiency * signal.wl ** 2 / (
+                    2 * k_B) * self.__eta_fss * u.sr)
             t_signal = SpectralQty(t_signal.wl, t_signal.qty.decompose())
         logger.debug("Spectral signal temperature")
         logger.debug(t_signal)