Skip to content
Snippets Groups Projects
Commit 5b4496cc authored by Radermecker Arnaud's avatar Radermecker Arnaud
Browse files

oo_metaB -> metaB

parent 5e66cc5f
No related branches found
No related tags found
No related merge requests found
...@@ -161,7 +161,7 @@ class CompJob(ParametricJob): ...@@ -161,7 +161,7 @@ class CompJob(ParametricJob):
def doClean(self): def doClean(self):
dirs = [ repo.name for repo in self.repos ] dirs = [ repo.name for repo in self.repos ]
dirs.append('oo_metaB') dirs.append('metaB')
for dir in dirs: for dir in dirs:
if os.path.isdir(dir): if os.path.isdir(dir):
print("removing old %s directory" % dir) print("removing old %s directory" % dir)
...@@ -205,11 +205,11 @@ class CompJob(ParametricJob): ...@@ -205,11 +205,11 @@ class CompJob(ParametricJob):
if not os.path.isdir('oo_meta'): if not os.path.isdir('oo_meta'):
self.error('oo_meta not here!') self.error('oo_meta not here!')
# create bin dir # create bin dir
if os.path.isdir('oo_metaB'): if os.path.isdir('metaB'):
print('removing old %s directory' % 'oo_metaB') print('removing old %s directory' % 'metaB')
shutil.rmtree('oo_metaB') shutil.rmtree('metaB')
os.mkdir('oo_metaB') os.mkdir('metaB')
os.chdir('oo_metaB') os.chdir('metaB')
# which python? # which python?
out = subprocess.check_output([self.pars['PYTHONEXE'].val, '-c', out = subprocess.check_output([self.pars['PYTHONEXE'].val, '-c',
...@@ -253,7 +253,7 @@ class CompJob(ParametricJob): ...@@ -253,7 +253,7 @@ class CompJob(ParametricJob):
self.compileMETAFOR() self.compileMETAFOR()
def cleanBattery(self): def cleanBattery(self):
os.chdir('oo_metaB/bin') os.chdir('metaB/bin')
print("cleaning old results") print("cleaning old results")
os.system("%s battery.py clean >/dev/null 2>&1" % self.pars['PYTHONEXE'].val) os.system("%s battery.py clean >/dev/null 2>&1" % self.pars['PYTHONEXE'].val)
os.chdir('../..') os.chdir('../..')
...@@ -261,7 +261,7 @@ class CompJob(ParametricJob): ...@@ -261,7 +261,7 @@ class CompJob(ParametricJob):
def startBat(self): def startBat(self):
now = datetime.datetime.now() now = datetime.datetime.now()
print("starting battery at %s (come back tomorrow)" % now.ctime()) print("starting battery at %s (come back tomorrow)" % now.ctime())
os.chdir('oo_metaB/bin') os.chdir('metaB/bin')
#cmd="nice -%s %s battery.py %s -j %s -k %s >battery.log 2>&1" % \ #cmd="nice -%s %s battery.py %s -j %s -k %s >battery.log 2>&1" % \
# (self.pars['NICE_VALUE'].val, self.pars['PYTHONEXE'].val, \ # (self.pars['NICE_VALUE'].val, self.pars['PYTHONEXE'].val, \
# self.pars['BATTERY_ARG'].val,\ # self.pars['BATTERY_ARG'].val,\
...@@ -281,7 +281,7 @@ class CompJob(ParametricJob): ...@@ -281,7 +281,7 @@ class CompJob(ParametricJob):
os.chdir('../..') os.chdir('../..')
def checkResults(self): # pars indep def checkResults(self): # pars indep
os.chdir('oo_metaB/bin') os.chdir('metaB/bin')
print ("diff'ing results") print ("diff'ing results")
# cmd="%s battery.py diffTSC" % self.pars['PYTHONEXE'].val # <= future battery.py (using TSC) # cmd="%s battery.py diffTSC" % self.pars['PYTHONEXE'].val # <= future battery.py (using TSC)
cmd="%s battery.py diff" % self.pars['PYTHONEXE'].val cmd="%s battery.py diff" % self.pars['PYTHONEXE'].val
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment