Skip to content
Snippets Groups Projects

Merge branch 'master' into 'production'

Closed Cain, Payton David requested to merge master into production
14 files
+ 647
254
Compare changes
  • Side-by-side
  • Inline
Files
14
@@ -161,6 +161,14 @@ class AdjustedAlgorithm(Algorithm):
@@ -161,6 +161,14 @@ class AdjustedAlgorithm(Algorithm):
):
):
return True
return True
 
# if E-E and E-N available
 
if (
 
"E-E" in channels
 
and "E-N" in channels
 
and super().can_produce_data(starttime, endtime, stream)
 
):
 
return True
 
# check validity of remaining channels
# check validity of remaining channels
for c in channels:
for c in channels:
if c != "F" and not (
if c != "F" and not (
Loading