Removing unnecessary changes

PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/src/BTagTrackAugmenterAlg.cxx

@@ -94,7 +94,7 @@ namespace Analysis {
     SG::ReadHandle< xAOD::TrackParticleContainer > trackContainerHandle = SG::makeHandle< xAOD::TrackParticleContainer >( m_TrackContainerKey,ctx);
     CHECK( trackContainerHandle.isValid() );
     const xAOD::TrackParticleContainer* tracks = trackContainerHandle.get();
-    ATH_MSG_INFO( "Retrieved " << tracks->size() << " input tracks..." );
+    ATH_MSG_DEBUG( "Retrieved " << tracks->size() << " input tracks..." );
 
 
     // ========================================================================================================================== 

PhysicsAnalysis/JetTagging/JetTagTools/python/MultivariateTagManagerConfig.py

@@ -26,6 +26,11 @@ def MultivariateTagManagerCfg(flags, name = 'MultivariateTagManager', TaggerList
     MultivariateTagManagerAuxBranches = []
     MultivariateTagManagerAuxBranches += ['SMT_discriminant'] #ATLASRECTS-5381
 
+    if 'DL1rnn' in TaggerList or 'MV2c10rnn' in TaggerList:
+        #RNNIP output variables are needed
+        rnnip_outputs = ['b','c','u','tau']
+        MultivariateTagManagerAuxBranches += ['rnnip_p' + x for x in rnnip_outputs]
+
     if 'DL1' in TaggerList:
         dl1 = acc.popToolsAndMerge(DL1TagCfg(flags, 'DL1', scheme))
         mvtagtoollist.append(dl1)

Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_py_full_menu_build.py

@@ -12,7 +12,7 @@ ex = ExecStep.ExecStep()
 ex.type = 'athena'
 ex.job_options = 'TriggerJobOpts/runHLT_standalone.py'
 ex.input = 'data'
-ex.args = '-c "isOnline=True;doEmptyMenu=True;doBjetSlice=True;doWriteBS=False;doWriteRDOTrigger=True;"'
+ex.args = '-c "isOnline=True;doWriteBS=False;doWriteRDOTrigger=True;"'
 
 test = Test.Test()
 test.art_type = 'build'

Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_slice_bjet_build.sh

-#!/bin/bash
-# art-description: athenaMT trigger test using the LS2_v1 bjet menu from TriggerMenuMT 
-# art-type: build
-# art-include: master/Athena
-# Skipping art-output which has no effect for build tests.
-# If you create a grid version, check art-output in existing grid tests.
-
-export EVENTS=10000
-export THREADS=1
-export SLOTS=1
-export JOBOPTION="TriggerJobOpts/runHLT_standalone.py"
-export REGTESTEXP="TrigSignatureMoniMT.*HLT_.*"
-export EXTRA="doEmptyMenu=True;doBjetSlice=True;doWriteBS=False;doWriteRDOTrigger=True;"
-#export FROMPICKLE=0
-
-# Find the regtest reference installed with the release
-export REGTESTREF=`find_data.py TrigUpgradeTest/slice_bjet.ref`
-echo "Christian: Changes in place"
-echo "Number of processed Events: ${EVENTS}"
-
-source exec_TrigUpgradeTest_art_athenaMT.sh
-source exec_TrigUpgradeTest_art_post.sh
-

Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Bjet/BjetFlavourTaggingConfiguration.py

@@ -6,7 +6,6 @@ from TrigEDMConfig.TriggerEDMRun3 import recordable
 def getFlavourTagging( inputJets, inputVertex, inputTracks ):
 
     acc = ComponentAccumulator()
-    algSequence = []
 
     nThreads=1
     filesInput="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/data18_13TeV.00360026.physics_EnhancedBias.merge.RAW._lb0151._SFO-1._0001.1"
@@ -26,7 +25,7 @@ def getFlavourTagging( inputJets, inputVertex, inputTracks ):
     bTagTrackAugmenter = Analysis__BTagTrackAugmenterAlg( "Analysis__BTagTrackAugmenterAlg" )
     bTagTrackAugmenter.TrackContainer = inputTracks
     bTagTrackAugmenter.PrimaryVertexContainer = inputVertex
-    algSequence.append( bTagTrackAugmenter )
+    acc.addEventAlgo(bTagTrackAugmenter)
 
     from TrigBjetHypo.TrigBjetHypoConf import TrigBtagFexMT
     bTagFex = TrigBtagFexMT( "TrigBtagFexMT" )
@@ -40,8 +39,7 @@ def getFlavourTagging( inputJets, inputVertex, inputTracks ):
     bTagFex.trackposKey = inputTracks + ".btagIp_trackDisplacement"
     bTagFex.trackmomKey = inputTracks + ".btagIp_trackMomentum"
     bTagFex.OutputBTagging = recordable( "HLT_BTagging" )
-    algSequence.append( bTagFex )
-
+    acc.addEventAlgo(bTagFex)
 
     from BTagging.JetParticleAssociationAlgConfig import JetParticleAssociationAlgCfg
     from BTagging.JetSecVtxFindingAlgConfig import JetSecVtxFindingAlgCfg
@@ -74,6 +72,6 @@ def getFlavourTagging( inputJets, inputVertex, inputTracks ):
     acc.merge(JetBTaggingAlg)
 
 
-    return [ acc, algSequence]
+    return acc
 
 

Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Bjet/BjetSequenceSetup.py

@@ -100,11 +100,10 @@ def bJetStep2Sequence():
     
     # Flavour Tagging
     from TriggerMenuMT.HLTMenuConfig.Bjet.BjetFlavourTaggingConfiguration import getFlavourTagging
-    acc_flavourTaggingAlgs, flavourTaggingAlgs = getFlavourTagging( inputJets=InputMakerAlg.InViewJets, inputVertex=prmVtxKey, inputTracks=PTTrackParticles[0] )
+    acc_flavourTaggingAlgs = getFlavourTagging( inputJets=InputMakerAlg.InViewJets, inputVertex=prmVtxKey, inputTracks=PTTrackParticles[0] )
     
     inViewReco = InViewReco("bJetBtagSequence", viewMaker= InputMakerAlg)
     inViewReco.addRecoAlg(secondStageAlgs)
-    inViewReco.addRecoAlg(flavourTaggingAlgs)
     inViewReco.mergeReco(acc_flavourTaggingAlgs)
 
     Configurable.configurableRun3Behavior=0