Changeset 2a9faed in ammosreader

Timestamp:

06/29/22 16:12:34 (3 years ago)

Author:

Enrico Schwass <ennoausberlin@…>

Branches:

AmmosSource, guix

Children:

a81ab76

Parents:

4455f2b

Message:

more fixes to ensure proper IF data frame processing

Files:

• ammosreader/AmmosIFDataBlockHeader.py (modified) (2 diffs)
• ammosreader/AmmosIFDataBody.py (modified) (1 diff)
• ammosreader/AmmosIFReader.py (modified) (3 diffs)
• sample_scripts/iqdw_reader.py (modified) (1 diff)

ammosreader/AmmosIFDataBlockHeader.py

@@ -12 +12 @@
         assert len(bytes) == cls.HEADER_SIZE
         elements = struct.unpack('<ccH', bytes)
-        header = cls(bytes)
-        header.invalidity = ((elements[0] & 1) == 1)
-        header.blanking = ((elements[0] & 2) == 1)
-        header.user_data = ((elements[0] & 252))
-        header.reserved = elements[1]
+        header = cls()
+        first_entry = int.from_bytes(elements[0], byteorder='big')
+        header.invalidity = ((first_entry & 1) == 1)
+        header.blanking = ((first_entry & 2) == 1)
+        header.user_data = ((first_entry & 252))
+        header.reserved = int.from_bytes(elements[1], byteorder='big')
         header.reciprocal_gain = elements[2]
         return header
@@ -66 +67 @@
 
     @reciprocal_gain.setter
-    def reciprocal_setter(self, a_gain_value):
+    def reciprocal_gain(self, a_gain_value):
         assert 0 <= a_gain_value < pow(2, 16)
         self.__reciprocal_gain = a_gain_value

ammosreader/AmmosIFDataBody.py

@@ -22 +22 @@
     @property
     def data(self):
-        b"".join([each.data for each in self.data_blocks])
+        return b"".join([each.data for each in self.data_blocks])

ammosreader/AmmosIFReader.py

@@ -2 +2 @@
 import logging
 
+from ammosreader.AbstractAmmosReader import AbstractAmmosReader
 from ammosreader.AmmosGlobalFrameBody import AmmosGlobalFrameBody
 from ammosreader.AmmosIFDataHeader import AmmosIFDataHeader
@@ -10 +11 @@
 
 
-class AmmosIFReader():
+class AmmosIFReader(AbstractAmmosReader):
     """I read the IF data embedded in an R&S AMMOS recording."""
 
     def __init__(self, file_name):
-        super.__init__(file_name)
+        super().__init__(file_name)
 
     def read_next_global_frame_body_data_header(self):
@@ -94 +95 @@
             return None
 
-        if_data_body = self.read_next_if_data_blocks(if_data_header.block_count, if_data_header.block_length)
+        if_data_body = self.read_next_if_data_body(if_data_header.block_count, if_data_header.block_length)
 
         if if_data_body is None:
-            # print("Data body missing")
+            logging.debug("Data body missing")
             return None
 
         return AmmosGlobalFrameBody(if_data_header, if_data_body)
+
+    def data(self):
+        return b"".join([each.global_frame_body.data_body.data for each in self.container.global_frames])

sample_scripts/iqdw_reader.py

@@ -19 +19 @@
 
     dat_file.read_all_frames_left()
-    print(dat_file.container.size())
-
-#    for each in dat_file.container.global_frames:
-#        print(each)
+    print(len(dat_file.data()))