Skip to content
Snippets Groups Projects
Commit 792e8779 authored by Papeleux Luc's avatar Papeleux Luc
Browse files

Merge branch 'ArcelorTec3' into 'master'

related to oo_meta MR (!113) :

See merge request am-dept/linuxbin!46
parents 5bc89e1c 4224f6e4
No related branches found
Tags v3053
No related merge requests found
......@@ -199,7 +199,7 @@ class LaunchJob(ParametricJob):
return jobname.encode('ascii','ignore') # convert to ASCII if some strings were unicode
def getOutFileName(self):
outFileName = "%s.%s-%s.txt" % (self.pars['OUTFILE'].val, self.pars['ALGORITHM'].val,self.jobId)
outFileName = "%s.%s%s.txt" % (self.pars['OUTFILE'].val, self.pars['ALGORITHM'].val,self.jobId)
if self.debug:
print("outFileName = ", outFileName)
return outFileName
......@@ -353,6 +353,7 @@ class LaunchJob(ParametricJob):
pin.write(b'battery = b.Battery() \n')
pin.write(b'battery.keepFacs = True\n')
pin.write(('battery.dirs = [r"%s"]\n'%tests).encode('utf-8'))
pin.write(('battery.jobId = r"%s"\n'%self.jobId).encode('utf-8'))
if (self.pars['ALGORITHM'].val == "execfile"):
reg1=r"(.+)_0*([1-9][0-9]*)\.py"
......
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