diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/CFValidation.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/CFValidation.py index 2d4d2ce59c22751c2c7e0bae4c54d16fc9a9d29f..ded5ba448285c2075dbe9b458d99ce99ee71327d 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/CFValidation.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/CFValidation.py @@ -116,5 +116,9 @@ def testHLTTree( inputSequence ): raise RuntimeError( viewAlgName + " is attached to an EventView node, but also runs in the whole event context" ) # Make sure that VDVs are configured correctly - checkVDV( inputSequence.getChildren(), [inputSequence.name()], {} ) + allEVCAs = {} + checkVDV( inputSequence.getChildren(), [inputSequence.name()], allEVCAs ) + # Check for inconsistent view maker search results + if len( allEVCAs ) != originalLength: + raise RuntimeError( "EventView creator alg search found different results in structured search (" + str(originalLength) + ") versus naive search (" + str( len( allEVCAs ) ) + "). Implies menu structure error" ) diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/HLTCFConfig.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/HLTCFConfig.py index e11f590ab7f860528c34e5293b1c456a7d14b832..a49e47f9cd17927a5d0b92079a9d7b03481dde8f 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/HLTCFConfig.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/HLTCFConfig.py @@ -180,13 +180,13 @@ def makeHLTTree(newJO=False, triggerConfigHLT = None): appendCAtoAthena( monAcc ) # this is a shotcut for now, we always assume we may be writing ESD & AOD outputs, so all gaps will be filled - hltTop += conf2toConfigurable(edmAlg) - topSequence += hltTop # Test the configuration from TriggerMenuMT.HLTMenuConfig.Menu.CFValidation import testHLTTree - testHLTTree( topSequence ) + testHLTTree( hltTop ) + + topSequence += hltTop def matrixDisplayOld( allCFSeq ): from collections import defaultdict