diff --git a/kalpaa/read_bin_csv.py b/kalpaa/read_bin_csv.py index c1cf2a0..9361fba 100644 --- a/kalpaa/read_bin_csv.py +++ b/kalpaa/read_bin_csv.py @@ -125,7 +125,7 @@ def _reshape_dots_dict(dots_dict: typing.Sequence[typing.Dict]) -> typing.Dict: BINNED_HEADER_REGEX = r"\s*APSD_(?P\w+)_(?P\w+)_(?Pmean|stdev)\s*" -PAIR_MEASUREMENT_BINNED_HEADER_REGEX = r"\s*APSD_(?P\w+)_(?P\w+)_(?P\w+)_(?Pmean|stdev)\s*" +PAIR_MEASUREMENT_BINNED_HEADER_REGEX = r"\s*APSD_(?P\w+)_(?P\w+)_(?P\w+)_(?Pmean|stdev)\s*" @dataclasses.dataclass @@ -134,6 +134,8 @@ class ParsedBinHeader: measurement_type: str summary_stat: str dot_name: str + # only used for pair measurements + dot_name2: typing.Optional[str] = None def _parse_bin_header(field: str) -> typing.Optional[ParsedBinHeader]: diff --git a/tests/read_bin_csv/__snapshots__/test_read_bin_csv.ambr b/tests/read_bin_csv/__snapshots__/test_read_bin_csv.ambr index 7bf37c3..0f4cf47 100644 --- a/tests/read_bin_csv/__snapshots__/test_read_bin_csv.ambr +++ b/tests/read_bin_csv/__snapshots__/test_read_bin_csv.ambr @@ -220,66 +220,77 @@ list([ dict({ 'dot_name': 'dot1', + 'dot_name2': None, 'measurement_type': 'V', 'original_field': 'APSD_V_dot1_mean', 'summary_stat': 'mean', }), dict({ 'dot_name': 'dot1', + 'dot_name2': None, 'measurement_type': 'V', 'original_field': 'APSD_V_dot1_stdev', 'summary_stat': 'stdev', }), dict({ 'dot_name': 'dot2', + 'dot_name2': None, 'measurement_type': 'V', 'original_field': 'APSD_V_dot2_mean', 'summary_stat': 'mean', }), dict({ 'dot_name': 'dot2', + 'dot_name2': None, 'measurement_type': 'V', 'original_field': 'APSD_V_dot2_stdev', 'summary_stat': 'stdev', }), dict({ 'dot_name': 'line', + 'dot_name2': None, 'measurement_type': 'V', 'original_field': 'APSD_V_line_mean', 'summary_stat': 'mean', }), dict({ 'dot_name': 'line', + 'dot_name2': None, 'measurement_type': 'V', 'original_field': 'APSD_V_line_stdev', 'summary_stat': 'stdev', }), dict({ 'dot_name': 'triangle1', + 'dot_name2': None, 'measurement_type': 'V', 'original_field': 'APSD_V_triangle1_mean', 'summary_stat': 'mean', }), dict({ 'dot_name': 'triangle1', + 'dot_name2': None, 'measurement_type': 'V', 'original_field': 'APSD_V_triangle1_stdev', 'summary_stat': 'stdev', }), dict({ 'dot_name': 'triangle2', + 'dot_name2': None, 'measurement_type': 'V', 'original_field': 'APSD_V_triangle2_mean', 'summary_stat': 'mean', }), dict({ 'dot_name': 'triangle2', + 'dot_name2': None, 'measurement_type': 'V', 'original_field': 'APSD_V_triangle2_stdev', 'summary_stat': 'stdev', }), dict({ 'dot_name': 'uprise1', + 'dot_name2': None, 'measurement_type': 'V', 'original_field': 'APSD_V_uprise1_mean', 'summary_stat': 'mean',