X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=fpkm_from_srr;h=8e207f3a2af315a8a86a937776c1c5db806b418d;hb=66dff3e460c53c14f87ead2149fc81aeb02d2ed6;hp=dab329d9ba2b526621346712a6867ecc0751937c;hpb=6eda7b21639ec4a10d08e7de149d08f60d623504;p=uiuc_igb_scripts.git

diff --git a/fpkm_from_srr b/fpkm_from_srr
index dab329d..8e207f3 100755
--- a/fpkm_from_srr
+++ b/fpkm_from_srr
@@ -1,17 +1,18 @@
 #!/bin/bash
-# PBS -M id -un
 
 CORES=8
-MAX_MEM=32
+MAX_MEM="18GB"
 
+set -e;
 
 function actually_run_the_alignment {
     module load sratoolkit/2.3.5-2;
     module load bwa/0.7.10;
     module load cufflinks/2.2.1;
-    (cd $FROM_SRR_SRR;
-     fastq-dump ${FROM_SRR_SRR}.sra;
-     bwa mem -t ${CORES} $FROM_SRR_REF ${FROM_SRR_SRR}.fastq.gz | samtools view -b -o ${FROM_SRR_SRR}.bam;
+    module load samtools/1.0;
+    (cd "${FROM_SRR_SRR}";
+     fastq-dump --gzip ${FROM_SRR_SRR}.sra;
+     bwa mem -t ${CORES} $FROM_SRR_REF ${FROM_SRR_SRR}.fastq.gz | samtools view -b -o ${FROM_SRR_SRR}.bam -;
      samtools sort ${FROM_SRR_SRR}.bam -o ${FROM_SRR_SRR}.sorted.bam -T temp
      cufflinks -p ${MAX_MEM} -G $FROM_SRR_GTF ${FROM_SRR_SRR}.sorted.bam;
      rm -f ${FROM_SRR_SRR}.fastq.gz ${FROM_SRR_SRR}.bam
@@ -24,16 +25,15 @@ function set_up_the_run {
     FROM_SRR_GTF="$3"
     export FROM_SRR_SRR FROM_SRR_GTF FROM_SRR_REF;
     mkdir -p "$FROM_SRR_SRR";
-    set -e;
-    (cd $FROM_SRR_SRR;
-     wget -O ${FROM_SRR_SRR}.sra ftp://ftp-trace.ncbi.nlm.nih.gov:/sra/sra-instant/reads/ByRun/sra/SRR/${FROM_SRR_SRR:0:6}/${FROM_SRR_SRR}/${FROM_SRR_SRR}.sra;
+    (cd "$FROM_SRR_SRR";
+     rsync -avP rsync://ftp-trace.ncbi.nlm.nih.gov/sra/sra-instant/reads/ByRun/sra/SRR/${FROM_SRR_SRR:0:6}/${FROM_SRR_SRR}/${FROM_SRR_SRR}.sra .;
     );
-    qsub -q budget -v FROM_SRR_SRR,FROM_SRR_GTF,FROM_SRR_REF -S /bin/bash -d $(pwd) -M donarm@illinois.edu -l "nodes=1:ppn=${CORES},mem=${MAX_MEM}" "$0"    
+    qsub -q budget -v FROM_SRR_SRR,FROM_SRR_GTF,FROM_SRR_REF -S /bin/bash -d $(pwd) -m a -M donarm@illinois.edu -l "nodes=1:ppn=${CORES},mem=${MAX_MEM}" "$0"    
 };
 
 
 if [ -z "$1" ] || [ -z "$2" ] || [ -z "$3" ]; then
-    if [ -z "$FROM_SRR_SRR" ]; then
+    if [ -n "$FROM_SRR_SRR" ]; then
         actually_run_the_alignment;
         exit 0;
     fi;