Skip to content

Commit 5b5aa13

Browse files
holukasholukas
committed
Added datablock R350-B
1 parent 33b413c commit 5b5aa13

File tree

11 files changed

+136
-63
lines changed

11 files changed

+136
-63
lines changed

‎CHANGELOG.md‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,16 @@
11
# BICO Changelog
22

3+
## v1.6.0 | 14 Nov 2023
4+
5+
- Added: new datablock `R350-B`. As it turns out, this datablock was already relevant for R3-50 data logged from
6+
2017 onwards. Up to now we used the `R350-A` datablock for these data. The difference is that `R350-B` also
7+
records the status address and status data, similar to `HS50-A`. The size of the datablock is 12 Byte, old data
8+
that were converted using the `R350-A` datablock instead of `R350-B` still produced correct data for wind and
9+
sonic temperature.
10+
- Added pdf `r3-50-manual_200502.pdf` to folder `/docs`. This is the manufacturer manual for R3-50 sonic anemometers
11+
from Feb 2005.
12+
- Updated links to GitHub repo.
13+
314
## v1.5.1 | 21 Oct 2023
415

516
- Moved repo to GitLab: https://github.com/holukas/bico

‎docs/r3-50-manual_200502.pdf‎

1.76 MB
Binary file not shown.

‎pyproject.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[tool.poetry]
22
name = "bico"
3-
version = "v1.5.1"
3+
version = "v1.6.0"
44
description = "Binary Converter to convert binary files to ASCII"
55
authors = ["holukas <holukas@ethz.ch>"]
66

‎src/gui/gui.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ def add_section_instruments(self):
184184
'CH-LAE', 'CH-LAS',
185185
'CH-OE2'])
186186

187-
sonic_anemometers = ['HS50-A', 'HS50-B', 'HS100-A', 'R2-A', 'R350-A', '-None-']
187+
sonic_anemometers = ['HS50-A', 'HS50-B', 'HS100-A', 'R2-A', 'R350-A', 'R350-B', '-None-']
188188
gas_analyzers = ['IRGA72-A', 'IRGA72-A-GN1', 'IRGA72-B', 'IRGA72-B-GN1', 'IRGA75-A', 'IRGA75-A-GN1',
189189
'LGR-A', 'QCL-A', 'QCL-A2', 'QCL-A3', 'QCL-A4',
190190
'QCL-C', 'QCL-C2', 'QCL-C3', 'QCL-ISO', 'QCL-L', 'QCL-L2', '-None-']

‎src/settings/BICO.settings‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,63 +1,63 @@
1-
run_id=BICO-20230626-151722
1+
run_id=BICO-20231113-235139
22

33
# INSTRUMENTS
44
# ===========
55

66
# Site
7-
site=CH-LAE
7+
site=CH-FRU
88

99
# Data Blocks
1010
header=WECOM3
11-
instrument_1=HS50-B
11+
instrument_1=R350-B
1212
instrument_2=IRGA75-A
13-
instrument_3=QCL-L
13+
instrument_3=-None-
1414

1515
# RAW DATA
1616
# ========
1717

1818
# Source Folder
19-
dir_source=F:/Sync/luhk_work/20 - CODING/23 - FLUX/bico/_test_in
19+
dir_source=F:/TMP/del
2020

2121
# Time Range
22-
start_date=2004-01-01 00:01
23-
end_date=2022-12-31 23:59
22+
start_date=2023-10-20 00:00
23+
end_date=2023-12-31 23:59
2424

2525
# File Settings
26-
filename_datetime_format=yyyymmddHH.bMM
27-
file_ext=*.b*
26+
filename_datetime_format=yyyymmddHH.XMM
27+
file_ext=*.X*
2828
file_size_min=900
2929
file_limit=0
30-
row_limit=100
30+
row_limit=0
3131

3232
# Special
3333
select_random_files=0
3434

3535
# OUTPUT
3636
# ======
37-
dir_out=F:/Sync/luhk_work/20 - CODING/23 - FLUX/bico/_test_out
38-
dir_out_run=F:\Sync\luhk_work\20 - CODING\23 - FLUX\bico\_test_out\XXX_BICO-20230626-151722
39-
dir_out_run_log=F:\Sync\luhk_work\20 - CODING\23 - FLUX\bico\_test_out\XXX_BICO-20230626-151722\log
40-
dir_out_run_plots=F:\Sync\luhk_work\20 - CODING\23 - FLUX\bico\_test_out\XXX_BICO-20230626-151722\plots
41-
dir_out_run_plots_hires=F:\Sync\luhk_work\20 - CODING\23 - FLUX\bico\_test_out\XXX_BICO-20230626-151722\plots\hires
42-
dir_out_run_plots_agg=F:\Sync\luhk_work\20 - CODING\23 - FLUX\bico\_test_out\XXX_BICO-20230626-151722\plots\agg
43-
dir_out_run_raw_data_ascii=F:\Sync\luhk_work\20 - CODING\23 - FLUX\bico\_test_out\XXX_BICO-20230626-151722\raw_data_ascii
37+
dir_out=F:/TMP/del
38+
dir_out_run=F:\TMP\del\test_BICO-20231113-235139
39+
dir_out_run_log=F:\TMP\del\test_BICO-20231113-235139\log
40+
dir_out_run_plots=F:\TMP\del\test_BICO-20231113-235139\plots
41+
dir_out_run_plots_hires=F:\TMP\del\test_BICO-20231113-235139\plots\hires
42+
dir_out_run_plots_agg=F:\TMP\del\test_BICO-20231113-235139\plots\agg
43+
dir_out_run_raw_data_ascii=F:\TMP\del\test_BICO-20231113-235139\raw_data_ascii
4444

45-
output_folder_name_prefix=XXX
46-
file_compression=None
45+
output_folder_name_prefix=test
46+
file_compression=gzip
4747

4848
add_instr_to_varname=1
4949

5050
plot_file_availability=1
51-
plot_ts_hires=0
51+
plot_ts_hires=1
5252
plot_histogram_hires=0
5353
plot_ts_agg=1
5454

5555
# DIRECTORIES
5656
# ===================
57-
dir_bico=F:\Sync\luhk_work\20 - CODING\23 - FLUX\bico\BICO
58-
dir_script=F:\Sync\luhk_work\20 - CODING\23 - FLUX\bico\BICO\src
59-
dir_settings=F:\Sync\luhk_work\20 - CODING\23 - FLUX\bico\BICO\src\settings
60-
dir_root=F:\Sync\luhk_work\20 - CODING\23 - FLUX\bico
57+
dir_bico=L:\Sync\luhk_work\20 - CODING\23 - FLUX\bico
58+
dir_script=L:\Sync\luhk_work\20 - CODING\23 - FLUX\bico\src
59+
dir_settings=L:\Sync\luhk_work\20 - CODING\23 - FLUX\bico\src\settings
60+
dir_root=L:\Sync\luhk_work\20 - CODING\23 - FLUX
6161
dir_server_CH-AES=
6262
dir_server_CH-AWS=\\green.ethz.ch\share-green-gl-archive-1-$\FluxData\CH-AWS_CrapAlv\20_sonic_ghg
6363
dir_server_CH-CHA=\\green.ethz.ch\share-green-gl-archive-1-$\FluxData\CH-CHA_Chamau\20_sonic_ghg

‎src/settings/BICO.settingsOld‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,63 +1,63 @@
1-
run_id=BICO-20230626-150905
1+
run_id=BICO-20231113-235118
22

33
# INSTRUMENTS
44
# ===========
55

66
# Site
7-
site=CH-LAE
7+
site=CH-FRU
88

99
# Data Blocks
1010
header=WECOM3
11-
instrument_1=HS50-B
11+
instrument_1=R350-B
1212
instrument_2=IRGA75-A
13-
instrument_3=QCL-L2
13+
instrument_3=-None-
1414

1515
# RAW DATA
1616
# ========
1717

1818
# Source Folder
19-
dir_source=F:/Sync/luhk_work/20 - CODING/23 - FLUX/bico/_test_in
19+
dir_source=F:/TMP/del
2020

2121
# Time Range
22-
start_date=2004-01-01 00:01
23-
end_date=2022-12-31 23:59
22+
start_date=2023-10-20 00:00
23+
end_date=2023-12-31 23:59
2424

2525
# File Settings
26-
filename_datetime_format=yyyymmddHH.bMM
27-
file_ext=*.b*
26+
filename_datetime_format=yyyymmddHH.XMM
27+
file_ext=*.X*
2828
file_size_min=900
2929
file_limit=0
30-
row_limit=100
30+
row_limit=0
3131

3232
# Special
3333
select_random_files=0
3434

3535
# OUTPUT
3636
# ======
37-
dir_out=F:/Sync/luhk_work/20 - CODING/23 - FLUX/bico/_test_out
38-
dir_out_run=F:\Sync\luhk_work\20 - CODING\23 - FLUX\bico\_test_out\XXX_BICO-20230626-150905
39-
dir_out_run_log=F:\Sync\luhk_work\20 - CODING\23 - FLUX\bico\_test_out\XXX_BICO-20230626-150905\log
40-
dir_out_run_plots=F:\Sync\luhk_work\20 - CODING\23 - FLUX\bico\_test_out\XXX_BICO-20230626-150905\plots
41-
dir_out_run_plots_hires=F:\Sync\luhk_work\20 - CODING\23 - FLUX\bico\_test_out\XXX_BICO-20230626-150905\plots\hires
42-
dir_out_run_plots_agg=F:\Sync\luhk_work\20 - CODING\23 - FLUX\bico\_test_out\XXX_BICO-20230626-150905\plots\agg
43-
dir_out_run_raw_data_ascii=F:\Sync\luhk_work\20 - CODING\23 - FLUX\bico\_test_out\XXX_BICO-20230626-150905\raw_data_ascii
37+
dir_out=F:/TMP/del
38+
dir_out_run=F:\TMP\del\test_BICO-20231113-235118
39+
dir_out_run_log=F:\TMP\del\test_BICO-20231113-235118\log
40+
dir_out_run_plots=F:\TMP\del\test_BICO-20231113-235118\plots
41+
dir_out_run_plots_hires=F:\TMP\del\test_BICO-20231113-235118\plots\hires
42+
dir_out_run_plots_agg=F:\TMP\del\test_BICO-20231113-235118\plots\agg
43+
dir_out_run_raw_data_ascii=F:\TMP\del\test_BICO-20231113-235118\raw_data_ascii
4444

45-
output_folder_name_prefix=XXX
46-
file_compression=None
45+
output_folder_name_prefix=test
46+
file_compression=gzip
4747

4848
add_instr_to_varname=1
4949

5050
plot_file_availability=1
51-
plot_ts_hires=0
51+
plot_ts_hires=1
5252
plot_histogram_hires=0
5353
plot_ts_agg=1
5454

5555
# DIRECTORIES
5656
# ===================
57-
dir_bico=F:\Sync\luhk_work\20 - CODING\23 - FLUX\bico\BICO
58-
dir_script=F:\Sync\luhk_work\20 - CODING\23 - FLUX\bico\BICO\src
59-
dir_settings=F:\Sync\luhk_work\20 - CODING\23 - FLUX\bico\BICO\src\settings
60-
dir_root=F:\Sync\luhk_work\20 - CODING\23 - FLUX\bico
57+
dir_bico=L:\Sync\luhk_work\20 - CODING\23 - FLUX\bico
58+
dir_script=L:\Sync\luhk_work\20 - CODING\23 - FLUX\bico\src
59+
dir_settings=L:\Sync\luhk_work\20 - CODING\23 - FLUX\bico\src\settings
60+
dir_root=L:\Sync\luhk_work\20 - CODING\23 - FLUX
6161
dir_server_CH-AES=
6262
dir_server_CH-AWS=\\green.ethz.ch\share-green-gl-archive-1-$\FluxData\CH-AWS_CrapAlv\20_sonic_ghg
6363
dir_server_CH-CHA=\\green.ethz.ch\share-green-gl-archive-1-$\FluxData\CH-CHA_Chamau\20_sonic_ghg

‎src/settings/_version.py‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
# from single_source import get_version
22
# __version__ = get_version(__name__, Path(__file__).parent.parent.parent) # Single source of truth for version
33

4-
__version__ = "1.5.0"
5-
__date__ = "26 Jun 2023"
6-
__link_changelog__ = "https://gitlab.ethz.ch/flux/bico/-/blob/master/CHANGELOG.md"
7-
__link_source_code__ = "https://gitlab.ethz.ch/flux/bico"
8-
__link_releases__ = "https://gitlab.ethz.ch/flux/bico/-/releases"
9-
__license__ = "https://gitlab.ethz.ch/flux/bico/-/blob/master/LICENSE"
10-
__link_datablocks__ = "https://gitlab.ethz.ch/flux/bico/-/tree/master/src/settings/data_blocks"
4+
__version__ = "1.6.0"
5+
__date__ = "14 Nov 2023"
6+
__link_changelog__ = "https://github.com/holukas/bico/blob/master/CHANGELOG.md"
7+
__link_source_code__ = "https://github.com/holukas/bico"
8+
__link_releases__ = "https://github.com/holukas/bico/releases"
9+
__license__ = "https://github.com/holukas/bico/blob/master/LICENSE"
10+
__link_datablocks__ = "https://github.com/holukas/bico/tree/master/src/settings/data_blocks"

‎src/settings/data_blocks/R2-A.dblock‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# ========================
44
# Details: see R2-A.md
55

6-
U == {'order': 1, 'bytes': 2, 'format': '>h', 'gain_on_signal': 100, 'offset_on_signal': 0, 'apply_gain': 1, 'add_offset': 0, 'units': 'm+1 s-1', 'conversion_type': 'regular', 'datablock': 'R2-A'}
7-
V == {'order': 2, 'bytes': 2, 'format': '>h', 'gain_on_signal': 100, 'offset_on_signal': 0, 'apply_gain': 1, 'add_offset': 0, 'units': 'm+1 s-1', 'conversion_type': 'regular', 'datablock': 'R2-A'}
8-
W == {'order': 3, 'bytes': 2, 'format': '>h', 'gain_on_signal': 100, 'offset_on_signal': 0, 'apply_gain': 1, 'add_offset': 0, 'units': 'm+1 s-1', 'conversion_type': 'regular', 'datablock': 'R2-A'}
6+
U == {'order': 1, 'bytes': 2, 'format': '>h', 'gain_on_signal': 100, 'offset_on_signal': 0, 'apply_gain': 1, 'add_offset': 0, 'units': 'm+1_s-1', 'conversion_type': 'regular', 'datablock': 'R2-A'}
7+
V == {'order': 2, 'bytes': 2, 'format': '>h', 'gain_on_signal': 100, 'offset_on_signal': 0, 'apply_gain': 1, 'add_offset': 0, 'units': 'm+1_s-1', 'conversion_type': 'regular', 'datablock': 'R2-A'}
8+
W == {'order': 3, 'bytes': 2, 'format': '>h', 'gain_on_signal': 100, 'offset_on_signal': 0, 'apply_gain': 1, 'add_offset': 0, 'units': 'm+1_s-1', 'conversion_type': 'regular', 'datablock': 'R2-A'}
99
T_SONIC == {'order': 4, 'bytes': 2, 'format': '>h', 'gain_on_signal': 1, 'offset_on_signal': 0, 'apply_gain': 1, 'add_offset': 0, 'units': 'degC', 'conversion_type': 'exception', 'datablock': 'R2-A'}

‎src/settings/data_blocks/R350-A.dblock‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
#
55

66

7-
U == {'order': 1, 'bytes': 2, 'format': '>h', 'gain_on_signal': 100, 'offset_on_signal': 0, 'apply_gain': 1, 'add_offset': 0, 'units': 'm+1 s-1', 'conversion_type': 'regular', 'datablock': 'R350-A'}
8-
V == {'order': 2, 'bytes': 2, 'format': '>h', 'gain_on_signal': 100, 'offset_on_signal': 0, 'apply_gain': 1, 'add_offset': 0, 'units': 'm+1 s-1', 'conversion_type': 'regular', 'datablock': 'R350-A'}
9-
W == {'order': 3, 'bytes': 2, 'format': '>h', 'gain_on_signal': 100, 'offset_on_signal': 0, 'apply_gain': 1, 'add_offset': 0, 'units': 'm+1 s-1', 'conversion_type': 'regular', 'datablock': 'R350-A'}
7+
U == {'order': 1, 'bytes': 2, 'format': '>h', 'gain_on_signal': 100, 'offset_on_signal': 0, 'apply_gain': 1, 'add_offset': 0, 'units': 'm+1_s-1', 'conversion_type': 'regular', 'datablock': 'R350-A'}
8+
V == {'order': 2, 'bytes': 2, 'format': '>h', 'gain_on_signal': 100, 'offset_on_signal': 0, 'apply_gain': 1, 'add_offset': 0, 'units': 'm+1_s-1', 'conversion_type': 'regular', 'datablock': 'R350-A'}
9+
W == {'order': 3, 'bytes': 2, 'format': '>h', 'gain_on_signal': 100, 'offset_on_signal': 0, 'apply_gain': 1, 'add_offset': 0, 'units': 'm+1_s-1', 'conversion_type': 'regular', 'datablock': 'R350-A'}
1010
T_SONIC == {'order': 4, 'bytes': 2, 'format': '>h', 'gain_on_signal': 100, 'offset_on_signal': 0, 'apply_gain': 1, 'add_offset': 0, 'units': 'K', 'conversion_type': 'regular', 'datablock': 'R350-A'}
1111
INC_X == {'order': 5, 'bytes': 2, 'format': '>h', 'gain_on_signal': 100, 'offset_on_signal': 0, 'apply_gain': 1, 'add_offset': 0, 'units': 'deg', 'conversion_type': 'regular', 'datablock': 'R350-A'}
1212
INC_Y == {'order': 6, 'bytes': 2, 'format': '>h', 'gain_on_signal': 100, 'offset_on_signal': 0, 'apply_gain': 1, 'add_offset': 0, 'units': 'deg', 'conversion_type': 'regular', 'datablock': 'R350-A'}

‎src/settings/data_blocks/R350-B.dblock‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
# =========================
2+
# R350-B - SONIC ANEMOMETER
3+
# =========================
4+
# Details: see R350-B.md
5+
6+
7+
U == {'order': 1, 'bytes': 2, 'format': '>h', 'gain_on_signal': 100, 'offset_on_signal': 0, 'apply_gain': 1, 'add_offset': 0, 'units': 'm+1_s-1', 'conversion_type': 'regular', 'datablock': 'R350-B'}
8+
V == {'order': 2, 'bytes': 2, 'format': '>h', 'gain_on_signal': 100, 'offset_on_signal': 0, 'apply_gain': 1, 'add_offset': 0, 'units': 'm+1_s-1', 'conversion_type': 'regular', 'datablock': 'R350-B'}
9+
W == {'order': 3, 'bytes': 2, 'format': '>h', 'gain_on_signal': 100, 'offset_on_signal': 0, 'apply_gain': 1, 'add_offset': 0, 'units': 'm+1_s-1', 'conversion_type': 'regular', 'datablock': 'R350-B'}
10+
T_SONIC == {'order': 4, 'bytes': 2, 'format': '>h', 'gain_on_signal': 100, 'offset_on_signal': 0, 'apply_gain': 1, 'add_offset': 0, 'units': 'K', 'conversion_type': 'regular', 'datablock': 'R350-B'}
11+
SA_DIAG_TYPE == {'order': 5, 'bytes': 1, 'format': 'B', 'gain_on_signal': 1, 'offset_on_signal': 0, 'apply_gain': 1, 'add_offset': 0, 'units': 'diag_val_r350_type', 'conversion_type': 'regular', 'datablock': 'R350-B'}
12+
SA_DIAG_VAL == {'order': 6, 'bytes': 1, 'format': 'B', 'gain_on_signal': 1, 'offset_on_signal': 0, 'apply_gain': 1, 'add_offset': 0, 'units': 'diag_val_r350', 'conversion_type': 'regular', 'datablock': 'R350-B'}
13+
INC_XY == {'order': 7, 'bytes': 2, 'format': '>h', 'gain_on_signal': 100, 'offset_on_signal': 0, 'apply_gain': 1, 'add_offset': 0, 'units': 'deg', 'conversion_type': 'regular', 'datablock': 'R350-B'}

0 commit comments

Comments
 (0)