Added modular directory structure.

[hooke.git] / hooke / plugin / flatfilts.py

diff --git a/hooke/plugin/flatfilts.py b/hooke/plugin/flatfilts.py
old mode 100755 (executable)
new mode 100644 (file)
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)
 '''
 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 wxversion
 wxversion.select(WX_GOOD)

-

 import xml.dom.minidom
 import xml.dom.minidom

-

 import wx
 import scipy
 import numpy
 from numpy import diff
 import wx
 import scipy
 import numpy
 from numpy import diff

-

 #import pickle
 
 #import pickle
 

-import libpeakspot as lps
-import libhookecurve as lhc
+from .. import libpeakspot as lps
+from .. import libhookecurve as lhc

 
 
 class flatfiltsCommands(object):
 
 
 class flatfiltsCommands(object):


@@ -29,14 +28,7 @@ class flatfiltsCommands(object):
     def _plug_init(self):
         #configurate convfilt variables
         convfilt_configurator=ConvfiltConfig()
     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):
         '''
 
     def do_flatfilt(self,args):
         '''