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 64dd43f6 authored by holukas's avatar holukas
Browse files

Added CHANGELOG, removed small bug

parent 99dbbcd7
......@@ -3,6 +3,7 @@ dist/
_archive/
_raw_photoshop/
_tests/
_versions/
example/
# Byte-compiled / optimized / DLL files
......
......@@ -2,12 +2,14 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="254ecb79-655b-4854-8af6-177bb7347e8a" name="Default Changelist" comment="">
<change afterPath="$PROJECT_DIR$/CHANGELOG.txt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gitignore" beforeDir="false" afterPath="$PROJECT_DIR$/.gitignore" afterDir="false" />
<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/ops/bin.py" beforeDir="false" afterPath="$PROJECT_DIR$/bico/ops/bin.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" />
<change beforePath="$PROJECT_DIR$/bico/settings/data_blocks/IRGA75-A-GN1.dblock" beforeDir="false" afterPath="$PROJECT_DIR$/bico/settings/data_blocks/IRGA75-A-GN1.dblock" afterDir="false" />
<change beforePath="$PROJECT_DIR$/setup.py" beforeDir="false" afterPath="$PROJECT_DIR$/setup.py" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
......@@ -47,7 +49,7 @@
<property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
<property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/bico/settings/data_blocks" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/../CH-DAV - 1997-2005_raw_format" />
<property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
<property name="nodejs_npm_path_reset_for_default_project" value="true" />
<property name="restartRequiresConfirmation" value="false" />
......@@ -333,6 +335,15 @@
<workItem from="1610499634762" duration="1562000" />
<workItem from="1610528020539" duration="10670000" />
<workItem from="1610612175310" duration="3600000" />
<workItem from="1610836204898" duration="18000" />
<workItem from="1611233511140" duration="426000" />
<workItem from="1611234113644" duration="2047000" />
<workItem from="1611241454391" duration="10000" />
<workItem from="1611243161354" duration="884000" />
<workItem from="1611305017889" duration="18000" />
<workItem from="1611305686220" duration="1411000" />
<workItem from="1611446098449" duration="26000" />
<workItem from="1613140449345" duration="902000" />
</task>
<servers />
</component>
......@@ -364,6 +375,11 @@
<line>94</line>
<option name="timeStamp" value="183" />
</line-breakpoint>
<line-breakpoint enabled="true" suspend="THREAD" type="python-line">
<url>file://$PROJECT_DIR$/bico/ops/bin.py</url>
<line>14</line>
<option name="timeStamp" value="184" />
</line-breakpoint>
</breakpoints>
<default-breakpoints>
<breakpoint type="python-exception">
......@@ -383,7 +399,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="1610742316824" 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="1613141115826" 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
BICO Changelog
==============
v0.3.1 - 12 Feb 2021
- bug: IRGA75-A-GN1.dblock: 'datablock' was incorrectly named 'IRGA75-A'
- added: CHANGELOG.txt
run_id=BICO-20210115-212517
run_id=BICO-20210212-154516
# INSTRUMENTS
# ===========
# Site
site=CH-DAV
site=CH-AES
# Data Blocks
header=WECOM3
instrument_1=R350-A
instrument_2=IRGA75-A
instrument_3=QCL-A
instrument_2=IRGA75-A-GN1
instrument_3=LGR-A
# RAW DATA
# ========
# Source Folder
dir_source=Y:/CH-CHA_Chamau/20_sonic_ghg/2020/06
dir_source=Y:/CH-INO_InnoFarm/20_sonic_ghg/2019
# Time Range
start_date=2020-06-01 07:00
end_date=2020-06-02 07:00
start_date=2019-05-10 11:52
end_date=2019-05-10 12:00
# File Settings
filename_datetime_format=yyyymmddHH.CMM
file_ext=*.C*
filename_datetime_format=yyyymmddHH.XMM
file_ext=*.X*
file_size_min=900
file_limit=0
row_limit=0
......@@ -35,22 +35,22 @@ select_random_files=0
# OUTPUT
# ======
dir_out=A:/FLUXES/x-TEST-OUT
dir_out_run=A:\FLUXES\x-TEST-OUT\CHA_BICO-20210115-212517
dir_out_run_log=A:\FLUXES\x-TEST-OUT\CHA_BICO-20210115-212517\log
dir_out_run_plots=A:\FLUXES\x-TEST-OUT\CHA_BICO-20210115-212517\plots
dir_out_run_plots_hires=A:\FLUXES\x-TEST-OUT\CHA_BICO-20210115-212517\plots\hires
dir_out_run_plots_agg=A:\FLUXES\x-TEST-OUT\CHA_BICO-20210115-212517\plots\agg
dir_out_run_raw_data_ascii=A:\FLUXES\x-TEST-OUT\CHA_BICO-20210115-212517\raw_data_ascii
dir_out_run=A:\FLUXES\x-TEST-OUT\CH-AES_BICO-20210212-154516
dir_out_run_log=A:\FLUXES\x-TEST-OUT\CH-AES_BICO-20210212-154516\log
dir_out_run_plots=A:\FLUXES\x-TEST-OUT\CH-AES_BICO-20210212-154516\plots
dir_out_run_plots_hires=A:\FLUXES\x-TEST-OUT\CH-AES_BICO-20210212-154516\plots\hires
dir_out_run_plots_agg=A:\FLUXES\x-TEST-OUT\CH-AES_BICO-20210212-154516\plots\agg
dir_out_run_raw_data_ascii=A:\FLUXES\x-TEST-OUT\CH-AES_BICO-20210212-154516\raw_data_ascii
output_folder_name_prefix=CHA
output_folder_name_prefix=CH-AES
file_compression=None
add_instr_to_varname=0
add_instr_to_varname=1
plot_file_availability=0
plot_ts_hires=0
plot_file_availability=1
plot_ts_hires=1
plot_histogram_hires=0
plot_ts_agg=0
plot_ts_agg=1
# DIRECTORIES
# ===================
......
run_id=BICO-20210115-212257
run_id=BICO-20210212-154456
# INSTRUMENTS
# ===========
# Site
site=CH-DAV
site=CH-AES
# Data Blocks
header=WECOM3
instrument_1=R350-A
instrument_2=IRGA75-A
instrument_3=QCL-A
instrument_2=IRGA75-A-GN1
instrument_3=LGR-A
# RAW DATA
# ========
# Source Folder
dir_source=Y:/CH-CHA_Chamau/20_sonic_ghg/2020/06
dir_source=Y:/CH-INO_InnoFarm/20_sonic_ghg/2019
# Time Range
start_date=2020-06-01 13:00
end_date=2020-06-02 13:00
start_date=2019-05-10 11:52
end_date=2019-05-10 12:00
# File Settings
filename_datetime_format=yyyymmddHH.CMM
file_ext=*.C*
filename_datetime_format=yyyymmddHH.XMM
file_ext=*.X*
file_size_min=900
file_limit=0
row_limit=0
......@@ -35,17 +35,17 @@ select_random_files=0
# OUTPUT
# ======
dir_out=A:/FLUXES/x-TEST-OUT
dir_out_run=A:\FLUXES\x-TEST-OUT\CHA_BICO-20210115-212257
dir_out_run_log=A:\FLUXES\x-TEST-OUT\CHA_BICO-20210115-212257\log
dir_out_run_plots=A:\FLUXES\x-TEST-OUT\CHA_BICO-20210115-212257\plots
dir_out_run_plots_hires=A:\FLUXES\x-TEST-OUT\CHA_BICO-20210115-212257\plots\hires
dir_out_run_plots_agg=A:\FLUXES\x-TEST-OUT\CHA_BICO-20210115-212257\plots\agg
dir_out_run_raw_data_ascii=A:\FLUXES\x-TEST-OUT\CHA_BICO-20210115-212257\raw_data_ascii
dir_out_run=A:\FLUXES\x-TEST-OUT\CH-AES_BICO-20210212-154456
dir_out_run_log=A:\FLUXES\x-TEST-OUT\CH-AES_BICO-20210212-154456\log
dir_out_run_plots=A:\FLUXES\x-TEST-OUT\CH-AES_BICO-20210212-154456\plots
dir_out_run_plots_hires=A:\FLUXES\x-TEST-OUT\CH-AES_BICO-20210212-154456\plots\hires
dir_out_run_plots_agg=A:\FLUXES\x-TEST-OUT\CH-AES_BICO-20210212-154456\plots\agg
dir_out_run_raw_data_ascii=A:\FLUXES\x-TEST-OUT\CH-AES_BICO-20210212-154456\raw_data_ascii
output_folder_name_prefix=CHA
output_folder_name_prefix=CH-AES
file_compression=None
add_instr_to_varname=0
add_instr_to_varname=1
plot_file_availability=0
plot_ts_hires=0
......
__version__ = "0.3.0"
__date__ = "15 Jan 2021"
__version__ = "0.3.1"
__date__ = "21 Jan 2021"
__link_source_code__ = "https://gitlab.ethz.ch/holukas/bico"
__link_releases__ = "https://gitlab.ethz.ch/holukas/bico/-/releases"
__link_wiki__ = "https://gitlab.ethz.ch/holukas/bico/-/wikis/home"
......
......@@ -4,21 +4,21 @@
# Details: see IRGA75-A-GN1.md
DATA_SIZE == {'order': 1, 'bytes': 1, 'format': 'B', 'gain_on_signal': 1, 'offset_on_signal': 0, 'apply_gain': 1, 'add_offset': 0, 'units': 'Bytes', 'conversion_type': 'regular', 'datablock': 'IRGA75-A'}
STATUS_CODE == {'order': 2, 'bytes': 1, 'format': 'B', 'gain_on_signal': 1, 'offset_on_signal': 0, 'apply_gain': 1, 'add_offset': 0, 'units': 'status_code_irga', 'conversion_type': 'regular', 'datablock': 'IRGA75-A'}
GA_DIAG_CODE == {'order': 3, 'bytes': 1, 'format': 'B', 'gain_on_signal': 1, 'offset_on_signal': 0, 'apply_gain': 1, 'add_offset': 0, 'units': 'bit_map', 'conversion_type': 'regular', 'datablock': 'IRGA75-A'}
H2O_CONC == {'order': 4, 'bytes': 3, 'format': 'B B B', 'gain_on_signal': 1000, 'offset_on_signal': 0, 'apply_gain': 1, 'add_offset': 0, 'units': 'mmol+1 m-3', 'conversion_type': 'regular', 'datablock': 'IRGA75-A'}
CO2_CONC == {'order': 5, 'bytes': 3, 'format': 'B B B', 'gain_on_signal': 10000, 'offset_on_signal': 0, 'apply_gain': 0.974, 'add_offset': 0, 'units': 'mmol+1 m-3', 'conversion_type': 'regular', 'datablock': 'IRGA75-A'}
T_BOX == {'order': 6, 'bytes': 2, 'format': 'B B', 'gain_on_signal': 100, 'offset_on_signal': 100, 'apply_gain': 1, 'add_offset': 0, 'units': 'degC', 'conversion_type': 'regular', 'datablock': 'IRGA75-A'}
PRESS_BOX == {'order': 7, 'bytes': 2, 'format': 'B B', 'gain_on_signal': 10, 'offset_on_signal': 0, 'apply_gain': 1, 'add_offset': 0, 'units': 'hPa', 'conversion_type': 'regular', 'datablock': 'IRGA75-A'}
COOLER_V == {'order': 8, 'bytes': 3, 'format': 'B B B', 'gain_on_signal': 10000, 'offset_on_signal': 0, 'apply_gain': 1, 'add_offset': 0, 'units': 'V', 'conversion_type': 'regular', 'datablock': 'IRGA75-A'}
DATA_SIZE == {'order': 1, 'bytes': 1, 'format': 'B', 'gain_on_signal': 1, 'offset_on_signal': 0, 'apply_gain': 1, 'add_offset': 0, 'units': 'Bytes', 'conversion_type': 'regular', 'datablock': 'IRGA75-A-GN1'}
STATUS_CODE == {'order': 2, 'bytes': 1, 'format': 'B', 'gain_on_signal': 1, 'offset_on_signal': 0, 'apply_gain': 1, 'add_offset': 0, 'units': 'status_code_irga', 'conversion_type': 'regular', 'datablock': 'IRGA75-A-GN1'}
GA_DIAG_CODE == {'order': 3, 'bytes': 1, 'format': 'B', 'gain_on_signal': 1, 'offset_on_signal': 0, 'apply_gain': 1, 'add_offset': 0, 'units': 'bit_map', 'conversion_type': 'regular', 'datablock': 'IRGA75-A-GN1'}
H2O_CONC == {'order': 4, 'bytes': 3, 'format': 'B B B', 'gain_on_signal': 1000, 'offset_on_signal': 0, 'apply_gain': 1, 'add_offset': 0, 'units': 'mmol+1 m-3', 'conversion_type': 'regular', 'datablock': 'IRGA75-A-GN1'}
CO2_CONC == {'order': 5, 'bytes': 3, 'format': 'B B B', 'gain_on_signal': 10000, 'offset_on_signal': 0, 'apply_gain': 0.974, 'add_offset': 0, 'units': 'mmol+1 m-3', 'conversion_type': 'regular', 'datablock': 'IRGA75-A-GN1'}
T_BOX == {'order': 6, 'bytes': 2, 'format': 'B B', 'gain_on_signal': 100, 'offset_on_signal': 100, 'apply_gain': 1, 'add_offset': 0, 'units': 'degC', 'conversion_type': 'regular', 'datablock': 'IRGA75-A-GN1'}
PRESS_BOX == {'order': 7, 'bytes': 2, 'format': 'B B', 'gain_on_signal': 10, 'offset_on_signal': 0, 'apply_gain': 1, 'add_offset': 0, 'units': 'hPa', 'conversion_type': 'regular', 'datablock': 'IRGA75-A-GN1'}
COOLER_V == {'order': 8, 'bytes': 3, 'format': 'B B B', 'gain_on_signal': 10000, 'offset_on_signal': 0, 'apply_gain': 1, 'add_offset': 0, 'units': 'V', 'conversion_type': 'regular', 'datablock': 'IRGA75-A-GN1'}
# Values extracted from GA_DIAG_CODE:
# --------------------------------------
AGC == {'order': 3.04, 'bit_pos_start': 0, 'bit_pos_end': 3, 'apply_gain': 6.25, 'add_offset': 6.25, 'units': '%', 'output': 1, 'datablock': 'IRGA75-A'}
SYNC == {'order': 3.05, 'bit_pos_start': 4, 'bit_pos_end': 5, 'apply_gain': 1, 'add_offset': 0, 'units': '1=OK', 'output': 0, 'datablock': 'IRGA75-A'}
PLL == {'order': 3.06, 'bit_pos_start': 5, 'bit_pos_end': 6, 'apply_gain': 1, 'add_offset': 0, 'units': '1=OK', 'output': 0, 'datablock': 'IRGA75-A'}
DETECTOR == {'order': 3.07, 'bit_pos_start': 6, 'bit_pos_end': 7, 'apply_gain': 1, 'add_offset': 0, 'units': '1=OK', 'output': 0, 'datablock': 'IRGA75-A'}
CHOPPER == {'order': 3.08, 'bit_pos_start': 7, 'bit_pos_end': 8, 'apply_gain': 1, 'add_offset': 0, 'units': '1=OK', 'output': 0, 'datablock': 'IRGA75-A'}
AGC == {'order': 3.04, 'bit_pos_start': 0, 'bit_pos_end': 3, 'apply_gain': 6.25, 'add_offset': 6.25, 'units': '%', 'output': 1, 'datablock': 'IRGA75-A-GN1'}
SYNC == {'order': 3.05, 'bit_pos_start': 4, 'bit_pos_end': 5, 'apply_gain': 1, 'add_offset': 0, 'units': '1=OK', 'output': 0, 'datablock': 'IRGA75-A-GN1'}
PLL == {'order': 3.06, 'bit_pos_start': 5, 'bit_pos_end': 6, 'apply_gain': 1, 'add_offset': 0, 'units': '1=OK', 'output': 0, 'datablock': 'IRGA75-A-GN1'}
DETECTOR == {'order': 3.07, 'bit_pos_start': 6, 'bit_pos_end': 7, 'apply_gain': 1, 'add_offset': 0, 'units': '1=OK', 'output': 0, 'datablock': 'IRGA75-A-GN1'}
CHOPPER == {'order': 3.08, 'bit_pos_start': 7, 'bit_pos_end': 8, 'apply_gain': 1, 'add_offset': 0, 'units': '1=OK', 'output': 0, 'datablock': 'IRGA75-A-GN1'}
......@@ -8,7 +8,7 @@ setuptools.setup(
name='bico',
packages=setuptools.find_packages(),
# packages=['dyco'],
version='0.3.0',
version='0.3.1',
license='GNU General Public License v3 (GPLv3)',
description='A Python package to convert binary files to ASCII',
long_description=long_description,
......@@ -18,7 +18,7 @@ setuptools.setup(
url='https://gitlab.ethz.ch/holukas/bico-binary-converter',
download_url='https://pypi.org/project/bico/',
keywords=['ecosystem', 'eddy covariance', 'fluxes',
'time series', 'binary', 'converter'],
'time series', 'binary', 'converter', 'conversion'],
install_requires=['pandas', 'numpy', 'matplotlib'],
classifiers=[
'Development Status :: 3 - Alpha',
......
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