X-Git-Url: http://git.tremily.us/?p=hooke.git;a=blobdiff_plain;f=hooke%2Fplugin%2Fflatfilts.py;h=47eab591e46db9b4ef819637a26b85ac108c4386;hp=09dc3dbe9a1038c4752c9816639f36570de9a252;hb=cd7b8ff4687547d3661c23180d7145d4ccc898ae;hpb=545013bfc6d3d67cb31c9d8501ba5f8a83d642f4

diff --git a/hooke/plugin/flatfilts.py b/hooke/plugin/flatfilts.py
old mode 100755
new mode 100644
index 09dc3db..47eab59
--- a/hooke/plugin/flatfilts.py
+++ b/hooke/plugin/flatfilts.py
@@ -7,21 +7,20 @@ Licensed under the GNU LGPL version 2
 Other plugin dependencies:
 procplots.py (plot processing plugin)
 '''
-from libhooke import WX_GOOD
+
+from hooke.libhooke import WX_GOOD
+
 import wxversion
 wxversion.select(WX_GOOD)
-
 import xml.dom.minidom
-
 import wx
 import scipy
 import numpy
 from numpy import diff
-
 #import pickle
 
-import libpeakspot as lps
-import libhookecurve as lhc
+from .. import libpeakspot as lps
+from .. import libhookecurve as lhc
 
 
 class flatfiltsCommands(object):
@@ -29,14 +28,7 @@ class flatfiltsCommands(object):
     def _plug_init(self):
         #configurate convfilt variables
         convfilt_configurator=ConvfiltConfig()
-
-        #different OSes have different path conventions
-        if self.config['hookedir'][0]=='/':
-            slash='/' #a Unix or Unix-like system
-        else:
-            slash='\\' #it's a drive letter, we assume it's Windows
-
-        self.convfilt_config=convfilt_configurator.load_config(self.config['hookedir']+slash+'convfilt.conf')
+        self.convfilt_config=convfilt_configurator.load_config('convfilt.conf')
 
     def do_flatfilt(self,args):
         '''