Bugfix to hashing consensus method warning

bbimber · bbimber · commit e8801ec7c7c1 · 2021-12-22T13:28:37.000-08:00
diff --git a/singlecell/api-src/org/labkey/api/singlecell/CellHashingService.java b/singlecell/api-src/org/labkey/api/singlecell/CellHashingService.java
@@ -133,8 +133,10 @@ public static CellHashingService.CellHashingParameters createFromStep(SequenceOu
                 if (methodStr2 != null)
                 {
                     ret.consensusMethods = extractMethods(methodStr2);
-
-                    throw new PipelineJobException("All consensusMethods must be present in methods: " + methodStr2);
+                    if (!ret.methods.containsAll(ret.consensusMethods))
+                    {
+                        throw new PipelineJobException("All consensusMethods must be present in methods: " + methodStr2);
+                    }
                 }
             }
 

Original file line number	Diff line number	Diff line change
`@@ -133,8 +133,10 @@ public static CellHashingService.CellHashingParameters createFromStep(SequenceOu`
`133`	`133`	`if (methodStr2 != null)`
`134`	`134`	`{`
`135`	`135`	`ret.consensusMethods = extractMethods(methodStr2);`
`136`		`-`
`137`		`- throw new PipelineJobException("All consensusMethods must be present in methods: " + methodStr2);`
	`136`	`+ if (!ret.methods.containsAll(ret.consensusMethods))`
	`137`	`+ {`
	`138`	`+ throw new PipelineJobException("All consensusMethods must be present in methods: " + methodStr2);`
	`139`	`+ }`
`138`	`140`	`}`
`139`	`141`	`}`
`140`	`142`