Changes in / [d8483f7:5ba04b8] in ammosreader

Location:

ammosreader

Files:

• PDW.py (modified) (4 diffs)
• PPDWContainer.py (modified) (2 diffs)
• PPDWReader.py (modified) (1 diff)

ammosreader/PDW.py

@@ -141 +141 @@
         self.pdw_format_identifier = pdw_format_identifier
         self.center_frequency = center_frequency #
-        self.__is_valid = is_valid #
+        self.is_valid = is_valid #
         self.is_pulse = is_pulse #
         self.level_unit = level_unit #
@@ -169 +169 @@
                   "Center frequency: " + str(self.center_frequency) + " KHz\n")
 
-        if self.__is_valid:
+        if self.is_valid:
             output += "Signal: Valid\n"
         else:
@@ -221 +221 @@
 
         return output
-
-    def is_valid(self):
-        return self.__is_valid
 
     def to_json(self):
@@ -229 +226 @@
                 'FORMATIDENTIFIER': self.pdw_format_identifier,
                 'center frequency': self.center_frequency,
-                'VALID': self.__is_valid,
+                'VALID': self.is_valid,
                 'PULSE': self.is_pulse,
                 'PULSELEVEL': self.pulse_level_or_pulse_field_strength,

ammosreader/PPDWContainer.py

@@ -16 +16 @@
             self.signals = signals
 
-        self.name = name
-
     def __str__(self):
         return "\n".join(["Number of pulses:" + str(len(self.signals)),
-                          "Number of invalid pulses:" + str(self.number_of_invalid_pulses()),
                           "Start time:" + str(self.start_time()),
                           "End time:" + str(self.end_time())])
 
     def add(self, a_pdw):
-        # print(a_pdw)
         self.signals.append(a_pdw)
 
     def as_pulse_dict(self):
-        print(datetime.now())
         pulse_dict = {}
         pulse_dict[0] = self.signals[0].to_json()
@@ -36 +31 @@
             pulse_dict[index]["dtoa"] = (current_pdw.time_of_arrival - pulse_dict[index]["time of arrival"]).item()/1000.0
         pulse_dict[index+1]["dtoa"] = 0.0  # np.timedelta64(0, 'us')
-        print(datetime.now())
         return pulse_dict
-
-    def number_of_invalid_pulses(self):
-        return sum(not each.is_valid() for each in self.signals)
-
-    def without_invalids(self):
-        return PPDWContainer(self.name, [each for each in self.signals if each.is_valid()])
 
     def julian_date_string(self):

ammosreader/PPDWReader.py

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