Changeset 94f7c24 in ammosreader

Timestamp:

05/05/22 16:19:02 (3 years ago)

Author:

Enrico Schwass <ennoausberlin@…>

Branches:

AmmosSource, guix

Children:

4180d6a

Parents:

6808525

Message:

print statements removed and typo fixed

Files:

• sample_scripts/import_signal.py (modified) (1 diff)
• src/ammosreader/AmmosIFReader.py (modified) (9 diffs)
• src/ammosreader/AmmosSingleFrame.py (modified) (1 diff)
• src/ammosreader/PPDWReader.py (modified) (1 diff)

sample_scripts/import_signal.py

@@ -56 +56 @@
     # sys.exit(1)
 
-ammos_reader = AmmosIFReader(str(iqdw_file))
-ammos_reader.read_all_frames_left()
-print(ammos_reader.container)
+ammos_if_reader = AmmosIFReader(str(iqdw_file))
+ammos_if_reader.read_all_frames_left()
+# for each_frame in ammos_if_reader.container.global_frames:
+#    print(each_frame)
 
 ppdw_reader = PPDWReader(ppdw_file)

src/ammosreader/AmmosIFReader.py

@@ -17 +17 @@
         self.file_name = file_name
         self.file = open(self.file_name, "rb")
-        self.file_size = os.path.getsize(self.file_name)
 
         self.container = AmmosContainer(self.file_name, [])
 
         self.tags = []
-
-    def rewind_to_start(self):
-        self.file.seek(0)
 
     def add_tag(self, tag):
@@ -34 +30 @@
 
         while True:
-            print("Reading single frame", frames_read, '...')
+            # print("Reading single frame", frames_read, '...')
             current_frame = self.read_next_single_frame()
             if current_frame is not None:
                 frames_read += 1
                 self.container.add_frame(current_frame)
-                if frames_read % 10000 == 0:
-                    print("#", end="")
+                # if frames_read % 10000 == 0:
+                #    print("#", end="")
             else:
-                print("Frame:", frames_read+1, " incomplete")
+                # print("Frame:", frames_read+1, " incomplete")
                 break
 
-        print(len(self.container.global_frames), "frames read")
+        # print(len(self.container.global_frames), "frames read")
 
     def read_next_global_frame_header(self):
         bytes = self.file.read(24)
-        print("Reading next global frame header")
+        # print("Reading next global frame header")
         if ((not bytes) or (len(bytes) < 24)):
-            print("Can not read all 24 bytes of global frame header")
+            # print("Can not read all 24 bytes of global frame header")
             return None
 
@@ -62 +58 @@
         # print("\nReading global frame body standard data header\n")
         if ((not bytes) or (len(bytes) < 56)):
-            print("Can not read all 56 bytes of global frame body data header")
+            # print("Can not read all 56 bytes of global frame body data header")
             return None
 
@@ -75 +71 @@
 
         if ((not bytes) or (len(bytes) < 76)):
-            print("Can not read all ", 76, "bytes of global frame extended data header")
+            # print("Can not read all ", 76, "bytes of global frame extended data header")
             return None
         extended_data_header = AmmosExtendedIFDataHeader.from_bytes(bytes)
@@ -94 +90 @@
 
         if len(byte_string) != total:
-            print("Can not read all", total, "bytes of data body")
+            # print("Can not read all", total, "bytes of data body")
             return None
 
@@ -113 +109 @@
 
         if if_data_header is None:
-            print("Data header missing")
+            # print("Data header missing")
             return None
 
@@ -119 +115 @@
 
         if if_data_body is None:
-            print("Data body missing")
+            # print("Data body missing")
             return None
 
@@ -128 +124 @@
         global_frame_header = self.read_next_global_frame_header()
 
-        print("\nReading next global frame header\n", global_frame_header)
+        # print("\nReading next global frame header\n", global_frame_header)
         # print("File pointer", self.file.tell())
 
         if global_frame_header is None:
-            print("Global frame header missing")
+            # print("Global frame header missing")
             return None
 
         if global_frame_header.data_header_length is None:
-            print("Data header length empty")
+            # print("Data header length empty")
             return None
 
@@ -146 +142 @@
 
         else:
-            print("Unsupported frame type", global_frame_header.frame_type, "found")
+            # print("Unsupported frame type", global_frame_header.frame_type, "found")
             return None
 

src/ammosreader/AmmosSingleFrame.py

@@ -18 +18 @@
             "Global frame header\n" +
             "-------------------\n" +
-            "Frame tyoe:" + str(self.global_frame_header.frame_type) + "\n" +
+            "Frame type:" + str(self.global_frame_header.frame_type) + "\n" +
             "Frame count:" + str(self.global_frame_header.running_frame_number) + "\n" +
             "Data header length:" + str(self.global_frame_header.data_header_length) + " bytes\n" +

src/ammosreader/PPDWReader.py

@@ -19 +19 @@
             assert len(current_bytes) == 32
             if not current_bytes:
-                print('End of file detected')
+                # print('End of file detected')
                 break
             if self.cursor + 32 >= len(self.content):
-                print('Can not read all 32 bytes of next PDW')
+                # print('Can not read all 32 bytes of next PDW')
                 break
             self.container.add(PDW.from_bytes(current_bytes))