Merge branch '21.6-jetalg' into '21.6'

correct syntax in GenerateTruthJets, so that multiple jets filters could be used

See merge request atlas/athena!26568

Generators/EvgenJobTransforms/test/test_gen_py8_JZ2MultiBJetFilt.sh

+#!/bin/bash
+# art-description: Generation test Pythia8 with two jet filters QCDTruthJetJZ2 with R=0.6 and MultiBJetFilter with R=0.4 
+# art-type: build
+# art-include: 21.6/AthGeneration
+# art-output: *.root
+# art-output: log.generate
+
+## Any arguments are considered overrides, and will be added at the end
+export TRF_ECHO=True;
+Gen_tf.py --ecmEnergy=13000 --jobConfig=421126 --maxEvents=10 \
+    --outputEVNTFile=test_Py8JZ2MultiBJetFilt.EVNT.pool.root \
+
+echo "art-result: $? generate"
+
+

Generators/GeneratorFilters/share/common/GenerateTruthJets.py

@@ -4,8 +4,10 @@ jetlog = Logging.logging.getLogger("GenerateTruthJets")
 # Attach jet algorithms
 def PrepareTruthJetInputs(algseq):
     print "will prepare thruth jets"
-    if "JetTruthCopyAlg" in algseq: return
-    print "it was not returned"
+#    if "JetTruthCopyAlg" in algseq:
+    if hasattr( algseq, "JetTruthCopyAlg" ): 
+        "JetTruthCopyAlg already present, no need to add again"
+        return
     from AthenaCommon.AppMgr import ToolSvc
     from MCTruthClassifier import MCTruthClassifierConf
     from ParticleJetTools import ParticleJetToolsConf