Merge branch 'AODEDMSet_MT' into 'master'

ATR-22325: Call HLTTriggerResultGetter from the place where DataSource is properly configured

See merge request !37939

Reconstruction/RecExample/RecExCommon/share/RecExCommon_topOptions.py

@@ -568,6 +568,23 @@ if rec.doTrigger:
             treatException("Could not import TriggerJobOpts.TriggerGetter . Switched off !" )
             recAlgs.doTrigger=False
 
+#MT part
+## Outputs
+if TriggerFlags.doMT() and rec.readESD() and rec.doAOD():
+    # Don't run any trigger - only pass the HLT contents from ESD to AOD
+    # Add HLT output
+    from TriggerJobOpts.HLTTriggerResultGetter import HLTTriggerResultGetter
+    hltOutput = HLTTriggerResultGetter()
+    # Add Trigger menu metadata
+    if rec.doFileMetaData():
+        from RecExConfig.ObjKeyStore import objKeyStore
+        metadataItems = [ "xAOD::TriggerMenuContainer#TriggerMenu",
+                          "xAOD::TriggerMenuAuxContainer#TriggerMenuAux." ]
+        objKeyStore.addManyTypesMetaData( metadataItems )
+    # Add L1 output (to be consistent with R2)
+    from TrigEDMConfig.TriggerEDM import getLvl1AODList
+    objKeyStore.addManyTypesStreamAOD(getLvl1AODList())        
+
 AODFix_postTrigger()
 
 if globalflags.DataSource()=='geant4':

Reconstruction/RecJobTransforms/share/skeleton.ESDtoAOD_tf.py

@@ -58,20 +58,11 @@ if hasattr(runArgs,"outputAODFile"):
         if DQMonFlags.useTrigger() and rec.doTrigger():
             DQMonFlags.useTrigger.set_Value_and_Lock(True)
         # Don't run any trigger - only pass the HLT contents from ESD to AOD
+        # Configure here, and extract HLT content in RecExCommon_topOptions
+        # after the rest of the job is configured
         from RecExConfig.RecAlgsFlags import recAlgs
         recAlgs.doTrigger.set_Value_and_Lock( False )
         rec.doTrigger.set_Value_and_Lock( False )
-        # Add HLT output
-        from TriggerJobOpts.HLTTriggerResultGetter import HLTTriggerResultGetter
-        hltOutput = HLTTriggerResultGetter()
-        # Add Trigger menu metadata
-        if rec.doFileMetaData():
-            from RecExConfig.ObjKeyStore import objKeyStore
-            metadataItems = [ "xAOD::TriggerMenuContainer#TriggerMenu",
-                              "xAOD::TriggerMenuAuxContainer#TriggerMenuAux." ]
-            objKeyStore.addManyTypesMetaData( metadataItems )
-    else: # not TriggerFlags.doMT()
-        pass # See TriggerJobOpts/python/TriggerGetter.py for Run 2. Called by RecExCommon
 
 if hasattr(runArgs,"outputTAGFile"):
     # should be used as outputTAGFile_e2a=myTAG.root so that it does not trigger AODtoTAG