diff --git a/scripts/logParser.py b/scripts/logParser.py index 3c9e6e1bf1394c6ef6b14df74486e6becd56ebb1..3970b8d13d47e1251643674bbd1edeac301a67cc 100644 --- a/scripts/logParser.py +++ b/scripts/logParser.py @@ -387,8 +387,7 @@ def main(): # Again an abuse to extract number of events for MadGraph which are printed like "05:14:02 Nb of events : 20000" checkLine(line,'Nb of events',generatorDict,':') # Get if process is multi-core - no line identifier here, so hack this too "ATHENA_PROC_NUMBER set to 8" - checkLine(line,'ATHENA_PROC_NUMBER',JOsDict,'4') - JOsDict['ATHENA_PROC_NUMBER']=['set to 4'] + checkLine(line,'ATHENA_PROC_NUMBER',JOsDict,'set to') ### Special generators that are to be excluded from certain tests specialGenerators=["Superchic", "Starlight", "ParticleGun"] @@ -442,12 +441,10 @@ def main(): # Check if the job is multicore if len(JOsDict['ATHENA_PROC_NUMBER']): - print ("HI .... ",JOsDict['ATHENA_PROC_NUMBER']) releaseNumber=int(release.split(".")[0])*10000+int(release.split(".")[1])*100+int(release.split(".")[2]) if releaseNumber < 210660: logerr('- ATHENA_PROC_NUMBER = ',f"{JOsDict['ATHENA_PROC_NUMBER'][0].split()[0]} <-- ERROR: cannot use multi-core mode with rel < 21.6.60") else: - print ('- ATHENA_PROC_NUMBER = ', f"{JOsDict['ATHENA_PROC_NUMBER']}") loginfo('- ATHENA_PROC_NUMBER = ', f"{JOsDict['ATHENA_PROC_NUMBER'][0].split()[0]}") if len(JOsErrors):