fixed relative path for DCT directory in python scripts

Signed-off-by: Nicola Vigano <nicola.vigano@esrf.fr>

git-svn-id: https://svn.code.sf.net/p/dct/code/trunk@149 4c865b51-4357-4376-afb4-474e03ccb993

zUtil_Python/compile_matlab_functions.py

@@ -13,7 +13,7 @@ class FunctionsBuilder(object):
                     #  'condor_make' # Disabled since we moved to OAR
                     ]
 
-    def __init__(self, indir = os.path.join(os.getenv('HOME'), 'matlabDCT'),
+    def __init__(self, indir = os.getcwd(),
                  script_dir = os.path.join(os.getenv('HOME'), 'graintracking', 'scripts'),
                  bin_dir = os.path.join(os.getenv('HOME'), 'graintracking', 'bin', os.getenv('CPU'))):
         self.indir = indir
@@ -146,7 +146,7 @@ end
 
     def compileFuncs(self, mfiles, force):
         print("Calling matlab..")
-        cmd = ['matlab2011b']
+        cmd = ['matlab']
         cmd = cmd + ['-nodesktop', '-nosplash', '-r']
         args = ''
         if force is True:

zUtil_Python/compile_mex_functions.py

@@ -13,7 +13,7 @@ class MexBuilder(object):
     file_extensions = [ '*.c', '*.cxx', '*.cpp' ]
 
     def __init__(self, compiler_path,
-                 indir = os.path.join(os.getenv('HOME'), 'matlabDCT')):
+                 indir = os.getcwd()):
         self.indir = indir
         self.compiler_path = compiler_path
         self.c_files = { }