Merged with trunk

[hooke.git] / conf / hooke.conf

diff --git a/hooke.conf b/conf/hooke.conf
old mode 100755 (executable)
new mode 100644 (file)
similarity index 53%
rename from hooke.conf
rename to conf/hooke.conf
index 48d83da..9236b81
--- a/hooke.conf
+++ b/conf/hooke.conf
@@ -1,26 +1,61 @@
 <?xml version="1.0" ?>\r
 <!-- To comment something, put dashes and ! like here -->\r
 <config>\r
 <?xml version="1.0" ?>\r
 <!-- To comment something, put dashes and ! like here -->\r
 <config>\r

-<!-- Internal variabls. -->\r
-    <display ext="1" colour_ext="None" ret="1" colour_ret="None" correct="1" colour_correct="None" contact_point="0" medfilt="0" xaxes="0" yaxes="0" flatten="1" fit_function="wlc" temperature="301" auto_fit_points="50" auto_slope_span="20" auto_delta_force="10" auto_fit_nm="5" auto_min_p="0.005" auto_max_p="10" baseline_clicks="0" auto_left_baseline="20" auto_right_baseline="20" force_multiplier="1" fc_showphase="0" fc_showimposed="0" fc_interesting="0" tccd_threshold="0" tccd_coincident="0" centerzero="1"/>\r

 \r
 \r

-<!-- \r
-The following section defines your own work directory. Substitute your work directory.\r
-     -->\r
-<workdir>\r
-    insert directory\r
-</workdir>\r
+\r
+<!--\r
+This section defines the Hooke installation.  confpath is hardcoded,\r
+since it's to find the config file(s) before your read them.\r
+    -->\r
+<install>\r
+    <docpath>\r
+        ./doc/\r
+    </docpath>\r
+</install>\r
+\r
+<!-- Internal variables. -->\r
+<display\r
+    ext="1"\r
+    colour_ext="None"\r
+    ret="1"\r
+    colour_ret="None"\r
+    correct="1"\r
+    colour_correct="None"\r
+    contact_point="0"\r
+    medfilt="0"\r
+    xaxes="0"\r
+    yaxes="0"\r
+    flatten="1"\r
+    fit_function="wlc"\r
+    temperature="301"\r
+    auto_fit_points="50"\r
+    auto_slope_span="20"\r
+    auto_delta_force="10"\r
+    auto_fit_nm="5"\r
+    auto_min_p="0.005"\r
+    auto_max_p="10"\r
+    baseline_clicks="0"\r
+    auto_left_baseline="20"\r
+    auto_right_baseline="20"\r
+    force_multiplier="1"\r
+    fc_showphase="0"\r
+    fc_showimposed="0"\r
+    fc_interesting="0"\r
+    tccd_threshold="0"\r
+    tccd_coincident="0"\r
+    centerzero="1"\r
+/>\r

 \r
 <!--\r
 The following section defines the default playlist to load at startup.\r
 \r
 <!--\r
 The following section defines the default playlist to load at startup.\r

--->\r
+    -->\r

 <defaultlist>\r
 <defaultlist>\r

-    test.hkp\r
+    ./hooke/test/test.hkp\r

 </defaultlist>\r
 \r
 <!--\r
 This section defines which plugins have to be loaded by Hooke.\r
 </defaultlist>\r
 \r
 <!--\r
 This section defines which plugins have to be loaded by Hooke.\r

-    -->\r
+     -->\r

 <plugins>\r
     <fit/>\r
     <curvetools/>\r
 <plugins>\r
     <fit/>\r
     <curvetools/>\r


@@ -40,8 +75,7 @@ This section defines which plugins have to be loaded by Hooke.
     <multidistance/>\r
     <jumpstat/>\r
     <review/>\r
     <multidistance/>\r
     <jumpstat/>\r
     <review/>\r

-    <cut/>\r
-    <multifit/>                \r
+    <multifit/>\r

 </plugins>\r
 \r
 <!--\r
 </plugins>\r
 \r
 <!--\r


@@ -57,7 +91,7 @@ This section defines which drivers have to be loaded by Hooke.
     <mfp1dexport/>\r
     <mcs/>\r
     <!-- hdf5/ -->\r
     <mfp1dexport/>\r
     <mcs/>\r
     <!-- hdf5/ -->\r

-    <mfp3d/>                   \r
+    <mfp3d/>\r

 </drivers>\r
 \r
 <!--\r
 </drivers>\r
 \r
 <!--\r


@@ -72,9 +106,8 @@ and -IMPORTANTLY- their order.
     <multiplier/>\r
     <clamp/>\r
     <threshold/>\r
     <multiplier/>\r
     <clamp/>\r
     <threshold/>\r

-    <coincident/>\r
+    <coincident/>

     <centerzero/>\r
 </plotmanips>\r
 \r
 </config>\r
     <centerzero/>\r
 </plotmanips>\r
 \r
 </config>\r

-\r