Describe new parameters of Jpred

diff --git a/conf/settings/JpredParameters.xml b/conf/settings/JpredParameters.xml
index 03c6906..ec4f167 100644 (file)
--- a/conf/settings/JpredParameters.xml
+++ b/conf/settings/JpredParameters.xml
@@ -12,6 +12,15 @@
         <furtherDetails>prog_docs/jpred.txt</furtherDetails>\r
     </options>\r
 \r
+    <options>\r
+        <name>JABAWS configuration</name>\r
+        <description>\r
+            Configure Jpred to worik within JABAWS\r
+        </description>\r
+        <optionNames>-jabaws</optionNames>\r
+        <furtherDetails>prog_docs/jpred.txt</furtherDetails>\r
+    </options>\r
+\r
     <prmSeparator> </prmSeparator>\r
 \r
     <parameters isRequired="false">\r

diff --git a/conf/settings/JpredPresets.xml b/conf/settings/JpredPresets.xml
index 51f3d30..3f9b72b 100644 (file)
--- a/conf/settings/JpredPresets.xml
+++ b/conf/settings/JpredPresets.xml
@@ -8,8 +8,9 @@
             Dundee cluser configuration\r
         </description>\r
         <optlist>\r
-            <option>-dbpath /homes/www-jpred/databases </option>\r
-            <option>-dbname uniref90</option>\r
+                       <option>-dbpath /homes/www-jpred/databases </option>\r
+                       <option>-dbname uniref90</option>\r
+                       <option>-jabaws</option>\r
         </optlist>\r
     </preset>\r
 \r
@@ -19,9 +20,10 @@
             My 4-core laptop configuration\r
         </description>\r
         <optlist>\r
-            <option>-dbpath /data/UNIREFdb</option>\r
+            <option>-dbpath /data/UNIREFdb/</option>\r
             <option>-dbname ported_db</option>\r
-            <option>-ncpu 4</option>\r
+            <option>-ncpu 3</option>\r
+            <option>-jabaws</option>\r
         </optlist>\r
     </preset>\r
 \r