Merge branch 'fix_geomag-filter_controller_10March2025' into 'master'

Clean up to support and/or match geomagio scripts

See merge request !399

geomagio/Controller.py

@@ -290,7 +290,7 @@ class Controller(object):
             channels=input_channels,
             interval=input_interval,
         )
-        if not algorithm.can_produce_data(
+        if not timeseries or not algorithm.can_produce_data(
             starttime=timeseries[0].stats.starttime,
             endtime=timeseries[0].stats.endtime,
             stream=timeseries,
@@ -632,8 +632,8 @@ def get_output_factory(args):
             locationCode=locationcode,
             tag=args.output_edge_tag,
             forceout=args.output_edge_forceout,
-            scale_factor=args.input_scale_factor or args.scale_factor,
-            sncl_mode=args.input_sncl_mode or args.sncl_mode,
+            scale_factor=args.output_scale_factor or args.scale_factor,
+            sncl_mode=args.output_sncl_mode or args.sncl_mode,
             **output_factory_args,
         )
     elif output_type == "plot":
@@ -664,8 +664,8 @@ def get_output_factory(args):
                 port=args.output_read_port,
                 write_port=args.output_port,
                 locationCode=locationcode,
-                scale_factor=args.input_scale_factor or args.scale_factor,
-                sncl_mode=args.input_sncl_mode or args.sncl_mode,
+                scale_factor=args.output_scale_factor or args.scale_factor,
+                sncl_mode=args.output_sncl_mode or args.sncl_mode,
                 **output_factory_args,
             )
         elif output_type == "xml":

geomagio/edge/LegacySNCL.py

@@ -11,6 +11,16 @@ ELEMENT_CONVERSIONS = {
     "SV": "SV",
     "DIST": "DT",
     "DST": "GD",
+    # temperatures
+    "T1": "K1",
+    "T2": "K2",
+    "T3": "K3",
+    "T4": "K4",
+    "T5": "K5",
+    "T6": "K6",
+    "T7": "K7",
+    "T8": "K8",
+    "T9": "K9",
 }
 CHANNEL_CONVERSIONS = {
     ELEMENT_CONVERSIONS[key]: key for key in ELEMENT_CONVERSIONS.keys()

geomagio/edge/SNCL.py

@@ -14,6 +14,11 @@ ELEMENT_CONVERSIONS = {
     "T2": "K2",
     "T3": "K3",
     "T4": "K4",
+    "T5": "K5",
+    "T6": "K6",
+    "T7": "K7",
+    "T8": "K8",
+    "T9": "K9",
 }
 
 CHANNEL_CONVERSIONS = {

geomagio/processing/filters.py

@@ -242,7 +242,7 @@ def realtime_command(
         )
         minute_filter(
             observatory=observatory,
-            channels=("U", "V", "W"),
+            channels=("H", "E", "Z"),
             input_factory=EdgeFactory(
                 host=input_host,
                 port=input_port,  # earthworm port required for realtime
@@ -263,7 +263,7 @@ def realtime_command(
         # transmits scaled integer data
         minute_filter(
             observatory=observatory,
-            channels=("F", "T1", "T2", "T3", "T4"),
+            channels=("F", "T1", "T2", "T3", "T4", "T5"),
             input_factory=MiniSeedFactory(
                 host=input_host,
                 port=None,  # use MiniSeedFactory default
@@ -284,9 +284,9 @@ def realtime_command(
         _copy_channels(
             observatory=observatory,
             channels=(
-                ("U", "H"),
-                ("V", "E"),
-                ("W", "Z"),
+                ("H", "H"),
+                ("E", "E"),
+                ("Z", "Z"),
                 ("F", "F"),
             ),
             interval="minute",
@@ -312,9 +312,9 @@ def realtime_command(
         _copy_channels(
             observatory=observatory,
             channels=(
-                ("H", "U"),
-                ("E", "V"),
-                ("Z", "W"),
+                ("H", "H"),
+                ("E", "E"),
+                ("Z", "Z"),
                 ("F", "F"),
             ),
             interval="second",
@@ -334,32 +334,13 @@ def realtime_command(
             realtime_interval=realtime_interval,
             update_limit=update_limit,
         )
-        minute_filter(
-            observatory=observatory,
-            channels=("U", "V", "W", "F"),
-            input_factory=EdgeFactory(
-                host=input_host,
-                port=input_port,
-                type="variation",
-                sncl_mode="geomag",
-            ),
-            output_factory=EdgeFactory(
-                host=output_host,
-                port=output_read_port,
-                write_port=output_port,
-                type="variation",
-                sncl_mode="geomag",
-            ),
-            realtime_interval=realtime_interval,
-            update_limit=update_limit,
-        )
-        # remove the following after data migration is complete
+        # legacy PCDCP processing
         _copy_channels(
             observatory=observatory,
             channels=(
-                ("U", "H"),
-                ("V", "E"),
-                ("W", "Z"),
+                ("H", "H"),
+                ("E", "E"),
+                ("Z", "Z"),
                 ("F", "F"),
             ),
             interval="minute",
@@ -367,14 +348,14 @@ def realtime_command(
                 host=input_host,
                 port=input_port,
                 type="variation",
-                sncl_mode="geomag",
+                sncl_mode="legacy",
             ),
             output_factory=EdgeFactory(
                 host=output_host,
                 port=output_read_port,
-                write_port=7981,
+                write_port=output_port,
                 type="variation",
-                sncl_mode="legacy",
+                sncl_mode="geomag",
             ),
             realtime_interval=realtime_interval,
             update_limit=update_limit,