Commit 38765a46 authored by Penom Nom's avatar Penom Nom
Browse files

Workflow execution before OTUAnalysis.

parent ea1bac54
......@@ -135,6 +135,6 @@ class MiSeqDiversity (NG6Workflow):
else:
distseqs = self.add_component("MothurDistSeqs", kwargs={'fasta_files':chimerauchime.pick_fasta_files,'processors':self.args["processors"]})
cluster = self.add_component("MothurCluster", kwargs={'dist_files':distseqs.dist_files,'count_table_files':chimerauchime.good_count_table_files})
self._execute_weaver() # MothurOTUAnalysis waits MothurCluster or MothurClusterSplit to define its parameters
otuanalysis = self.add_component("MothurOTUAnalysis", kwargs={'an_list_files':cluster.an_list_files,'count_table_files':chimerauchime.good_count_table_files,'taxonomy_files':classifyseqs.taxonomy_files,'label':self.args["labels"],'tree_label':self.args["labels"],'without_krona':self.args["without_krona"]},parent=chimerauchime)
......@@ -47,6 +47,7 @@ class R454diversity (NG6Workflow):
# OTUs approach
distseqs = self.add_component("MothurDistSeqs", [chimerauchime.pick_fasta_files])
cluster = self.add_component("MothurCluster", [distseqs.dist_files,chimerauchime.pick_names_files])
self._execute_weaver() # MothurOTUAnalysis waits MothurCluster to define its parameters
otuanalysis = self.add_component("MothurOTUAnalysis", kwargs={'an_list_files':cluster.an_list_files,'groups_files':chimerauchime.pick_groups_files,\
'names_files':chimerauchime.pick_names_files,'taxonomy_files':classifyseqs.taxonomy_files,'label':self.args["labels"],'tree_label':self.args["labels"],
'without_krona':self.args["without_krona"]},parent=chimerauchime)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment