--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jackhmmer.xml.orig	Tue Aug 31 08:40:07 2021 +0000
@@ -0,0 +1,116 @@
+<?xml version="1.0"?>
+<<<<<<< HEAD
+<tool id="hmmer_jackhmmer" name="jackhmmer" version="@TOOL_VERSION@+galaxy1">
+  <description>iteratively search a protein sequence against a protein database (PSIBLAST-like)</description>
+  <macros>
+    <import>macros.xml</import>
+  </macros>
+  <expand macro="requirements"/>
+  <expand macro="stdio"/>
+  <command><![CDATA[
+@ADDTHREADS@
+=======
+<tool id="hmmer_jackhmmer" name="jackhmmer" version="@TOOL_VERSION@">
+    <description>iteratively search a protein sequence against a protein database (PSIBLAST-like)</description>
+    <expand macro="bio_tools"/>
+    <macros>
+        <import>macros.xml</import>
+    </macros>
+    <expand macro="requirements"/>
+    <expand macro="stdio"/>
+    <command><![CDATA[
+>>>>>>> c37d72558 (add more bio.tool IDs)
+jackhmmer
+-N $N
+@OFORMAT_WITH_OPTS@
+@HSSI@
+@THRESHOLDS@
+@ACCEL_HEUR@
+@ARSWS@
+@AEEWS@
+@PRIOR@
+
+@EVAL_CALIB@
+@ADV_OPTS@
+@CPU@
+@SEED@
+
+'$seqfile'
+'$seqdb'
+> '$output'
+  ]]></command>
+  <inputs>
+    <param name="seqfile" type="data" format="fasta" label="Protein sequence to search with"/>
+    <!-- todo use Galaxy features like data libraries/data tables/??? -->
+    <param name="N" type="integer" value="5" min="1" label="Maximum number of iterations" help="(-N)"/>
+    <param name="seqdb" type="data" format="fasta" label="Sequence Database"/>
+    <expand macro="oformat_with_opts_dom"/>
+    <expand macro="hssi"/>
+    <expand macro="thresholds_xml"/>
+    <expand macro="accel_heur_xml"/>
+    <expand macro="arsws"/>
+    <expand macro="aeews"/>
+    <expand macro="prior"/>
+    <expand macro="eval_calib_xml"/>
+    <expand macro="adv_opts"/>
+    <expand macro="seed"/>
+  </inputs>
+  <outputs>
+    <expand macro="output_dom_pfam" tool="JACKHMMER"/>
+  </outputs>
+  <tests>
+    <test expect_num_outputs="3">
+      <param name="seqfile" value="uniprot_matches.fasta"/>
+      <param name="seqdb" value="globins45.fa"/>
+      <expand macro="oformat_test" />
+      <expand macro="seed_test" />
+      <output name="output" file="jackhmmer.out" lines_diff="180">
+          <expand macro="assert_out" tool="jackhmmer"/>
+      </output>
+      <output name="domtblout" file="jackhmmer.domtblout" lines_diff="10">
+          <expand macro="assert_tblout" tool="jackhmmer"/>
+      </output>
+      <output name="tblout" file="jackhmmer.tblout" lines_diff="10">
+          <expand macro="assert_tblout" tool="jackhmmer"/>
+      </output>
+    </test>
+    <test expect_num_outputs="1">
+      <param name="seqfile" value="uniprot_matches.fasta"/>
+      <param name="seqdb" value="globins45.fa"/>
+      <expand macro="oformat_test" />
+      <param name="oformat" value=""/>
+      <expand macro="seed_test" />
+      <output name="output" file="jackhmmer.out" lines_diff="180">
+          <expand macro="assert_out" tool="jackhmmer"/>
+      </output>
+    </test>
+  </tests>
+  <help><![CDATA[
+@HELP_PRE@
+
+jackhmmer iteratively searches each query sequence in <seqfile> against the
+target sequence(s) in <seqdb>. The first iteration is identical to a phmmer
+search. For the next iteration, a multiple alignment of the query together
+with all target sequences satisfying inclusion thresholds is assembled, a
+profile is constructed from this alignment (identical to using hmmbuild on the
+alignment), and profile search of the <seqdb> is done (identical to an
+hmmsearch with the profile).
+
+
+@HELP_PRE_OTH@
+
+@OFORMAT_WITH_OPTS_HELP_NOPFAM@
+@HSSI_HELP@
+@THRESHOLDS_HELP@
+@ACCEL_HEUR_HELP@
+@ARSWS_HELP@
+@AEEWS_HELP@
+@PRIOR_HELP@
+@EVAL_CALIB_HELP@
+@ADV_OPTS_HELP@
+@SEED_HELP@
+
+@ATTRIBUTION@
+  ]]></help>
+  <expand macro="citation"/>
+</tool>