Merge remote-tracking branch 'origin/master' into rdrFE2

cfg/mn2l-gaston/comp.cfg

+self.pars['CMAKELIST'].val='mn2l-gaston.cmake'
+self.pars['NB_TASKS'].val='6'
+self.pars['NB_THREADS'].val='1'
+self.pars['RUNMETHOD'].vals=['interactive','at','batch',]
+self.pars['RUNMETHOD'].val='batch'

cfg/mn2l-gaston/launch.cfg

+self.pars['NB_THREADS'].val='6'
+self.pars['NB_TASKS'].val='1'
+self.pars['RUNMETHOD'].vals=['interactive','at','batch']
+self.pars['RUNMETHOD'].val='batch'

parametricJob.py

@@ -155,7 +155,7 @@ class ParametricJob(PRMSet):
         sys.exit(1)
 
     def guessProfile(self):
-        for cfgfile in [os.path.join(os.path.split(__file__)[0], 'env.sh'),
+        for cfgfile in [os.path.join(os.path.split(__file__)[0],'..','env.sh'),
                         os.path.expanduser('~/.profile'),
                         os.path.expanduser('~/.bash_profile')]:
             if os.path.isfile(cfgfile):