To receive notifications about scheduled maintenance, please subscribe to the mailing-list gitlab-operations@sympa.ethz.ch. You can subscribe to the mailing-list at https://sympa.ethz.ch

Commit fdd99c58 authored by holukas's avatar holukas
Browse files

Removed bug in settings

parent 78c8ccf0
......@@ -4,11 +4,8 @@
<list default="true" id="254ecb79-655b-4854-8af6-177bb7347e8a" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/bico/bico.py" beforeDir="false" afterPath="$PROJECT_DIR$/bico/bico.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/bico/gui/gui.py" beforeDir="false" afterPath="$PROJECT_DIR$/bico/gui/gui.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/bico/ops/setup.py" beforeDir="false" afterPath="$PROJECT_DIR$/bico/ops/setup.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/bico/settings/Bico.settings" beforeDir="false" afterPath="$PROJECT_DIR$/bico/settings/Bico.settings" afterDir="false" />
<change beforePath="$PROJECT_DIR$/bico/settings/Bico.settingsOld" beforeDir="false" afterPath="$PROJECT_DIR$/bico/settings/Bico.settingsOld" afterDir="false" />
<change beforePath="$PROJECT_DIR$/bico/settings/_version.py" beforeDir="false" afterPath="$PROJECT_DIR$/bico/settings/_version.py" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
......@@ -302,6 +299,7 @@
<workItem from="1609370877343" duration="21000" />
<workItem from="1609370919139" duration="36000" />
<workItem from="1609372690529" duration="1334000" />
<workItem from="1609375009054" duration="500000" />
</task>
<servers />
</component>
......@@ -310,13 +308,6 @@
</component>
<component name="XDebuggerManager">
<breakpoint-manager>
<breakpoints>
<line-breakpoint enabled="true" suspend="THREAD" type="python-line">
<url>file://$PROJECT_DIR$/bico/bico.py</url>
<line>58</line>
<option name="timeStamp" value="8" />
</line-breakpoint>
</breakpoints>
<default-breakpoints>
<breakpoint type="python-exception">
<properties notifyOnTerminate="true" exception="BaseException">
......@@ -334,7 +325,7 @@
<SUITE FILE_PATH="coverage/BICO$main.coverage" NAME="bico Coverage Results" MODIFIED="1598258463691" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/bico" />
<SUITE FILE_PATH="coverage/BICO_Binary_Converter$gui.coverage" NAME="gui Coverage Results" MODIFIED="1606435918815" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/bico" />
<SUITE FILE_PATH="coverage/BICO_Binary_Converter$main.coverage" NAME="main Coverage Results" MODIFIED="1596498134562" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/bico" />
<SUITE FILE_PATH="coverage/BICO_Binary_Converter$start_bico.coverage" NAME="start_bico Coverage Results" MODIFIED="1609373954783" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/bico" />
<SUITE FILE_PATH="coverage/BICO_Binary_Converter$start_bico.coverage" NAME="start_bico Coverage Results" MODIFIED="1609375455556" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/bico" />
<SUITE FILE_PATH="coverage/BICO_Binary_Converter$example.coverage" NAME="example Coverage Results" MODIFIED="1606348759035" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/example" />
</component>
</project>
\ No newline at end of file
......@@ -54,8 +54,9 @@ class Bico(qtw.QMainWindow, Ui_MainWindow):
def run(self):
# Setup run
self.get_settings_from_gui()
self.save_settings_to_file(copy_to_outdir=True)
self.settings_dict = ops.setup.make_run_outdirs(settings_dict=self.settings_dict)
self.save_settings_to_file(copy_to_outdir=True)
self.logger = ops.logger.setup_logger(settings_dict=self.settings_dict)
self.logger.info(f"Run ID: {self.run_id}")
......
run_id=BICO-20201231-011915
run_id=BICO-20201231-014417
# INSTRUMENTS
# ===========
......@@ -34,15 +34,15 @@ select_random_files=0
# OUTPUT
# ======
dir_out=A:/FLUXES/x-TEST-OUT
dir_out_run=A:\FLUXES\x-TEST-OUT\BICO-20201230-141449
dir_out_run_log=A:\FLUXES\x-TEST-OUT\BICO-20201230-141449\log
dir_out_run_plots=A:\FLUXES\x-TEST-OUT\BICO-20201230-141449\plots
dir_out_run_plots_hires=A:\FLUXES\x-TEST-OUT\BICO-20201230-141449\plots\hires
dir_out_run_plots_agg=A:\FLUXES\x-TEST-OUT\BICO-20201230-141449\plots\agg
dir_out_run_raw_data_csv=A:\FLUXES\x-TEST-OUT\BICO-20201230-141449\raw_data_csv
dir_out=A:/FLUXES/x-TEST-OUT/holz
dir_out_run=A:\FLUXES\x-TEST-OUT\holz\_BICO-20201231-014417
dir_out_run_log=A:\FLUXES\x-TEST-OUT\holz\_BICO-20201231-014417\log
dir_out_run_plots=A:\FLUXES\x-TEST-OUT\holz\_BICO-20201231-014417\plots
dir_out_run_plots_hires=A:\FLUXES\x-TEST-OUT\holz\_BICO-20201231-014417\plots\hires
dir_out_run_plots_agg=A:\FLUXES\x-TEST-OUT\holz\_BICO-20201231-014417\plots\agg
dir_out_run_raw_data_csv=A:\FLUXES\x-TEST-OUT\holz\_BICO-20201231-014417\raw_data_csv
output_folder_name_prefix=20XX_1
output_folder_name_prefix=
file_compression=gzip
plot_file_availability=1
......
run_id=BICO-20201231-011421
run_id=BICO-20201231-014347
# INSTRUMENTS
# ===========
......@@ -9,7 +9,7 @@ site=CH-AES
# Data Blocks
header=WECOM3
instrument_1=R350-A
instrument_2=IRGA75-A-GN1
instrument_2=IRGA75-A
instrument_3=LGR-A
# RAW DATA
......@@ -27,14 +27,14 @@ filename_datetime_format=yyyymmddHH.XMM
file_ext=*.X*
file_size_min=900
file_limit=1
row_limit=0
row_limit=100
# Special
select_random_files=0
# OUTPUT
# ======
dir_out=A:/FLUXES/x-TEST-OUT
dir_out=A:/FLUXES/x-TEST-OUT/holz
dir_out_run=A:\FLUXES\x-TEST-OUT\BICO-20201230-141449
dir_out_run_log=A:\FLUXES\x-TEST-OUT\BICO-20201230-141449\log
dir_out_run_plots=A:\FLUXES\x-TEST-OUT\BICO-20201230-141449\plots
......@@ -42,7 +42,7 @@ dir_out_run_plots_hires=A:\FLUXES\x-TEST-OUT\BICO-20201230-141449\plots\hires
dir_out_run_plots_agg=A:\FLUXES\x-TEST-OUT\BICO-20201230-141449\plots\agg
dir_out_run_raw_data_csv=A:\FLUXES\x-TEST-OUT\BICO-20201230-141449\raw_data_csv
output_folder_name_prefix=aaa
output_folder_name_prefix=
file_compression=gzip
plot_file_availability=1
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment