X-Git-Url: http://git.tremily.us/?p=hooke.git;a=blobdiff_plain;f=conf%2Fhooke.conf;fp=hooke.conf;h=9236b81ba38eabbb37e4a65c9afa8511265be78e;hp=48d83daebf4847a392be3689cba0c8f40d85fb04;hb=41ef0130e16c0cf8d2c0f1acc9e06986d62f7607;hpb=7fc996abaf986c43c0354ac3b4127ed7876ad41a

diff --git a/hooke.conf b/conf/hooke.conf
old mode 100755
new mode 100644
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" ?>
 <!-- To comment something, put dashes and ! like here -->
 <config>
-<!-- Internal variabls. -->
-    <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"/>
 
-<!-- 
-The following section defines your own work directory. Substitute your work directory.
-     -->
-<workdir>
-    insert directory
-</workdir>
+
+<!--
+This section defines the Hooke installation.  confpath is hardcoded,
+since it's to find the config file(s) before your read them.
+    -->
+<install>
+    <docpath>
+        ./doc/
+    </docpath>
+</install>
+
+<!-- Internal variables. -->
+<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"
+/>
 
 <!--
 The following section defines the default playlist to load at startup.
--->
+    -->
 <defaultlist>
-    test.hkp
+    ./hooke/test/test.hkp
 </defaultlist>
 
 <!--
 This section defines which plugins have to be loaded by Hooke.
-    -->
+     -->
 <plugins>
     <fit/>
     <curvetools/>
@@ -40,8 +75,7 @@ This section defines which plugins have to be loaded by Hooke.
     <multidistance/>
     <jumpstat/>
     <review/>
-    <cut/>
-    <multifit/>		
+    <multifit/>
 </plugins>
 
 <!--
@@ -57,7 +91,7 @@ This section defines which drivers have to be loaded by Hooke.
     <mfp1dexport/>
     <mcs/>
     <!-- hdf5/ -->
-    <mfp3d/>			
+    <mfp3d/>
 </drivers>
 
 <!--
@@ -72,9 +106,8 @@ and -IMPORTANTLY- their order.
     <multiplier/>
     <clamp/>
     <threshold/>
-    <coincident/>
+    <coincident/>
     <centerzero/>
 </plotmanips>
 
 </config>
-