From f138aeec37d7b03d7b129e6f91a7f85141bb9903 Mon Sep 17 00:00:00 2001
From: pcain-usgs <pcain@usgs.gov>
Date: Tue, 21 Jul 2020 09:33:32 -0600
Subject: [PATCH 1/3] Remove np.all in can_produce_data
---
geomagio/algorithm/AdjustedAlgorithm.py | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/geomagio/algorithm/AdjustedAlgorithm.py b/geomagio/algorithm/AdjustedAlgorithm.py
index f42353bb0..c1135e984 100644
--- a/geomagio/algorithm/AdjustedAlgorithm.py
+++ b/geomagio/algorithm/AdjustedAlgorithm.py
@@ -169,13 +169,13 @@ class AdjustedAlgorithm(Algorithm):
return True
# check validity of remaining channels
- if np.all(
- [
- super().can_produce_data(starttime, endtime, stream.select(channel=c))
- for c in channels
- if c != "F"
- ]
- ):
+ cpd = False
+ for c in channels:
+ if c != "F":
+ cpd = super().can_produce_data(
+ starttime, endtime, stream.select(channel=c)
+ )
+ if cpd == True:
return True
# return false if F or remaining channels cannot produce data
--
GitLab
From 4f02c4c334b9f11c5f67261f8743d057617d2f55 Mon Sep 17 00:00:00 2001
From: pcain-usgs <pcain@usgs.gov>
Date: Tue, 21 Jul 2020 10:56:46 -0600
Subject: [PATCH 2/3] Process all channels with can_produce_data
---
geomagio/algorithm/AdjustedAlgorithm.py | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/geomagio/algorithm/AdjustedAlgorithm.py b/geomagio/algorithm/AdjustedAlgorithm.py
index c1135e984..281005b55 100644
--- a/geomagio/algorithm/AdjustedAlgorithm.py
+++ b/geomagio/algorithm/AdjustedAlgorithm.py
@@ -169,17 +169,18 @@ class AdjustedAlgorithm(Algorithm):
return True
# check validity of remaining channels
- cpd = False
for c in channels:
if c != "F":
- cpd = super().can_produce_data(
- starttime, endtime, stream.select(channel=c)
- )
- if cpd == True:
- return True
+ if (
+ super().can_produce_data(
+ starttime, endtime, stream.select(channel=c)
+ )
+ == False
+ ):
+ return False
# return false if F or remaining channels cannot produce data
- return False
+ return True
@classmethod
def add_arguments(cls, parser):
--
GitLab
From 0967c70d9d9218423038b4a086d42c3f03b59e4e Mon Sep 17 00:00:00 2001
From: pcain-usgs <pcain@usgs.gov>
Date: Tue, 21 Jul 2020 10:59:32 -0600
Subject: [PATCH 3/3] Merge if statements
---
geomagio/algorithm/AdjustedAlgorithm.py | 13 +++++--------
1 file changed, 5 insertions(+), 8 deletions(-)
diff --git a/geomagio/algorithm/AdjustedAlgorithm.py b/geomagio/algorithm/AdjustedAlgorithm.py
index 281005b55..a4e65acb8 100644
--- a/geomagio/algorithm/AdjustedAlgorithm.py
+++ b/geomagio/algorithm/AdjustedAlgorithm.py
@@ -170,14 +170,11 @@ class AdjustedAlgorithm(Algorithm):
# check validity of remaining channels
for c in channels:
- if c != "F":
- if (
- super().can_produce_data(
- starttime, endtime, stream.select(channel=c)
- )
- == False
- ):
- return False
+ if c != "F" and (
+ super().can_produce_data(starttime, endtime, stream.select(channel=c))
+ == False
+ ):
+ return False
# return false if F or remaining channels cannot produce data
return True
--
GitLab