diff --git a/ui/nG6/Classes/Controller/class.tx_nG6_utils.php b/ui/nG6/Classes/Controller/class.tx_nG6_utils.php index b593d4977366c11e1761005da5bb24744045aa0e..78cf9573f3f59837a454e04a30e3db9a1dca22a1 100644 --- a/ui/nG6/Classes/Controller/class.tx_nG6_utils.php +++ b/ui/nG6/Classes/Controller/class.tx_nG6_utils.php @@ -212,7 +212,7 @@ class tx_nG6_utils { return 0; } #Exclusion of the log files from the purge process -// $stream = ssh2_exec($connection, 'find '.$directory.' -maxdepth 1 -not -name "*.html" -not -name "*.png" -not -name "*.log" -not -name "*.log.gz" -not -name "*.pdf" -not -name "md5sum.txt" -not -name "*GXB02039*" -not -name "*PCT0078*" -type f -exec rm -f {} \;'); +// $stream = ssh2_exec($connection, 'find '.$directory.' -maxdepth 1 -not -name "*.html" -not -name "*.png" -not -name "*.log" -not -name "*.log.gz" -not -name "*.pdf" -not -name "md5sum.txt" -name "*GXB02039*fastq.gz" -name "*PCT0078*fastq.gz" -type f -exec rm -f {} \;'); // $errorStream = ssh2_fetch_stream($stream, SSH2_STREAM_STDERR); // // Enable blocking for both streams // stream_set_blocking($errorStream, true); diff --git a/workflows/methylseq/components/bismark.py b/workflows/methylseq/components/bismark.py index 57e80a9c07bcec2b3f24a8f7354cb59530aa1015..53e1ab7555392f994d4ba1da8a61381c8188429f 100644 --- a/workflows/methylseq/components/bismark.py +++ b/workflows/methylseq/components/bismark.py @@ -99,8 +99,8 @@ class Bismark (Analysis): # 2 bowtie process are launch in directional mode so divided allocated cpu for each bowtie self.args += " --p "+ str(int(self.nb_proc/2)) self.args += " --bowtie2" - if not os.path.dirname(self.get_exec_path("bowtie2")) == "" : - self.args += " --path_to_bowtie " + os.path.dirname(self.get_exec_path("bowtie2")) + #if not os.path.dirname(self.get_exec_path("bowtie2")) == "" : + # self.args += " --path_to_bowtie " + os.path.dirname(self.get_exec_path("bowtie2")) self.options = self.args + " | Databank " + os.path.basename(self.reference_genome) diff --git a/workflows/methylseq/components/bismark_genome_preparation.py b/workflows/methylseq/components/bismark_genome_preparation.py index 38e2afc3eb25edaaf35e858389e0ae2698dbc664..a9a023554bac49aba96c2bc95caa57fc47bf054e 100644 --- a/workflows/methylseq/components/bismark_genome_preparation.py +++ b/workflows/methylseq/components/bismark_genome_preparation.py @@ -57,8 +57,8 @@ class BismarkGenomePreparation (Component): if not self.bowtie1 : btw_param = " --bowtie2" - if not os.path.dirname(self.get_exec_path("bowtie2")) == "" : - btw_param += " --path_to_bowtie " + os.path.dirname(self.get_exec_path("bowtie2")) + #if not os.path.dirname(self.get_exec_path("bowtie2")) == "" : + # btw_param += " --path_to_bowtie " + os.path.dirname(self.get_exec_path("bowtie2")) self.args += "\\'"+btw_param+"\\'" diff --git a/workflows/methylseq/components/trim_galore.py b/workflows/methylseq/components/trim_galore.py index 780a62fab07b016928ef2bd79fd02955f48461e5..a9f557540ddd776a1f2497fd9e4f4a3fbd504a23 100644 --- a/workflows/methylseq/components/trim_galore.py +++ b/workflows/methylseq/components/trim_galore.py @@ -80,12 +80,12 @@ class TrimGalore (Analysis): def process(self): if self.is_paired: - self.add_shell_execution( self.get_exec_path("trim_galore") + " " + self.options + \ + self.add_shell_execution( "module load bioinfo/Cutadapt/1.8.3;module load bioinfo/TrimGalore/0.4.5;"+ self.get_exec_path("trim_galore") + " " + self.options + \ " -o " + self.output_directory + " $1 $2 >$3 2>> $4 ", cmd_format='{EXE} {IN} {OUT}', map=True, inputs=[self.input_files_R1, self.input_files_R2], outputs=[self.stderrs,self.stdouts,self.output_files_R1,self.output_files_R2,self.report_files_R1,self.report_files_R2]) else : - self.add_shell_execution( self.get_exec_path("trim_galore") + " " + self.options + \ + self.add_shell_execution( "module load bioinfo/Cutadapt/1.8.3;module load bioinfo/TrimGalore/0.4.5;"+ self.get_exec_path("trim_galore") + " " + self.options + \ " -o " + self.output_directory + " $1 > $2 2>> $3 ", cmd_format='{EXE} {IN} {OUT}', map=True, inputs=[self.input_files_R1], outputs=[self.stderrs,self.stdouts,self.output_files_R1,self.report_files_R1])