From f21449d977a04ca7790ab9b45dc47d7911ea0327 Mon Sep 17 00:00:00 2001 From: LukasK13 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 @@ - - - - - - + + + + + - + - - + + + + + + - - - - - - - + + + + + + + + - - - - - - - - - - - - - - - - - + + + + + + + + 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)