Skip to content

Commit 6bf3fff

Browse files
committed
Improve handling of RIRA filters
1 parent 8b225fb commit 6bf3fff

3 files changed

Lines changed: 10 additions & 4 deletions

File tree

singlecell/resources/chunks/UpdateSeuratPrototype.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ for (datasetId in names(seuratObjects)) {
2626
}
2727

2828
if (runRira) {
29-
seuratObj <- RIRA::Classify_ImmuneCells(seuratObj, maxBatchSize = maxBatchSize, retainProbabilityMatrix = retainProbabilityMatrix)
29+
seuratObj <- RIRA::Classify_ImmuneCells(seuratObj, maxBatchSize = maxBatchSize, retainProbabilityMatrix = retainProbabilityMatrix, maxAllowedUnknown = maxAllowedUnknown)
3030
seuratObj <- RIRA::Classify_TNK(seuratObj, maxBatchSize = maxBatchSize, retainProbabilityMatrix = retainProbabilityMatrix)
3131
seuratObj <- RIRA::Classify_Myeloid(seuratObj, maxBatchSize = maxBatchSize, retainProbabilityMatrix = retainProbabilityMatrix)
3232
}

singlecell/src/org/labkey/singlecell/pipeline/singlecell/RunRiraClassification.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,12 @@ public Provider()
2828
{{
2929
put("checked", true);
3030
}}, true),
31-
SeuratToolParameter.create("maxAllowedUnknown", "Max Allowed Unknown", "If provided, ", "ldk-numberfield", new JSONObject()
31+
SeuratToolParameter.create("maxAllowedUnknown", "Max Allowed Unknown", "If provided, this step will throw an error is more than this fraction of cells fail the check for disallowed UCell combinations", "ldk-numberfield", new JSONObject()
3232
{{
3333
put("minValue", 0);
3434
put("maxValue", 1);
3535
put("decimalPrecision", 2);
36-
}}, true)
36+
}}, 0.1)
3737
), null, null);
3838
}
3939

singlecell/src/org/labkey/singlecell/pipeline/singlecell/UpdateSeuratPrototype.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,13 @@ public Provider()
6363
SeuratToolParameter.create("keepOriginal", "Keep Copy of Original File", "If checked, the original file will be copied with the file extension '.bk'", "checkbox", new JSONObject()
6464
{{
6565
put("checked", false);
66-
}}, false)
66+
}}, false),
67+
SeuratToolParameter.create("maxAllowedUnknown", "Max Allowed Unknown (RIRA)", "If provided, this step will throw an error is more than this fraction of cells fail the check for disallowed UCell combinations", "ldk-numberfield", new JSONObject()
68+
{{
69+
put("minValue", 0);
70+
put("maxValue", 1);
71+
put("decimalPrecision", 2);
72+
}}, 0.1)
6773
), null, null);
6874
}
6975

0 commit comments

Comments
 (0)