From b5dda0fff4e0120b845410003a6548ea2bdea54b Mon Sep 17 00:00:00 2001
From: "Erin (Josh) Rigler" <erigler@usgs.gov>
Date: Mon, 27 Jul 2020 15:52:24 +0000
Subject: [PATCH] Revert "Merge branch 'adjusted-fix' into 'master'"
This reverts merge request !6
---
geomagio/algorithm/AdjustedAlgorithm.py | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/geomagio/algorithm/AdjustedAlgorithm.py b/geomagio/algorithm/AdjustedAlgorithm.py
index a4e65acb8..f42353bb0 100644
--- a/geomagio/algorithm/AdjustedAlgorithm.py
+++ b/geomagio/algorithm/AdjustedAlgorithm.py
@@ -169,15 +169,17 @@ class AdjustedAlgorithm(Algorithm):
return True
# check validity of remaining channels
- for c in channels:
- if c != "F" and (
+ if np.all(
+ [
super().can_produce_data(starttime, endtime, stream.select(channel=c))
- == False
- ):
- return False
+ for c in channels
+ if c != "F"
+ ]
+ ):
+ return True
# return false if F or remaining channels cannot produce data
- return True
+ return False
@classmethod
def add_arguments(cls, parser):
--
GitLab