From 3acedcfa5df4131a1c3abb35271ef62d27433563 Mon Sep 17 00:00:00 2001
From: sutt <sutt@cern.ch>
Date: Wed, 17 Mar 2021 10:05:50 +0100
Subject: [PATCH 1/3] Add adaptive vertexing to the tau slice
Add the adaptive vertexing to the tau slice, using a vertex collection HLT_IDVertex_Tau
---
.../TrigTools/TrigInDetConfig/python/ConfigSettings.py | 9 +++++++++
.../TrigInDetConfig/python/TrigInDetPriVtxConfig.py | 2 ++
.../TriggerCommon/TrigEDMConfig/python/TriggerEDMRun3.py | 4 ++++
.../python/HLTMenuConfig/Bjet/BjetSequenceSetup.py | 1 +
.../python/HLTMenuConfig/Jet/JetTrackingConfig.py | 6 +++++-
.../python/HLTMenuConfig/Tau/TauRecoSequences.py | 8 ++++++++
6 files changed, 29 insertions(+), 1 deletion(-)
diff --git a/Trigger/TrigTools/TrigInDetConfig/python/ConfigSettings.py b/Trigger/TrigTools/TrigInDetConfig/python/ConfigSettings.py
index 3ef4617b6a81..68b634c19ea5 100644
--- a/Trigger/TrigTools/TrigInDetConfig/python/ConfigSettings.py
+++ b/Trigger/TrigTools/TrigInDetConfig/python/ConfigSettings.py
@@ -500,6 +500,8 @@ class _GlobalSettings() :
self._doRecord = False #Allow recording of track collections
self._isLRT = False
self._adaptiveVertex = False
+ self._vertex = None
+
@property
def FT(self):
@@ -529,6 +531,10 @@ class _GlobalSettings() :
def adaptiveVertex(self):
return self._adaptiveVertex
+ @property
+ def vertex(self):
+ return self._vertex
+
class _Settings_electron( _GlobalSettings ):
@@ -614,6 +620,8 @@ class _Settings_tauIso( _GlobalSettings ):
self._configFT = _FastTracking( signatureType = 'tauIso', nameSuffix = 'TauIso' )
self._configPT = _PrecisionTracking( signatureType = 'tauIso', nameSuffix = 'Tau' ) #Final collection is being renamed to just tau apparently...
self._doRecord = True #Allow recording of track collections
+ self._vertex = "HLT_IDVertex_Tau"
+ self._adaptiveVertex = True
#This might be redundant but lets keep them for the time being...
class _Settings_tauIsoBDT( _GlobalSettings ):
@@ -642,6 +650,7 @@ class _Settings_jet( _GlobalSettings ):
self._configFT = _FastTracking( signatureType = 'fullScan', nameSuffix = 'FS' ) #
self._configPT = _PrecisionTracking( signatureType = 'fullScan', nameSuffix = 'FS' ) #Final collection is being renamed to just tau apparently...
self._doRecord = True
+ self._vertex = "HLT_IDVertex_FS"
self._adaptiveVertex = False
class _Settings_minBias( _GlobalSettings ):
diff --git a/Trigger/TrigTools/TrigInDetConfig/python/TrigInDetPriVtxConfig.py b/Trigger/TrigTools/TrigInDetConfig/python/TrigInDetPriVtxConfig.py
index 85c579648f88..c6c6495b8810 100644
--- a/Trigger/TrigTools/TrigInDetConfig/python/TrigInDetPriVtxConfig.py
+++ b/Trigger/TrigTools/TrigInDetConfig/python/TrigInDetPriVtxConfig.py
@@ -25,6 +25,8 @@ def makeVertices( whichSignature, inputTrackCollection, outputVtxCollection, con
adaptiveVertexing = getInDetTrigConfig( whichSignature ).adaptiveVertex
+ print( "SUTT: configuring verte for ", config.name, " : ", inputTrackCollection, " -> ", config.vertex, outputVtxCollection )
+
return vertexFinder_builder( signature = whichSignature,
inputTracks = config.FT.tracksFTF(),
outputVertices = outputVtxCollection,
diff --git a/Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDMRun3.py b/Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDMRun3.py
index 0b01bc2d5ddf..e803b7538e2e 100644
--- a/Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDMRun3.py
+++ b/Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDMRun3.py
@@ -327,6 +327,10 @@ TriggerHLTListRun3 = [
('xAOD::TrackParticleContainer#HLT_IDTrack_Tau_IDTrig', 'BS ESD AODFULL', 'Tau', 'inViews:TAUFTFIdViews,TAUPrecIsoViews'),
('xAOD::TrackParticleAuxContainer#HLT_IDTrack_Tau_IDTrigAux.', 'BS ESD AODFULL', 'Tau'),
+
+ ('xAOD::VertexContainer#HLT_IDVertex_Tau', 'BS ESD AODFULL', 'Tau', 'inViews:TAUFTFIdViews,TAUPrecIsoViews'),
+ ('xAOD::VertexAuxContainer#HLT_IDVertex_TauAux.', 'BS ESD AODFULL', 'Tau' ),
+
('TrigRoiDescriptorCollection#HLT_Roi_Tau', 'BS ESD AODFULL AODSLIM', 'Steer'),
('TrigRoiDescriptorCollection#HLT_Roi_TauCore', 'BS ESD AODFULL AODSLIM', 'Steer'),
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Bjet/BjetSequenceSetup.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Bjet/BjetSequenceSetup.py
index e530ebad4636..d44a87a6ec85 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Bjet/BjetSequenceSetup.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Bjet/BjetSequenceSetup.py
@@ -25,6 +25,7 @@ def getBJetSequence():
# ====================================================================================================
def bJetStep2Sequence():
+
prmVtxKey = "HLT_IDVertex_FS"
outputRoIName = "HLT_Roi_Bjet"
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Jet/JetTrackingConfig.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Jet/JetTrackingConfig.py
index 258c418acd9b..eefb3fc2659c 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Jet/JetTrackingConfig.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Jet/JetTrackingConfig.py
@@ -24,7 +24,11 @@ def JetTrackingSequence(dummyFlags,trkopt,RoIs):
viewAlgs = makeInDetAlgsNoView( config = IDTrigConfig, rois=RoIs)
jetTrkSeq += viewAlgs
tracksname = IDTrigConfig.FT.tracksFTF( doRecord = IDTrigConfig.isRecordable )
- verticesname = recordable("HLT_IDVertex_FS")
+ verticesname = recordable(IDTrigConfig.vertex)
+ else:
+ print( "SUTT: trkopt: ", trkopt )
+
+ print( "SUTT: tracksname: ", tracksname )
from TrigInDetConfig.TrigInDetPriVtxConfig import makeVertices
vtxAlgs = makeVertices( "jet", tracksname, verticesname, IDTrigConfig )
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Tau/TauRecoSequences.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Tau/TauRecoSequences.py
index bb147908ca16..94471b416c57 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Tau/TauRecoSequences.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Tau/TauRecoSequences.py
@@ -342,6 +342,14 @@ def precTrackSequence( RoIs , name):
#Get last tracks from the list as input for other alg
sequenceOut = PTTrackParticles[-1]
+ if IDTrigConfig.vertex is not None :
+ from TrigInDetConfig.TrigInDetPriVtxConfig import makeVertices
+ vtxAlgs = makeVertices( IDTrigConfig.name, IDTrigConfig.PT.tracksPT(), recordable(IDTrigConfig.vertex), IDTrigConfig )
+
+ print( "SUTT config: ", IDTrigConfig.PT.tracksPT(), IDTrigConfig.vertex )
+
+ # precTrackSequence += vtxAlgs[-1]
+
return precTrackSequence, sequenceOut
def tauFTFSequence( RoIs, name ):
--
GitLab
From b10d0dff48559ef5fde5452f34b43d80577a27bf Mon Sep 17 00:00:00 2001
From: sutt <sutt@cern.ch>
Date: Fri, 26 Mar 2021 00:45:14 +0100
Subject: [PATCH 2/3] Fix Tau vertex
---
.../TrigInDetConfig/python/ConfigSettings.py | 7 +++++-
.../TrigInDetConfig/python/InDetPT.py | 16 ++++++++++---
.../python/TrigInDetPriVtxConfig.py | 13 ++++++++---
.../TrigEDMConfig/python/TriggerEDMRun3.py | 5 ++--
.../HLTMenuConfig/Bjet/BjetSequenceSetup.py | 6 ++++-
.../HLTMenuConfig/Jet/JetRecoConfiguration.py | 10 ++++++--
.../HLTMenuConfig/Jet/JetTrackingConfig.py | 12 ++++++----
.../HLTMenuConfig/Tau/TauRecoSequences.py | 23 +++++++++++--------
8 files changed, 64 insertions(+), 28 deletions(-)
diff --git a/Trigger/TrigTools/TrigInDetConfig/python/ConfigSettings.py b/Trigger/TrigTools/TrigInDetConfig/python/ConfigSettings.py
index 68b634c19ea5..3c45f478d7c3 100644
--- a/Trigger/TrigTools/TrigInDetConfig/python/ConfigSettings.py
+++ b/Trigger/TrigTools/TrigInDetConfig/python/ConfigSettings.py
@@ -601,7 +601,9 @@ class _Settings_tauTau( _GlobalSettings ):
#There should not be a need for tauCore PT!
self._configPT = _PrecisionTracking( signatureType = 'tau', nameSuffix = 'Tau' )
self._doRecord = True #Allow recording of track collections
-
+ self._vertex = "HLT_IDVertex_Tau"
+ self._adaptiveVertexing = True
+
class _Settings_tauCore( _GlobalSettings ):
def __init__( self ):
_GlobalSettings.__init__(self)
@@ -632,6 +634,9 @@ class _Settings_tauIsoBDT( _GlobalSettings ):
self._configFT = _FastTracking( signatureType = 'tauIso', nameSuffix = 'TauIso' ) #
self._configPT = _PrecisionTracking( signatureType = 'tauIso', nameSuffix = 'Tau' ) #Final collection is being renamed to just tau apparently...
self._doRecord = False #FIXME: Do I need to record these?
+ self._vertex = "HLT_IDVertex_Tau"
+ self._adaptiveVertexing = True
+
class _Settings_bjet( _GlobalSettings ):
def __init__( self ):
diff --git a/Trigger/TrigTools/TrigInDetConfig/python/InDetPT.py b/Trigger/TrigTools/TrigInDetConfig/python/InDetPT.py
index 698ea2e8e8d5..5bd2dfd8b820 100644
--- a/Trigger/TrigTools/TrigInDetConfig/python/InDetPT.py
+++ b/Trigger/TrigTools/TrigInDetConfig/python/InDetPT.py
@@ -31,6 +31,9 @@ def makeInDetPrecisionTracking( config = None,
signature = "_{}".format( config.name )
+ print( "SUTT: setting up precision tracking for ", config.name )
+
+
#Name settings for output Tracks/TrackParticles
outTrkTracks = config.PT.trkTracksPT() #Final output Track collection
outTrackParticles = config.PT.tracksPT( doRecord = config.isRecordable ) #Final output xAOD::TrackParticle collection
@@ -101,15 +104,19 @@ def makeInDetPrecisionTracking( config = None,
#Loading the alg to the sequence
ptAlgs.extend( ambSolvingStageAlgs )
+ TRT_RDO_Key = "TRT_RDOs"
+
from InDetTrigRecExample.InDetTrigConfigRecLoadTools import InDetTrigExtrapolator
#TODO:implement builders and getters for TRT (WIP)
if doTRT:
+ print( "SUTT: signature shit: in this crap: TRT_RDO_Key ", TRT_RDO_Key, signature )
+
+
#-----------------------------------------------------------------------------
# TRT data preparation
from AthenaCommon.GlobalFlags import globalflags
#Only add raw data decoders if we're running over raw data
- TRT_RDO_Key = "TRT_RDOs"
if globalflags.InputFormat.is_bytestream():
TRT_RDO_Key = TrigTRTKeys.RDOs
from TRT_RawDataByteStreamCnv.TRT_RawDataByteStreamCnvConf import TRT_RodDecoder
@@ -122,7 +129,6 @@ def makeInDetPrecisionTracking( config = None,
Decoder = InDetTRTRodDecoder )
ToolSvc += InDetTRTRawDataProviderTool
-
@@ -139,8 +145,10 @@ def makeInDetPrecisionTracking( config = None,
InDetTRTRawDataProvider.RoIs = rois
ptAlgs.append( InDetTRTRawDataProvider )
+ else:
+ print( "SUTT: not bystream so didn't schedule TRT-RawDataByteStreamConv. SHIT!" )
-
+ print( "SUTT: signature shit: in this crap: TRT_RDO_Key ", TRT_RDO_Key, signature )
#-----------------------------------------------------------------------------
# TRT extension
@@ -150,6 +158,8 @@ def makeInDetPrecisionTracking( config = None,
from InDetTrigRecExample.InDetTrigCommonTools import InDetTrigTRT_DriftCircleTool
+ print( "SUTT: signature shit: ", signature, algNamePrefix, TrigTRTKeys.DriftCircles )
+
#from InDetTrigRecExample.InDetTrigSliceSettings import InDetTrigSliceSettings
from InDetPrepRawDataFormation.InDetPrepRawDataFormationConf import InDet__TRT_RIO_Maker
InDetTrigTRTRIOMaker = InDet__TRT_RIO_Maker( name = "%sTRTDriftCircleMaker%s"%(algNamePrefix, signature),
diff --git a/Trigger/TrigTools/TrigInDetConfig/python/TrigInDetPriVtxConfig.py b/Trigger/TrigTools/TrigInDetConfig/python/TrigInDetPriVtxConfig.py
index c6c6495b8810..a1c8032448d0 100644
--- a/Trigger/TrigTools/TrigInDetConfig/python/TrigInDetPriVtxConfig.py
+++ b/Trigger/TrigTools/TrigInDetConfig/python/TrigInDetPriVtxConfig.py
@@ -25,10 +25,10 @@ def makeVertices( whichSignature, inputTrackCollection, outputVtxCollection, con
adaptiveVertexing = getInDetTrigConfig( whichSignature ).adaptiveVertex
- print( "SUTT: configuring verte for ", config.name, " : ", inputTrackCollection, " -> ", config.vertex, outputVtxCollection )
+ print( "SUTT: configuring vertex for ", config.name, " : ", inputTrackCollection, " -> ", config.vertex, outputVtxCollection )
return vertexFinder_builder( signature = whichSignature,
- inputTracks = config.FT.tracksFTF(),
+ inputTracks = inputTrackCollection,
outputVertices = outputVtxCollection,
adaptiveVertexing = adaptiveVertexing )
@@ -64,9 +64,16 @@ def vertexFinder_builder( signature, inputTracks, outputVertices, adaptiveVertex
# no create the vertex finder ...
from InDetPriVxFinder.InDetPriVxFinderConf import InDet__InDetPriVxFinder
+
+ if outputVertices is None :
+ print( "SUTT: WHAT THE FUCK IS THIS PIEC OF SHIT !!!" )
+
+ print( "SUTT: outputVertices: ", outputVertices, inputTracks )
+
vertexFinder = InDet__InDetPriVxFinder( name = "InDetTrigPriVxFinder" + signature,
VertexFinderTool = vertexFinderTool,
- TracksName = recordable(inputTracks),
+ # TracksName = recordable(inputTracks),
+ TracksName = inputTracks,
VxCandidatesOutputName = recordable(outputVertices),
VertexCollectionSortingTool = vertexSortingTool,
doVertexSorting = True,
diff --git a/Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDMRun3.py b/Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDMRun3.py
index e803b7538e2e..83fb3bac9a5a 100644
--- a/Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDMRun3.py
+++ b/Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDMRun3.py
@@ -327,10 +327,9 @@ TriggerHLTListRun3 = [
('xAOD::TrackParticleContainer#HLT_IDTrack_Tau_IDTrig', 'BS ESD AODFULL', 'Tau', 'inViews:TAUFTFIdViews,TAUPrecIsoViews'),
('xAOD::TrackParticleAuxContainer#HLT_IDTrack_Tau_IDTrigAux.', 'BS ESD AODFULL', 'Tau'),
-
- ('xAOD::VertexContainer#HLT_IDVertex_Tau', 'BS ESD AODFULL', 'Tau', 'inViews:TAUFTFIdViews,TAUPrecIsoViews'),
- ('xAOD::VertexAuxContainer#HLT_IDVertex_TauAux.', 'BS ESD AODFULL', 'Tau' ),
+ ('xAOD::VertexContainer#HLT_IDVertex_Tau', 'BS ESD AODFULL', 'Tau', 'inViews:TAUFTFIdViews,TAUPrecIsoViews'),
+ ('xAOD::VertexAuxContainer#HLT_IDVertex_TauAux.', 'BS ESD AODFULL', 'Tau'),
('TrigRoiDescriptorCollection#HLT_Roi_Tau', 'BS ESD AODFULL AODSLIM', 'Steer'),
('TrigRoiDescriptorCollection#HLT_Roi_TauCore', 'BS ESD AODFULL AODSLIM', 'Steer'),
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Bjet/BjetSequenceSetup.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Bjet/BjetSequenceSetup.py
index d44a87a6ec85..508185c27111 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Bjet/BjetSequenceSetup.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Bjet/BjetSequenceSetup.py
@@ -26,7 +26,11 @@ def getBJetSequence():
def bJetStep2Sequence():
- prmVtxKey = "HLT_IDVertex_FS"
+ from TrigInDetConfig.ConfigSettings import getInDetTrigConfig
+
+ config=getInDetTrigConfig('jet')
+ # prmVtxKey = "HLT_IDVertex_FS"
+ prmVtxKey = config.vertex
outputRoIName = "HLT_Roi_Bjet"
from ViewAlgs.ViewAlgsConf import EventViewCreatorAlgorithm
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Jet/JetRecoConfiguration.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Jet/JetRecoConfiguration.py
index aa621a6db495..82c194369619 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Jet/JetRecoConfiguration.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Jet/JetRecoConfiguration.py
@@ -227,6 +227,10 @@ def getFilterCut(recoAlg):
# the calibration config helper
def defineCalibMods(jetRecoDict,dataSource,rhoKey="auto"):
+ from TrigInDetConfig.ConfigSettings import getInDetTrigConfig
+
+ config = getInDetTrigConfig( 'jet' )
+
# Minimum modifier set for calibration w/o track GSC
# Should eventually build in more mods, depend on track info etc
jetalg = jetRecoDict["recoAlg"]
@@ -255,7 +259,8 @@ def defineCalibMods(jetRecoDict,dataSource,rhoKey="auto"):
gscDepth = "EM3"
if "gsc" in jetRecoDict["jetCalib"]:
gscDepth = "trackWIDTH"
- pvname = "HLT_IDVertex_FS"
+ # pvname = "HLT_IDVertex_FS"
+ pvname = config.vertex
elif jetRecoDict["constitType"] == "pf":
gscDepth = "auto"
@@ -269,7 +274,8 @@ def defineCalibMods(jetRecoDict,dataSource,rhoKey="auto"):
("a4","subjesgscIS"): ("TrigLS2","JetArea_EtaJES_GSC"), # w/o pu residual + calo+trk GSC
("a4","subresjesgscIS"): ("TrigLS2","JetArea_Residual_EtaJES_GSC"), # pu residual + calo+trk GSC
}[(jetRecoDict["recoAlg"],jetRecoDict["jetCalib"])]
- pvname = "HLT_IDVertex_FS"
+ # pvname = "HLT_IDVertex_FS"
+ pvname = config.vertex
if jetRecoDict["jetCalib"].endswith("IS") and (dataSource=="data"):
calibSeq += "_Insitu"
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Jet/JetTrackingConfig.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Jet/JetTrackingConfig.py
index eefb3fc2659c..ee7039612c9b 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Jet/JetTrackingConfig.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Jet/JetTrackingConfig.py
@@ -24,11 +24,13 @@ def JetTrackingSequence(dummyFlags,trkopt,RoIs):
viewAlgs = makeInDetAlgsNoView( config = IDTrigConfig, rois=RoIs)
jetTrkSeq += viewAlgs
tracksname = IDTrigConfig.FT.tracksFTF( doRecord = IDTrigConfig.isRecordable )
- verticesname = recordable(IDTrigConfig.vertex)
- else:
- print( "SUTT: trkopt: ", trkopt )
-
- print( "SUTT: tracksname: ", tracksname )
+ if IDTrigConfig.vertex is not None:
+ verticesname = recordable(IDTrigConfig.vertex)
+ else:
+ print( "SUTT: Whoa!!! why is the vertex collection name not set ? " )
+
+ if trkopt!="ftf":
+ print( "SUTT: Whoa!!! why are you trying to create a vertex without a vertex collection name !!! ", verticesname )
from TrigInDetConfig.TrigInDetPriVtxConfig import makeVertices
vtxAlgs = makeVertices( "jet", tracksname, verticesname, IDTrigConfig )
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Tau/TauRecoSequences.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Tau/TauRecoSequences.py
index 94471b416c57..6ada1612cbdb 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Tau/TauRecoSequences.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Tau/TauRecoSequences.py
@@ -306,6 +306,7 @@ def precTrackSequence( RoIs , name):
from TrigInDetConfig.ConfigSettings import getInDetTrigConfig
IDTrigConfig = getInDetTrigConfig( signatureNameID )
+ print( "SUTT: precTrackSequence signature: ", name, signatureNameID, IDTrigConfig.name )
ViewVerifyTrk = CfgMgr.AthViews__ViewDataVerifier("tauViewDataVerifier_"+signatureName)
ViewVerifyTrk.DataObjects = [( 'xAOD::TrackParticleContainer' , 'StoreGateSvc+%s' % IDTrigConfig.FT.tracksFTF() ),
@@ -337,20 +338,22 @@ def precTrackSequence( RoIs , name):
#When run in a different view than FTF some data dependencies needs to be loaded through verifier
#Pass verifier as an argument and it will automatically append necessary DataObjects@NOTE: Don't provide any verifier if loaded in the same view as FTF
PTTracks, PTTrackParticles, PTAlgs = makeInDetPrecisionTracking( config = IDTrigConfig, verifier = ViewVerifyTrk, rois = RoIs )
- precTrackSequence = parOR(name, [ViewVerifyTrk] + PTAlgs )
- #Get last tracks from the list as input for other alg
- sequenceOut = PTTrackParticles[-1]
+ from TrigInDetConfig.TrigInDetPriVtxConfig import makeVertices
+ vtxAlg = makeVertices( whichSignature = signatureName,
+ inputTrackCollection = IDTrigConfig.PT.tracksPT(),
+# inputTrackCollection = IDTrigConfig.FT.tracksFTF(),
+ outputVtxCollection = IDTrigConfig.vertex,
+ config = IDTrigConfig,
+ adaptiveVertexing = True )
- if IDTrigConfig.vertex is not None :
- from TrigInDetConfig.TrigInDetPriVtxConfig import makeVertices
- vtxAlgs = makeVertices( IDTrigConfig.name, IDTrigConfig.PT.tracksPT(), recordable(IDTrigConfig.vertex), IDTrigConfig )
-
- print( "SUTT config: ", IDTrigConfig.PT.tracksPT(), IDTrigConfig.vertex )
+ trackSequence = parOR(name, [ViewVerifyTrk] + PTAlgs + vtxAlg )
+# trackSequence = parOR(name, [ViewVerifyTrk] + PTAlgs )
- # precTrackSequence += vtxAlgs[-1]
+ #Get last tracks from the list as input for other alg
+ sequenceOut = PTTrackParticles[-1]
- return precTrackSequence, sequenceOut
+ return trackSequence, sequenceOut
def tauFTFSequence( RoIs, name ):
--
GitLab
From 00523255b7ab06947724dd1b0b9fa31d67cf1298 Mon Sep 17 00:00:00 2001
From: sutt <sutt@cern.ch>
Date: Fri, 26 Mar 2021 08:24:57 +0100
Subject: [PATCH 3/3] remove printout
---
Trigger/TrigTools/TrigInDetConfig/python/InDetPT.py | 13 -------------
.../TrigInDetConfig/python/TrigInDetPriVtxConfig.py | 8 --------
.../python/HLTMenuConfig/Jet/JetTrackingConfig.py | 7 ++-----
.../python/HLTMenuConfig/Tau/TauRecoSequences.py | 4 ----
4 files changed, 2 insertions(+), 30 deletions(-)
diff --git a/Trigger/TrigTools/TrigInDetConfig/python/InDetPT.py b/Trigger/TrigTools/TrigInDetConfig/python/InDetPT.py
index 5bd2dfd8b820..3d289dbc5005 100644
--- a/Trigger/TrigTools/TrigInDetConfig/python/InDetPT.py
+++ b/Trigger/TrigTools/TrigInDetConfig/python/InDetPT.py
@@ -30,10 +30,6 @@ def makeInDetPrecisionTracking( config = None,
#Add suffix to the algorithms
signature = "_{}".format( config.name )
-
- print( "SUTT: setting up precision tracking for ", config.name )
-
-
#Name settings for output Tracks/TrackParticles
outTrkTracks = config.PT.trkTracksPT() #Final output Track collection
outTrackParticles = config.PT.tracksPT( doRecord = config.isRecordable ) #Final output xAOD::TrackParticle collection
@@ -110,9 +106,6 @@ def makeInDetPrecisionTracking( config = None,
#TODO:implement builders and getters for TRT (WIP)
if doTRT:
- print( "SUTT: signature shit: in this crap: TRT_RDO_Key ", TRT_RDO_Key, signature )
-
-
#-----------------------------------------------------------------------------
# TRT data preparation
from AthenaCommon.GlobalFlags import globalflags
@@ -145,10 +138,6 @@ def makeInDetPrecisionTracking( config = None,
InDetTRTRawDataProvider.RoIs = rois
ptAlgs.append( InDetTRTRawDataProvider )
- else:
- print( "SUTT: not bystream so didn't schedule TRT-RawDataByteStreamConv. SHIT!" )
-
- print( "SUTT: signature shit: in this crap: TRT_RDO_Key ", TRT_RDO_Key, signature )
#-----------------------------------------------------------------------------
# TRT extension
@@ -158,8 +147,6 @@ def makeInDetPrecisionTracking( config = None,
from InDetTrigRecExample.InDetTrigCommonTools import InDetTrigTRT_DriftCircleTool
- print( "SUTT: signature shit: ", signature, algNamePrefix, TrigTRTKeys.DriftCircles )
-
#from InDetTrigRecExample.InDetTrigSliceSettings import InDetTrigSliceSettings
from InDetPrepRawDataFormation.InDetPrepRawDataFormationConf import InDet__TRT_RIO_Maker
InDetTrigTRTRIOMaker = InDet__TRT_RIO_Maker( name = "%sTRTDriftCircleMaker%s"%(algNamePrefix, signature),
diff --git a/Trigger/TrigTools/TrigInDetConfig/python/TrigInDetPriVtxConfig.py b/Trigger/TrigTools/TrigInDetConfig/python/TrigInDetPriVtxConfig.py
index a1c8032448d0..a8f4b51852a7 100644
--- a/Trigger/TrigTools/TrigInDetConfig/python/TrigInDetPriVtxConfig.py
+++ b/Trigger/TrigTools/TrigInDetConfig/python/TrigInDetPriVtxConfig.py
@@ -25,8 +25,6 @@ def makeVertices( whichSignature, inputTrackCollection, outputVtxCollection, con
adaptiveVertexing = getInDetTrigConfig( whichSignature ).adaptiveVertex
- print( "SUTT: configuring vertex for ", config.name, " : ", inputTrackCollection, " -> ", config.vertex, outputVtxCollection )
-
return vertexFinder_builder( signature = whichSignature,
inputTracks = inputTrackCollection,
outputVertices = outputVtxCollection,
@@ -64,12 +62,6 @@ def vertexFinder_builder( signature, inputTracks, outputVertices, adaptiveVertex
# no create the vertex finder ...
from InDetPriVxFinder.InDetPriVxFinderConf import InDet__InDetPriVxFinder
-
- if outputVertices is None :
- print( "SUTT: WHAT THE FUCK IS THIS PIEC OF SHIT !!!" )
-
- print( "SUTT: outputVertices: ", outputVertices, inputTracks )
-
vertexFinder = InDet__InDetPriVxFinder( name = "InDetTrigPriVxFinder" + signature,
VertexFinderTool = vertexFinderTool,
# TracksName = recordable(inputTracks),
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Jet/JetTrackingConfig.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Jet/JetTrackingConfig.py
index ee7039612c9b..4aee716c433b 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Jet/JetTrackingConfig.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Jet/JetTrackingConfig.py
@@ -26,12 +26,9 @@ def JetTrackingSequence(dummyFlags,trkopt,RoIs):
tracksname = IDTrigConfig.FT.tracksFTF( doRecord = IDTrigConfig.isRecordable )
if IDTrigConfig.vertex is not None:
verticesname = recordable(IDTrigConfig.vertex)
- else:
- print( "SUTT: Whoa!!! why is the vertex collection name not set ? " )
-
- if trkopt!="ftf":
- print( "SUTT: Whoa!!! why are you trying to create a vertex without a vertex collection name !!! ", verticesname )
+ # hmmm, why is all this vertex stuff being set up if the vertex collection has not been
+ # set ? This should be fixed
from TrigInDetConfig.TrigInDetPriVtxConfig import makeVertices
vtxAlgs = makeVertices( "jet", tracksname, verticesname, IDTrigConfig )
prmVtx = vtxAlgs[-1]
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Tau/TauRecoSequences.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Tau/TauRecoSequences.py
index 6ada1612cbdb..af9dcb52cd57 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Tau/TauRecoSequences.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Tau/TauRecoSequences.py
@@ -306,8 +306,6 @@ def precTrackSequence( RoIs , name):
from TrigInDetConfig.ConfigSettings import getInDetTrigConfig
IDTrigConfig = getInDetTrigConfig( signatureNameID )
- print( "SUTT: precTrackSequence signature: ", name, signatureNameID, IDTrigConfig.name )
-
ViewVerifyTrk = CfgMgr.AthViews__ViewDataVerifier("tauViewDataVerifier_"+signatureName)
ViewVerifyTrk.DataObjects = [( 'xAOD::TrackParticleContainer' , 'StoreGateSvc+%s' % IDTrigConfig.FT.tracksFTF() ),
( 'SG::AuxElement' , 'StoreGateSvc+EventInfo.averageInteractionsPerCrossing' ),
@@ -342,13 +340,11 @@ def precTrackSequence( RoIs , name):
from TrigInDetConfig.TrigInDetPriVtxConfig import makeVertices
vtxAlg = makeVertices( whichSignature = signatureName,
inputTrackCollection = IDTrigConfig.PT.tracksPT(),
-# inputTrackCollection = IDTrigConfig.FT.tracksFTF(),
outputVtxCollection = IDTrigConfig.vertex,
config = IDTrigConfig,
adaptiveVertexing = True )
trackSequence = parOR(name, [ViewVerifyTrk] + PTAlgs + vtxAlg )
-# trackSequence = parOR(name, [ViewVerifyTrk] + PTAlgs )
#Get last tracks from the list as input for other alg
sequenceOut = PTTrackParticles[-1]
--
GitLab