Skip to content

Commit

Permalink
closes #14 execute pipeline from a single config on cluster
Browse files Browse the repository at this point in the history
  • Loading branch information
immanp committed Dec 31, 2013
1 parent 703b422 commit 5df43b4
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 14 deletions.
5 changes: 2 additions & 3 deletions pipeline_start_template.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
project_Name: test
mapping:
fastQ_directory_path: /test/
fastQ_directory_path: /home/immanuel/Documents/test_project/test_data
proc: 16
aligner: tophat2
genome: mouse
strand:

strand:
5 changes: 2 additions & 3 deletions src/analysis_framework.py
Original file line number Diff line number Diff line change
Expand Up @@ -93,9 +93,8 @@ def writeMappingScript(self,userInput): #writes mapping script
outdir = inputs.projName()+"/"+line+"."+ inputs.aligner()
align = Mapping(self.fastqs.read1(sample),inputs.proc(), outdir,settings.genomes()[inputs.genome()][inputs.aligner()],fastqR2=self.fastqs.read2(sample))


if inputs.aligner() == "tophat2":
if settings.getEnv()["cluster"] is not 'None':
if inputs.aligner() == "tophat2": #logic for tophat alignment...
if settings.getEnv()["cluster"] is not 'None': #...on a cluster such as minerva
file = open(settings.homeDir()+"/"+inputs.projName()+"/"+"scripts/mapping/"+line+".tophat2.mapping.pbs", "w") #change to relative path
#insert pbs headers
#insert load modules
Expand Down
8 changes: 0 additions & 8 deletions src/complete_seq.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,17 +16,9 @@ def main():
directories = SetProjectEnv(settings.homeDir(),pipeline_command.projName())
writer = ScriptWriter() #simplify this


directories.makeProj() #project directory created
directories.startMappingEnv() #mapping subdirectories created
writer.writeMappingScript(options.pipeline_input)
# make project environment

# write project scripts
# launch project scripts




if __name__ == '__main__':
main()

0 comments on commit 5df43b4

Please sign in to comment.