Merge branch 'fixes_for_AverageAlgorithm_20221207' into 'master'

Fixes for AverageAlgorithm - 20221207

See merge request !202

code.json

@@ -3,7 +3,7 @@
     "name": "geomag-algorithms",
     "organization": "U.S. Geological Survey",
     "description": "Library for processing Geomagnetic timeseries data.",
-    "version": "1.6.1",
+    "version": "1.6.2",
     "status": "Development",
     "permissions": {
       "usageType": "openSource",
@@ -35,7 +35,7 @@
       "email": "gs-haz_dev_team_group@usgs.gov"
     },
     "date": {
-      "metadataLastUpdated": "2022-11-29"
+      "metadataLastUpdated": "2022-12-07"
     }
   }
 ]
\ No newline at end of file

geomagio/TimeseriesUtility.py

@@ -388,17 +388,20 @@ def has_any_channels(stream, channels, starttime, endtime):
     bool: True if any data found between starttime/endtime
     """
     # process if any channels have data not covering the time range
-    input_gaps = get_stream_gaps(stream=stream, channels=channels)
-    for channel in channels:
-        if channel not in input_gaps:
-            continue
-        channel_gaps = input_gaps[channel]
-        if len(channel_gaps) == 0:
-            # no gaps in channel
-            return True
-        for gap in channel_gaps:
-            if not (starttime >= gap[0] and starttime <= gap[1] and endtime < gap[2]):
-                # gap doesn't span channel
+    for trace in stream:
+        if trace.stats.channel in channels:
+            gaps = get_trace_gaps(trace)
+            if len(gaps) == 0:
+                # no gaps in trace;
+                # "any" critierion achieved for stream
+                return True
+            nodata = [
+                (starttime >= gap[0] and starttime <= gap[1] and endtime < gap[2])
+                for gap in gaps
+            ]
+            if not any(nodata):
+                # no gaps in trace span interval;
+                # "any" criterion achieved for stream
                 return True
     # didn't find any data
     return False

geomagio/algorithm/AverageAlgorithm.py

@@ -287,4 +287,5 @@ class AverageAlgorithm(Algorithm):
             # the most recent interval should NOT allow fewer than the full
             # complement of inputs in order to calculate an average (previous
             # "update" intervals will allow fewer than the full complement)
-            self.min_count_end = arguments.starttime
+            delta = TimeseriesUtility.get_delta_from_interval(arguments.interval)
+            self.min_count_end = arguments.starttime - delta

pyproject.toml

@@ -17,7 +17,7 @@ packages = [
   {include = "geomagio" }
 ]
 repository="https://code.usgs.gov/ghsc/geomag/geomag-algorithms"
-version = "1.6.1"
+version = "1.6.2"
 
 
 [tool.poetry.dependencies]