From 0866feee3a1b6d0974375f97a65d93b5db030392 Mon Sep 17 00:00:00 2001 From: Hugo Therrien Date: Fri, 4 Feb 2022 16:59:11 -0500 Subject: [PATCH 1/2] Added power spectrum data block definition --- brukeropusreader/block_data.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/brukeropusreader/block_data.py b/brukeropusreader/block_data.py index 1e7ee51..5eedaed 100644 --- a/brukeropusreader/block_data.py +++ b/brukeropusreader/block_data.py @@ -19,7 +19,11 @@ BLOCK_0 = defaultdict( }, ) -BLOCK_7 = {4: "ScSm", 8: "IgSm", 12: "PhSm"} +BLOCK_7 = {4: "ScSm", + 8: "IgSm", + 12: "PhSm", + 56: "PwSm", +} BLOCK_11 = {4: "ScRf", 8: "IgRf"} @@ -27,6 +31,7 @@ BLOCK_23 = { 4: "ScSm Data Parameter", 8: "IgSm Data Parameter", 12: "PhSm Data Parameter", + 56: "PwSm Data Parameter", } BLOCK_27 = {4: "ScRf Data Parameter", 8: "IgRf Data Parameter"} From 9b5a41865388046d927cbadf9cf8552e19c16eda Mon Sep 17 00:00:00 2001 From: Author Name Date: Fri, 4 Feb 2022 18:12:43 -0500 Subject: [PATCH 2/2] Added phase and power definitions to data blocks This is a generalization of commit 0866fee --- brukeropusreader/block_data.py | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/brukeropusreader/block_data.py b/brukeropusreader/block_data.py index 5eedaed..6a09de9 100644 --- a/brukeropusreader/block_data.py +++ b/brukeropusreader/block_data.py @@ -19,13 +19,19 @@ BLOCK_0 = defaultdict( }, ) -BLOCK_7 = {4: "ScSm", - 8: "IgSm", - 12: "PhSm", - 56: "PwSm", +BLOCK_7 = { + 4: "ScSm", + 8: "IgSm", + 12: "PhSm", + 56: "PwSm", } -BLOCK_11 = {4: "ScRf", 8: "IgRf"} +BLOCK_11 = { + 4: "ScRf", + 8: "IgRf", + 12: "PhRf", + 56: "PwRf", +} BLOCK_23 = { 4: "ScSm Data Parameter", @@ -34,7 +40,12 @@ BLOCK_23 = { 56: "PwSm Data Parameter", } -BLOCK_27 = {4: "ScRf Data Parameter", 8: "IgRf Data Parameter"} +BLOCK_27 = { + 4: "ScRf Data Parameter", + 8: "IgRf Data Parameter", + 12: "PhRf Data Parameter", + 56: "PwRf Data Parameter", +} DIFFERENT_BLOCKS = { 31: "AB Data Parameter",