basic autoconfiguration of the EDMDecodingVersion from the AOD

Trigger/TriggerCommon/TriggerJobOpts/python/HLTTriggerResultGetter.py

@@ -48,15 +48,17 @@ def  EDMDecodingVersion():
         ItemDic=inputFileSummary.get("eventdata_itemsDic")
         ItemList=inputFileSummary.get('eventdata_itemsList')
 
+        TriggerFlags.doMergedHLTResult = True
         if cfgKeyStore.isInInputFile( "HLTResult", "HLTResult_EF" ):          
             TriggerFlags.EDMDecodingVersion = 1
             TriggerFlags.doMergedHLTResult = False
             log.info("Decoding version set to 1, because HLTResult_EF found in pool file")
         elif cfgKeyStore.isInInputFile( "HLTResult", "HLTResult_HLT"):          
             TriggerFlags.EDMDecodingVersion = 2
-            TriggerFlags.doMergedHLTResult = True
+        elif cfgKeyStore.isInInputFile( "xAOD::TrigCompositeContainer", "HLTSummary"):          
+            TriggerFlags.EDMDecodingVersion = 3
         else:
-            log.warning("No HLTResult found in pool file")
+            log.warning("Cannot recognise HLT EDM format, TriggerFlags.EDMDecodingVersion=%d" % TriggerFlags.EDMDecodingVersion())
         pass
     pass