Skip to content

Commit 7273626

Browse files
committed
edge case fix for FlatFile inputs
1 parent bc6f8fb commit 7273626

File tree

1 file changed

+10
-13
lines changed

1 file changed

+10
-13
lines changed

exec/SCTK_runQC.R

+10-13
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ if (is.null(subTitles)) {
246246

247247
if ("HTAN" %in% formats) {
248248
if (!("FlatFile" %in% formats)) {
249-
message("Notice: HTAN specified as output without FlatFile. Automatically including FlatFile export.")
249+
message("Note: HTAN specified as output without FlatFile. Automatically including FlatFile export.")
250250
formats <- append(formats, "FlatFile")
251251
}
252252
}
@@ -334,20 +334,18 @@ if (!is.null(gmt)) {
334334
level3Meta <- list()
335335
level4Meta <- list()
336336

337-
#if (!is.null(flatFiles)) {
338-
# flatFiles <- split(flatFiles, ceiling(seq_along(flatFiles)/6))
339-
#}
340-
341337
for(i in seq_along(process)) {
342338

343339
# pop elements from FlatFile input list
344-
if (dataType %in% c("Droplet", "Cell")) {
345-
flatFileInput <- flatFiles[c(1, 2, 3)]
346-
flatFiles <- flatFiles[-c(1, 2, 3)]
347-
}
348-
else {
349-
flatFileInput <- flatFiles[c(1, 2, 3, 4, 5, 6)]
350-
flatFiles <- flatFiles[-c(1, 2, 3, 4, 5, 6)]
340+
if ("FlatFile" %in% process[i]) {
341+
if (dataType %in% c("Droplet", "Cell")) {
342+
flatFileInput <- flatFiles[c(1, 2, 3)]
343+
flatFiles <- flatFiles[-c(1, 2, 3)]
344+
}
345+
else {
346+
flatFileInput <- flatFiles[c(1, 2, 3, 4, 5, 6)]
347+
flatFiles <- flatFiles[-c(1, 2, 3, 4, 5, 6)]
348+
}
351349
}
352350

353351
preproc <- process[i]
@@ -356,7 +354,6 @@ for(i in seq_along(process)) {
356354
raw <- RawDir[i]
357355
fil <- FilterDir[i]
358356
ref <- Reference[i]
359-
#flatFiles <- flatFiles[[i]]
360357
rawFile <- RawFile[i]
361358
filFile <- FilterFile[i]
362359
subTitle <- subTitles[i]

0 commit comments

Comments
 (0)