Commit 9084d072 authored by John Derek Chapman's avatar John Derek Chapman Committed by Atlas Nightlybuild
Browse files

Merge branch 'SupportGSCforFTK' into '21.3'

Support GSC for FTK b-jet chains

See merge request atlas/athena!20263

(cherry picked from commit 48b13601)

fa5a456b Supporting gsc also for FTK b-jet chains
3b6ceee5 FTK not used in ALLTE implementation
125d7683 Validated version
d1d08ce9 Solvig small bug
parent a6eb0b4e
......@@ -23,7 +23,7 @@ def getGSCFexInstance( instance ):
return GSCFex( instance=instance, name="EFGSCFex_EFID" )
def getGSCFexSplitInstance( instance):
return GSCFexSplit( instance=instance, name=instance+"GSCFexSplit_EFIF" )
return GSCFexSplit( instance=instance, name=instance+"GSCFexSplit_EFID" )
def getGSCFexFTKInstance( instance ):
return GSCFexSplit( instance=instance, name=instance+"GSCFexFTK_EFID",
......
......@@ -128,7 +128,7 @@ HLT::ErrorCode TrigGSCFex::hltExecute(const HLT::TriggerElement* inputTE, HLT::T
if(getFeature(outputTE, tracks, m_trackKey) == HLT::OK && tracks != nullptr) {
ATH_MSG_DEBUG( "INPUT - xAOD::TrackParticleContainer: " << "nTracks = " << tracks->size() );
} else {
if(msgLvl() <= MSG::ERROR) msg() << MSG::ERROR << "INPUT - No xAOD::TrackParticleContainer" << endmsg;
if(msgLvl() <= MSG::ERROR) msg() << MSG::ERROR << "INPUT - No xAOD::TrackParticleContainer : " << m_trackKey << endmsg;
return HLT::MISSING_FEATURE;
}
......
......@@ -25,7 +25,10 @@ from TrigBjetHypo.TrigBtagFexConfig import (getBtagFexFTKInstance,
getBtagFexSplitInstance)
from TrigBjetHypo.TrigBjetEtHypoConfig import getBjetEtHypoInstance
from TrigBjetHypo.TrigGSCFexConfig import getGSCFexSplitInstance
from TrigBjetHypo.TrigGSCFexConfig import (getGSCFexSplitInstance,
getGSCFexFTKInstance,
getGSCFexFTKRefitInstance,
getGSCFexFTKVtxInstance)
from TrigBjetHypo.TrigBjetHypoConfig import (getBjetHypoInstance,
getBjetHypoAllTEInstance,
......@@ -298,7 +301,7 @@ def buildBjetChainsAllTE(theChainDef, bjetdict, numberOfSubChainDicts=1):
#
if doGSC:
gsc_jetTrackTEPreCut = "HLT_precut_gsc"+str(minBTagThreshold)+"_eta"+"_jsplit"+"_"+tracking
theGSCFex = getGSCFexSplitInstance(algoInstance)
theGSCFex = getGSCFexSplitInstance(algoInstance)
theChainDef.addSequence(theGSCFex, secVtxTE , gsc_jetTrackTEPreCut )
algoInstance = "GSC"
......@@ -472,7 +475,14 @@ def myBjetConfig_split(theChainDef, chainDict, inputTEsEF,numberOfSubChainDicts=
#--------------------
# GSC
if ('gscThreshold' in chainParts) and chainParts['gscThreshold']:
theGSCFex = getGSCFexSplitInstance(algoInstance)
if 'FTKRefit' in chainParts['bTracking']:
theGSCFex = getGSCFexFTKRefitInstance(algoInstance)
elif 'FTKVtx' in chainParts['bTracking']:
theGSCFex = getGSCFexFTKVtxInstance(algoInstance)
elif 'FTK' in chainParts['bTracking']:
theGSCFex = getGSCFexFTKInstance(algoInstance)
else:
theGSCFex = getGSCFexSplitInstance(algoInstance)
#from TrigBjetHypo.TrigBjetEtHypoConfig import getBjetEtHypoInstance
theGSCEtHypo = getBjetEtHypoInstance("GSC", "Btagging", gscthresh.replace("gsc","")+"GeV" )
#--------------------
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment