Mercurial > repos > bitlab > gecko

changeset 2:acbe7e0ef559 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixed absolute paths
author bitlab
date Mon, 07 Oct 2019 06:44:21 -0400
parents 07f4c763fcd4
children 1d78419b0abc
files gecko/bin/FragHits gecko/bin/combineFrags gecko/bin/filterFrags gecko/bin/filterHits gecko/bin/fragStat gecko/bin/frags2align.sh gecko/bin/frags2text gecko/bin/getInfo gecko/bin/hdStat gecko/bin/hits gecko/bin/hitsStat gecko/bin/indexmaker gecko/bin/reverseComplement gecko/bin/sortHits gecko/bin/sortWords gecko/bin/w2hd gecko/bin/words gecko/bin/wordsStat gecko/bin/workflow.sh gecko/frags2align.xml gecko/gecko.xml gecko/src/reverseComplement.c
diffstat 22 files changed, 15 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
Binary file gecko/bin/FragHits has changed
Binary file gecko/bin/combineFrags has changed
Binary file gecko/bin/filterFrags has changed
Binary file gecko/bin/filterHits has changed
Binary file gecko/bin/fragStat has changed
--- a/gecko/bin/frags2align.sh	Tue Dec 18 07:09:25 2018 -0500
+++ b/gecko/bin/frags2align.sh	Mon Oct 07 06:44:21 2019 -0400
@@ -8,7 +8,12 @@
    exit -1
 fi
 
-MGDIR=/home/galaxy-bitlab/temp
+
+
+MYRAND=$((( RANDOM % 10000000) +1))
+MGDIR=${PWD}/${MYRAND}
+
+mkdir $MGDIR
 
 FRAGS=$1
 FASTAX=$2
@@ -42,10 +47,6 @@
 
 $BINDIR/frags2text $MGDIR/$fragsName.frags $MGDIR/$fastaXname.fasta $MGDIR/$fastaYname.fasta $MGDIR/$fastaYname.rev $MGDIR/$fastaXname.idx $MGDIR/$fastaYname.idx $MGDIR/$fastaYname.rev.idx $MGDIR/$alignName.txt
 
-rm $MGDIR/$fastaXname.idx
-rm $MGDIR/$fastaYname.idx
-rm $MGDIR/$fastaYname.rev
-rm $MGDIR/$fastaYname.rev.idx
-
 mv $MGDIR/$alignName.txt $ALIGN
 
+rm -rf $MGDIR
Binary file gecko/bin/frags2text has changed
Binary file gecko/bin/getInfo has changed
Binary file gecko/bin/hdStat has changed
Binary file gecko/bin/hits has changed
Binary file gecko/bin/hitsStat has changed
Binary file gecko/bin/indexmaker has changed
Binary file gecko/bin/reverseComplement has changed
Binary file gecko/bin/sortHits has changed
Binary file gecko/bin/sortWords has changed
Binary file gecko/bin/w2hd has changed
Binary file gecko/bin/words has changed
Binary file gecko/bin/wordsStat has changed
--- a/gecko/bin/workflow.sh	Tue Dec 18 07:09:25 2018 -0500
+++ b/gecko/bin/workflow.sh	Mon Oct 07 06:44:21 2019 -0400
@@ -10,7 +10,8 @@
    exit -1
 fi
 
-#{
+
+{
 
 
 MYRAND=$((( RANDOM % 10000000) +1))
@@ -163,3 +164,5 @@
 
 rm -r ${MGDIR}
 
+} &> /dev/null
+
--- a/gecko/frags2align.xml	Tue Dec 18 07:09:25 2018 -0500
+++ b/gecko/frags2align.xml	Mon Oct 07 06:44:21 2019 -0400
@@ -5,7 +5,7 @@
     <param name="fastaX" type="data" format="fasta" label="x Genome" help="Single genome file in fasta format"/>    
     <param name="fastaY" type="data" value="fasta" label="y Genome" help="Single genome file in fasta format" />
   </inputs>
-  <command>/home/galaxy-bitlab/galaxy/tools/gecko/bin/frags2align.sh $fragsFile $fastaX $fastaY $alignments </command>
+  <command> make all -C ${__tool_directory__}/src/ ; ${__tool_directory__}/bin/frags2align.sh $fragsFile $fastaX $fastaY $alignments </command>
   <outputs>
     <data name="alignments" format="txt" label="Frags to align for genomes  ${fastaX.name}_${fastaY.name}"/>
   </outputs>
--- a/gecko/gecko.xml	Tue Dec 18 07:09:25 2018 -0500
+++ b/gecko/gecko.xml	Mon Oct 07 06:44:21 2019 -0400
@@ -1,7 +1,7 @@
 <tool id="GECKO" name="GECKO" version="1.0.1">
   <description>A pairwise genome comparison software for the detection of High-scoring Segment Pairs</description>
 
-  <command>/home/galaxy-bitlab/galaxy/tools/gecko/bin/workflow.sh $genome1 $genome2 $length $similarity $wl 1 $frags_output0 $csv_output1</command>
+  <command>make all -C ${__tool_directory__}/src ; ${__tool_directory__}/bin/workflow.sh $genome1 $genome2 $length $similarity $wl 1 $frags_output0 $csv_output1</command>
 
   <inputs>
     <param name="genome1" type="data" format="fasta" label="Sequence X" help="Query sequence file in fasta format" />
@@ -12,7 +12,7 @@
   </inputs>
 
   <outputs>
-     <data name="frags_output0" format="data" label="Frags comparison for ${genome1.name}_${genome2.name}"/>
+     <data name="frags_output0" type="data" format="frags" label="Frags comparison for ${genome1.name}_${genome2.name}"/>
      <data name="csv_output1" format="csv" label="Csv comparison for ${genome1.name}_${genome2.name}"/> 
   </outputs>
 
--- a/gecko/src/reverseComplement.c	Tue Dec 18 07:09:25 2018 -0500
+++ b/gecko/src/reverseComplement.c	Mon Oct 07 06:44:21 2019 -0400
@@ -15,7 +15,7 @@
 #include <inttypes.h>
 #include "commonFunctions.h"
 
-#define SEQSIZE 2000000000
+#define SEQSIZE 500000000
 #define WSIZE 32
 #define NREADS 1000000