Merge branch 'order-bs-docoding-and-xoad-conversion' into 'master'

Ensure that TrigBSExtraction runs before Run1 xAOD trigger EDM converter

Closes ATR-24332

See merge request atlas/athena!47480

Trigger/TriggerCommon/TriggerJobOpts/python/HLTTriggerResultGetter.py

@@ -20,7 +20,8 @@ class xAODConversionGetter(Configured):
         #schedule xAOD conversions here
         from TrigBSExtraction.TrigBSExtractionConf import TrigHLTtoxAODConversion
         xaodconverter = TrigHLTtoxAODConversion()
-        
+        if ConfigFlags.Trigger.readBS:
+            xaodconverter.ExtraInputs += [("TrigBSExtractionOutput", "StoreGateSvc+TrigBSExtractionOutput")] # contract wiht BSExtraction alg (see below)
         from TrigNavigation.TrigNavigationConfig import HLTNavigationOffline
         xaodconverter.Navigation = HLTNavigationOffline()