Skip to content

Commit 987add7

Browse files
committed
Only attempt to set hashing methods on hashing jobs
1 parent d4ad7d4 commit 987add7

File tree

1 file changed

+11
-3
lines changed

1 file changed

+11
-3
lines changed

singlecell/api-src/org/labkey/api/singlecell/CellHashingService.java

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -112,11 +112,19 @@ public static CellHashingService.CellHashingParameters createFromStep(SequenceOu
112112
ret.htoOrCiteseqReadset = htoOrCiteseqReadset;
113113
ret.parentReadset = parentReadset;
114114
ret.htoOrCiteseqBarcodesFile = htoOrCiteseqBarcodesFile == null ? new File(ctx.getSourceDirectory(), type.getAllBarcodeFileName()) : htoOrCiteseqBarcodesFile;
115-
ret.methods = extractMethods(step.getProvider().getParameterByName("methods").extractValue(ctx.getJob(), step.getProvider(), step.getStepIdx(), String.class));
116115

117-
if (type == BARCODE_TYPE.hashing && ret.methods.isEmpty())
116+
if (type == BARCODE_TYPE.hashing)
118117
{
119-
throw new IllegalArgumentException("Must provide at least one calling method");
118+
String methodStr = StringUtils.trimToNull(step.getProvider().getParameterByName("methods").extractValue(ctx.getJob(), step.getProvider(), step.getStepIdx(), String.class));
119+
if (methodStr != null)
120+
{
121+
ret.methods = extractMethods(methodStr);
122+
}
123+
124+
if (ret.methods.isEmpty())
125+
{
126+
throw new IllegalArgumentException("Must provide at least one calling method");
127+
}
120128
}
121129

122130
return ret;

0 commit comments

Comments
 (0)