Changes in / [27e3114:6d35183] in ammosreader

Files:

• sample_scripts/import_signal.py (modified) (1 diff)
• sample_scripts/import_signals.py (deleted)
• src/_version.py (modified) (1 diff)
• src/ammosreader.egg-info/PKG-INFO (modified) (1 diff)
• src/ammosreader.egg-info/SOURCES.txt (modified) (1 diff)
• src/ammosreader/PPDWContainer.py (modified) (3 diffs)

sample_scripts/import_signal.py

@@ -82 +82 @@
 source_collection = year_collection[source]
 
-json_representation = ppdw_reader.container.to_json()
-json_representation['SIGNALNUMBER'] = signal_number
-json_representation['SOURCEFILE'] = str(ppdw_file)
-source_collection.insert_one(json_representation)
 
-# for each in ppdw_reader.container.signals:
-#    each_json = each.to_json()
-#    each_json['SIGNALNUMBER'] = signal_number
-#    each_json['JULIANDATE'] = julian_date_string
-#    each_json['SOURCEFILE'] = str(ppdw_file)
-#    source_collection.insert_one(each_json)
+for each in ppdw_reader.container.signals:
+    each_json = each.to_json()
+    each_json['SIGNALNUMBER'] = signal_number
+    each_json['JULIANDATE'] = julian_date_string
+    # each_json['SOURCEFILE'] = str(ppdw_file)
+    source_collection.insert_one(each_json)

src/_version.py

@@ -2 +2 @@
 # file generated by setuptools_scm
 # don't change, don't track in version control
-version = '0.1.dev60+g4180d6a.d20220509'
-version_tuple = (0, 1, 'dev60', 'g4180d6a.d20220509')
+version = '0.1.dev59+g94f7c24.d20220506'
+version_tuple = (0, 1, 'dev59', 'g94f7c24.d20220506')

src/ammosreader.egg-info/PKG-INFO

@@ -1 +1 @@
 Metadata-Version: 2.1
 Name: ammosreader
-Version: 0.1.dev60+g4180d6a.d20220509
+Version: 0.1.dev59+g94f7c24.d20220506
 Summary: ammosreader: tool to parse R&S Ammos files
 Home-page: http://gitlab.kid.local/kidzg/ammosreader

src/ammosreader.egg-info/SOURCES.txt

@@ -5 +5 @@
 __init__.py
 pyproject.toml
-reqs.txt
 setup.cfg
 setup.py

src/ammosreader/PPDWContainer.py

@@ -1 @@
-import numpy as np
-from datetime import datetime
-
-
 class PPDWContainer():
     """
@@ -24 +20 @@
         self.signals.append(a_pdw)
 
-    def julian_date_string(self):
-        ts = (self.start_time() - np.datetime64('1970-01-01T00:00:00')) / np.timedelta64(1, 's')
-        time_tuple = datetime.utcfromtimestamp(ts).timetuple()
-        return str(time_tuple.tm_year)[2:] + str(time_tuple.tm_yday).zfill(3)
-
-    def center_frequencies(self):
-        return list({each.center_frequency for each in self.signals})
-
-    def channels(self):
-        return list({each.channel for each in self.signals})
-
-    def modulations(self):
-        return list({each.modulation for each in self.signals})
-
-    def bandwidths(self):
-        return list({each.frequency_shift_or_bandwidth for each in self.signals})
-
     def start_time(self):
         return min([each.time_of_arrival for each in self.signals])
@@ -47 +26 @@
         return max([each.time_of_arrival for each in self.signals])
 
-    def to_json(self):
-        return {'JULIANDATE': self.julian_date_string(),
-                'STARTTIME': str(self.start_time()),
-                'ENDTIME': str(self.end_time()),
-                # 'CENTERFREQUENCIES': self.center_frequencies(),
-                'CHANNELS': self.channels()
-                # 'MODULATIONS': self.modulations(),
-                # 'BANDWIDTHS': self.bandwidths()
-                }
-
 if __name__ == '__main__':
     pass