Changeset 5d039b8 in ammosreader

Timestamp:

07/25/22 09:40:40 (3 years ago)

Author:

Enrico Schwass <ennoausberlin@…>

Branches:

AmmosSource, guix

Children:

5ba04b8, e4e63a3

Parents:

dbcb255

Message:

dtoa and time of arrival as keys used

Location:

ammosreader

Files:

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

ammosreader/PDW.py

@@ -223 +223 @@
 
     def to_json(self):
-        return {'TIMEOFARRIVAL': self.time_of_arrival,
+        return {'time of arrival': self.time_of_arrival,
                 'FORMATIDENTIFIER': self.pdw_format_identifier,
-                'CENTERFREQUENCY': self.center_frequency,
+                'center frequency': self.center_frequency,
                 'VALID': self.is_valid,
                 'PULSE': self.is_pulse,

ammosreader/PPDWContainer.py

@@ -29 +29 @@
         for index, current_pdw in enumerate(self.signals[1:]):
             pulse_dict[index+1] = current_pdw.to_json()
-            pulse_dict[index]["TIMEDELTA"] = current_pdw.time_of_arrival - pulse_dict[index]["TIMEOFARRIVAL"]
-        pulse_dict[index+1]["TIMEDELTA"] = 0
+            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')
         return pulse_dict
 
@@ -60 +60 @@
                 'STARTTIME': str(self.start_time()),
                 'ENDTIME': str(self.end_time()),
-                # 'CENTERFREQUENCIES': self.center_frequencies(),
-                'CHANNELS': self.channels()
-                # 'MODULATIONS': self.modulations(),
-                # 'BANDWIDTHS': self.bandwidths()
+                'CENTERFREQUENCIES': self.center_frequencies(),
+                'CHANNELS': self.channels(),
+                'MODULATIONS': self.modulations(),
+                'BANDWIDTHS': self.bandwidths()
                 }