diff --git a/workflow/rna-seq.nf b/workflow/rna-seq.nf index e0b6cd30591f6f86dd61a24b80ab18e5a6938e59..b8de5d8a280b290161c207528655cbe507c2ebf6 100755 --- a/workflow/rna-seq.nf +++ b/workflow/rna-seq.nf @@ -115,8 +115,9 @@ process parseMetadata { path experimentMeta output: - val ends + val endsMeta val endsManual + val ends val stranded val spike val specie diff --git a/workflow/scripts/parseMeta.py b/workflow/scripts/parseMeta.py index d2fb8fae73348403032e7509b4a9e67cba30d3b7..825a37978cdcdc246c6ee457160373461c4b1c18 100644 --- a/workflow/scripts/parseMeta.py +++ b/workflow/scripts/parseMeta.py @@ -25,7 +25,7 @@ def main(): else: rep=metaFile["Replicate_RID"].unique()[0] print(rep) - if (len(metaFile[metaFile["File_Type"] == "FastQ"]) > 2): + if (len(metaFile[metaFile["File_Type"] == "FastQ"].all()) > 2): print("There are more then 2 fastq's in the metadata: " + " ".join(metaFile[metaFile["File_Type"] == "FastQ"].RID)) exit(1) if (args.parameter == "ends"): @@ -37,9 +37,9 @@ def main(): ends = "uk" print(ends) if (args.parameter == "endsManual"): - if (len(metaFile[metaFile["File_Type"] == "FastQ"]) == 1): + if (len(metaFile[metaFile["File_Type"] == "FastQ"].all()) == 1): endsManual = "se" - elif (len(metaFile[metaFile["File_Type"] == "FastQ"]) == 2): + elif (len(metaFile[metaFile["File_Type"] == "FastQ"].all()) == 2): endsManual = "pe" print(endsManual) if (args.parameter == "stranded"):