Merge branch '21.6-hepmc' into '21.6'

TestLHE commented out for now

See merge request atlas/athena!46379

Generators/EvgenJobTransforms/share/skel.GENtoEVGEN.py

@@ -213,11 +213,12 @@ def OutputTXTFile():
 ## Main job option include
 ## Only permit one jobConfig argument for evgen: does more than one _ever_ make sense?
 
-if hasattr(runArgs, "inputGeneratorFile") or hasattr(runArgs, "outputTXTFile") or os.path.isfile("events.lhe") :
-    from EvgenProdTools.EvgenProdToolsConf import TestLHE
-    if not hasattr(genSeq, "TestLHE"):
-        genSeq += TestLHE()
-        print "lheFile events.lhe exists in current directory. Will execute TestLHE checks"
+#commenting out for now
+#if hasattr(runArgs, "inputGeneratorFile") or hasattr(runArgs, "outputTXTFile") or os.path.isfile("events.lhe") :
+#    from EvgenProdTools.EvgenProdToolsConf import TestLHE
+#    if not hasattr(genSeq, "TestLHE"):
+#        genSeq += TestLHE()
+#        print "lheFile events.lhe exists in current directory. Will execute TestLHE checks"
 
 if len(runArgs.jobConfig) != 1:
     print "INFO    runArgs.jobConfig = ", runArgs.jobConfig

Generators/EvgenJobTransforms/share/skel.GENtoTXT.py

@@ -160,10 +160,11 @@ if hasattr(runArgs,"inputGeneratorFile") and ',' not in runArgs.inputGeneratorFi
 if hasattr(runArgs,"inputGeneratorFile") and ',' in runArgs.inputGeneratorFile:
     multiInput=runArgs.inputGeneratorFile.count(',')+1
 
-if hasattr(runArgs, "outputTXTFile") or hasattr(runArgs, "inputGeneratorFile"):
-    from EvgenProdTools.EvgenProdToolsConf import TestLHE
-    if not hasattr(genSeq, "TestLHE"):
-        genSeq += TestLHE()
+#comment out for now
+#if hasattr(runArgs, "outputTXTFile") or hasattr(runArgs, "inputGeneratorFile"):
+#    from EvgenProdTools.EvgenProdToolsConf import TestLHE
+#    if not hasattr(genSeq, "TestLHE"):
+#        genSeq += TestLHE()
 
 # Main job option include
 # Only permit one jobConfig argument for evgen: does more than one _ever_ make sense?