Merge branch 'master' of https://gitlab.cern.ch:8443/atlas-physics/pmg/mcjoboptions into testn

scripts/logParser.py

@@ -69,7 +69,20 @@ def pythia8Checks(logFile,generatorName):
         errors = True
     if not errors:
         loggood("INFO: Pythia 8 checks:","Passed")		
-	
+
+def herwig7Checks(logFile,generatorName):
+    errors = False
+    if "Herwig7.7.1" in generatorName:
+        file=open(logFile,"r")
+        lines=file.readlines()
+        for line in lines:
+            if "Herwig7_EvtGen.py" in line:
+                logerr("ERROR:","Herwig 7.1 used with wrong include: Herwig7_EvtGen.py. Please use Herwig71_EvtGen.py instead.")
+                errors = True
+                    break
+    if not errors:
+        loggood("INFO: Herwig 7 checks:","Passed")
+
 def generatorChecks(logFile, generatorName):
     print ""
     print "-------------------------"
@@ -79,6 +92,8 @@ def generatorChecks(logFile, generatorName):
         sherpaChecks(logFile)
     elif "Pythia8" in generatorName:
         pythia8Checks(logFile,generatorName)
+    elif "Herwig7" in generatorName:
+        herwig7Checks(logFile,generatorName)
     else:
         loginfo( 'generatorChecks not implemented for: ',generatorName)