From d35660e35b8e996397abe47d6aa0730221ff0c63 Mon Sep 17 00:00:00 2001
From: Tomasz Bold <tomasz.bold@gmail.com>
Date: Tue, 29 Dec 2020 16:50:21 +0000
Subject: [PATCH 1/4] InDetKeys
---
.../TrigInDetConfig/python/EFIDTracking.py | 24 ++++++------
.../TrigEDMConfig/python/TriggerEDMRun3.py | 4 +-
.../MinBias/MinBiasMenuSequences.py | 39 ++++++++++++-------
3 files changed, 39 insertions(+), 28 deletions(-)
diff --git a/Trigger/TrigTools/TrigInDetConfig/python/EFIDTracking.py b/Trigger/TrigTools/TrigInDetConfig/python/EFIDTracking.py
index 839a58ba4ab2..7b255ad2ebb0 100644
--- a/Trigger/TrigTools/TrigInDetConfig/python/EFIDTracking.py
+++ b/Trigger/TrigTools/TrigInDetConfig/python/EFIDTracking.py
@@ -28,13 +28,13 @@ def get_idtrig_view_verifier(name):
( 'SpacePointContainer', TrigSCTKeys.SpacePoints ),
( 'SpacePointContainer', TrigPixelKeys.SpacePoints ),
# ( 'SpacePointOverlapCollection', 'StoreGateSvc+OverlapSpacePoints' ),
- # ( 'IDCInDetBSErrContainer', 'StoreGateSvc+SCT_FlaggedCondData_TRIG' ),
+ # ( 'IDCInDetBSErrContainer', 'StoreGateSvc+SCT_FlaggedCondData' ),
# ( 'IDCInDetBSErrContainer', 'StoreGateSvc+SCT_ByteStreamErrs' ),
# ( 'IDCInDetBSErrContainer', 'StoreGateSvc+PixelByteStreamErrs' ),
# #( 'xAOD::EventInfo', 'StoreGateSvc+EventInfo' )
]
- viewDataVerifier.DataObjects = [( 'InDet::PixelClusterContainerCache' , InDetCacheNames.Pixel_ClusterKey ),
+ viewDataVerifier.DataObjects += [( 'InDet::PixelClusterContainerCache' , InDetCacheNames.Pixel_ClusterKey ),
( 'PixelRDO_Cache' , InDetCacheNames.PixRDOCacheKey ),
( 'InDet::SCT_ClusterContainerCache' , InDetCacheNames.SCT_ClusterKey ),
( 'SCT_RDO_Cache' , InDetCacheNames.SCTRDOCacheKey ),
@@ -56,11 +56,13 @@ def get_idtrig_view_verifier(name):
viewDataVerifier.DataObjects += [( 'PixelRDO_Container' , InDetKeys.PixelRDOs() ),
( 'SCT_RDO_Container' , InDetKeys.SCT_RDOs() ),
( 'IDCInDetBSErrContainer' , InDetKeys.PixelByteStreamErrs() ),
- ( 'IDCInDetBSErrContainer' , InDetKeys.SCT_ByteStreamErrs() )]
- topSequence.SGInputLoader.Load += [( 'PixelRDO_Container' , InDetKeys.PixelRDOs() ),
- ( 'SCT_RDO_Container' , InDetKeys.SCT_RDOs() ),
- ( 'IDCInDetBSErrContainer' , InDetKeys.PixelByteStreamErrs() ),
- ( 'IDCInDetBSErrContainer' , InDetKeys.SCT_ByteStreamErrs() )]
+ ( 'IDCInDetBSErrContainer' , InDetKeys.SCT_ByteStreamErrs() ),
+ ( 'IDCInDetBSErrContainer', 'StoreGateSvc+SCT_FlaggedCondData' ),
+ ]
+ # topSequence.SGInputLoader.Load += [( 'PixelRDO_Container' , InDetKeys.PixelRDOs() ),
+ # ( 'SCT_RDO_Container' , InDetKeys.SCT_RDOs() ),
+ # ( 'IDCInDetBSErrContainer' , InDetKeys.PixelByteStreamErrs() ),
+ # ( 'IDCInDetBSErrContainer' , InDetKeys.SCT_ByteStreamErrs() )]
return viewDataVerifier
@@ -155,7 +157,7 @@ def makeInDetPatternRecognition( config, verifier = 'IDTrigViewDataVerifier' ):
from .InDetTrigCommon import siSPSeededTrackFinder_builder, get_full_name
siSPSeededTrackFinder = siSPSeededTrackFinder_builder( name = get_full_name( 'siSPSeededTrackFinder', config.name ),
- outputTracks = config.EFID.trkTracksEFID(), ##outEFIDTracks,
+ outputTracks = config.PT.trkTracksPT(), # config.EFID.trkTracksEFID(), ##outEFIDTracks,
trackingCuts = trackingCuts,
usePrdAssociationTool = usePrdAssociationTool,
nameSuffix = config.name )
@@ -179,7 +181,7 @@ def makeInDetPatternRecognition( config, verifier = 'IDTrigViewDataVerifier' ):
#Verifier should not be necessary when both patt. rec. and PT runs in the same view -> None
#Also provides particle cnv alg inside
precisionAlgs = makePrecisionInDetPatternRecognition(config = config,
- inputTracks = config.EFID.trkTracksEFID(),
+ inputTracks = config.PT.trkTracksPT(), #config.EFID.trkTracksEFID(),
verifier = None )
@@ -216,7 +218,7 @@ def makePrecisionInDetPatternRecognition( config, inputTracks,verifier = None ):
ambiguitySolverAlg = ambiguitySolverAlg_builder( name = get_full_name( core = 'TrkAmbiguitySolver', suffix = config.name ),
config = config,
inputTrackScoreMap = get_scoremap_name( config.name ), #Map of tracks and their scores,
- outputTrackCollection = config.PT.trkTracksPT() ) #FIXME: for now keep PT but if TRT added this will ahve to become intermediate collection
+ outputTrackCollection = config.PT.trkTracksPT()+"_Amb" ) #FIXME: for now keep PT but if TRT added this will ahve to become intermediate collection
ptAlgs.append( ambiguitySolverAlg )
@@ -225,7 +227,7 @@ def makePrecisionInDetPatternRecognition( config, inputTracks,verifier = None ):
from .InDetTrigCommon import trackParticleCnv_builder
trackParticleCnvAlg = trackParticleCnv_builder(name = get_full_name( 'xAODParticleCreatorAlg',config.name + '_IDTrig' ),
config = config,
- inTrackCollectionKey = config.PT.trkTracksPT(),
+ inTrackCollectionKey = config.PT.trkTracksPT()+"_Amb",
outTrackParticlesKey = config.PT.tracksPT( doRecord = config.isRecordable),
)
diff --git a/Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDMRun3.py b/Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDMRun3.py
index c407db4b6584..c2a0d7f5437d 100644
--- a/Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDMRun3.py
+++ b/Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDMRun3.py
@@ -510,8 +510,8 @@ TriggerHLTListRun3 = [
# MinBias
- ('xAOD::TrackParticleContainer#HLT_IDTrack_MinBias_FTF', 'BS ESD AODFULL', 'MinBias', 'inViews:TrkView'),
- ('xAOD::TrackParticleAuxContainer#HLT_IDTrack_MinBias_FTFAux.', 'BS ESD AODFULL', 'MinBias'),
+ ('xAOD::TrackParticleContainer#HLT_IDTrack_MinBias_IDTrig', 'BS ESD AODFULL', 'MinBias', 'inViews:TrkView'),
+ ('xAOD::TrackParticleAuxContainer#HLT_IDTrack_MinBias_IDTrigAux.', 'BS ESD AODFULL', 'MinBias'),
# Cosmic
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/MinBias/MinBiasMenuSequences.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/MinBias/MinBiasMenuSequences.py
index a23cf16951fa..74a35d12290c 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/MinBias/MinBiasMenuSequences.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/MinBias/MinBiasMenuSequences.py
@@ -5,6 +5,7 @@ from TriggerMenuMT.HLTMenuConfig.Menu.MenuComponents import MenuSequence
from AthenaCommon.CFElements import parOR
from AthenaCommon.CFElements import seqAND
from TrigInDetConfig.InDetSetup import makeInDetAlgs
+from TrigInDetConfig.EFIDTracking import makeInDetPatternRecognition
from TrigEDMConfig.TriggerEDMRun3 import recordable
from ViewAlgs.ViewAlgsConf import EventViewCreatorAlgorithm
from DecisionHandling.DecisionHandlingConf import ViewCreatorInitialROITool
@@ -55,7 +56,8 @@ def MinBiasSPSequence():
idTrigConfig = getInDetTrigConfig('minBias')
idAlgs, verifier = makeInDetAlgs(config=idTrigConfig,
rois=spInputMakerAlg.InViewRoIs,
- viewVerifier='SPViewDataVerifier')
+ viewVerifier='SPViewDataVerifier',
+ doFTF=False)
verifier.DataObjects += [('TrigRoiDescriptorCollection', 'StoreGateSvc+InputRoI'),
('SCT_ID', 'DetectorStore+SCT_ID'),
('PixelID', 'DetectorStore+PixelID'),
@@ -68,7 +70,9 @@ def MinBiasSPSequence():
('PixelID', 'DetectorStore+PixelID'),
('TagInfo', 'DetectorStore+ProcessingTags')]
- spAlgsList = idAlgs[:-2]
+# spAlgsList = idAlgs[:-2]
+ spAlgsList = idAlgs
+
spCount = TrigCountSpacePointsMT()
spCount.SpacePointsKey = recordable("HLT_SpacePointCounts")
@@ -104,28 +108,33 @@ def MinBiasTrkSequence():
# prepare algorithms to run in views, first,
# inform scheduler that input data is available in parent view (has to be done by hand)
idTrigConfig = getInDetTrigConfig('minBias')
- idAlgs, verifier = makeInDetAlgs(config=idTrigConfig, rois=trkInputMakerAlg.InViewRoIs, viewVerifier='TrkrecoSeqDataVerifier')
- verifier.DataObjects += [('TrigRoiDescriptorCollection', 'StoreGateSvc+InputRoI'),
- ('IDCInDetBSErrContainer', 'StoreGateSvc+SCT_FlaggedCondData_TRIG'),
- ('InDet::SCT_ClusterContainer', 'StoreGateSvc+SCT_TrigClusters'),
- ('SpacePointContainer', 'StoreGateSvc+SCT_TrigSpacePoints'),
- ('InDet::PixelClusterContainer', 'StoreGateSvc+PixelTrigClusters'),
- ('SpacePointContainer', 'StoreGateSvc+PixelTrigSpacePoints')]
- if globalflags.InputFormat.is_bytestream():
- verifier.DataObjects += [('IDCInDetBSErrContainer', 'StoreGateSvc+PixelByteStreamErrs'),
- ('IDCInDetBSErrContainer', 'StoreGateSvc+SCT_ByteStreamErrs')]
+ algs, verifier = makeInDetPatternRecognition(idTrigConfig, verifier='VDVMinBiasIDTracking')
+ print("HERE")
+ print(algs)
+ print(verifier)
+ # idAlgs, verifier = makeInDetAlgs(config=idTrigConfig, rois=trkInputMakerAlg.InViewRoIs, viewVerifier='TrkrecoSeqDataVerifier')
+ # verifier.DataObjects += [('TrigRoiDescriptorCollection', 'StoreGateSvc+InputRoI'),
+ # ('IDCInDetBSErrContainer', 'StoreGateSvc+SCT_FlaggedCondData_TRIG'),
+ # ('InDet::SCT_ClusterContainer', 'StoreGateSvc+SCT_TrigClusters'),
+ # ('SpacePointContainer', 'StoreGateSvc+SCT_TrigSpacePoints'),
+ # ('InDet::PixelClusterContainer', 'StoreGateSvc+PixelTrigClusters'),
+ # ('SpacePointContainer', 'StoreGateSvc+PixelTrigSpacePoints')]
+
+ # if globalflags.InputFormat.is_bytestream():
+ # verifier.DataObjects += [('IDCInDetBSErrContainer', 'StoreGateSvc+PixelByteStreamErrs'),
+ # ('IDCInDetBSErrContainer', 'StoreGateSvc+SCT_ByteStreamErrs')]
- trkList = idAlgs[-2:] # FTF and Track to xAOD::TrackParticle conversion alg
+ # trkList = idAlgs[-2:] # FTF and Track to xAOD::TrackParticle conversion alg
trackCountHypo = TrackCountHypoAlgMT()
trackCountHypo.trackCountKey = recordable("HLT_TrackCount")
- trackCountHypo.tracksKey = recordable("HLT_IDTrack_MinBias_FTF")
+ trackCountHypo.tracksKey = recordable("HLT_IDTrack_MinBias_IDTrig")
from TrigMinBias.TrackCountMonitoringMT import TrackCountMonitoring
trackCountHypo.MonTool = TrackCountMonitoring()
- trkRecoSeq = parOR("TrkrecoSeq", [verifier]+trkList)
+ trkRecoSeq = parOR("TrkrecoSeq", algs)
trkSequence = seqAND("TrkSequence", [trkInputMakerAlg, trkRecoSeq])
trkInputMakerAlg.ViewNodeName = trkRecoSeq.name()
--
GitLab
From db2f03ee09dcc37a04bd67b2aec7a2b07f8ff5f1 Mon Sep 17 00:00:00 2001
From: Tomasz Bold <tomasz.bold@gmail.com>
Date: Tue, 29 Dec 2020 18:51:58 +0000
Subject: [PATCH 2/4] Resolved reamining missing input data
---
.../TrigInDetConfig/python/EFIDTracking.py | 14 ++++++++------
.../MinBias/MinBiasMenuSequences.py | 17 -----------------
2 files changed, 8 insertions(+), 23 deletions(-)
diff --git a/Trigger/TrigTools/TrigInDetConfig/python/EFIDTracking.py b/Trigger/TrigTools/TrigInDetConfig/python/EFIDTracking.py
index 7b255ad2ebb0..8aee8e024266 100644
--- a/Trigger/TrigTools/TrigInDetConfig/python/EFIDTracking.py
+++ b/Trigger/TrigTools/TrigInDetConfig/python/EFIDTracking.py
@@ -24,13 +24,11 @@ def get_idtrig_view_verifier(name):
viewDataVerifier = CfgMgr.AthViews__ViewDataVerifier( name )
viewDataVerifier.DataObjects = [
( 'InDet::SCT_ClusterContainer', TrigSCTKeys.Clusters ),
- ( 'InDet::PixelClusterContainer', TrigPixelKeys.Clusters ),
- ( 'SpacePointContainer', TrigSCTKeys.SpacePoints ),
+ ( 'InDet::PixelClusterContainer', TrigPixelKeys.Clusters ),
+ ( 'SpacePointContainer', TrigSCTKeys.SpacePoints ),
( 'SpacePointContainer', TrigPixelKeys.SpacePoints ),
- # ( 'SpacePointOverlapCollection', 'StoreGateSvc+OverlapSpacePoints' ),
- # ( 'IDCInDetBSErrContainer', 'StoreGateSvc+SCT_FlaggedCondData' ),
- # ( 'IDCInDetBSErrContainer', 'StoreGateSvc+SCT_ByteStreamErrs' ),
- # ( 'IDCInDetBSErrContainer', 'StoreGateSvc+PixelByteStreamErrs' ),
+ ( 'SpacePointOverlapCollection', 'StoreGateSvc+OverlapSpacePoints' ),
+ ( 'InDet::PixelGangedClusterAmbiguities' , 'StoreGateSvc+TrigPixelClusterAmbiguitiesMap' )
# #( 'xAOD::EventInfo', 'StoreGateSvc+EventInfo' )
]
@@ -43,6 +41,10 @@ def get_idtrig_view_verifier(name):
( 'IDCInDetBSErrContainer_Cache' , InDetCacheNames.PixBSErrCacheKey ),
( 'IDCInDetBSErrContainer_Cache' , InDetCacheNames.SCTBSErrCacheKey ),
( 'IDCInDetBSErrContainer_Cache' , InDetCacheNames.SCTFlaggedCondCacheKey ),
+ ( 'IDCInDetBSErrContainer', 'StoreGateSvc+SCT_FlaggedCondData' ),
+ ( 'IDCInDetBSErrContainer', 'StoreGateSvc+SCT_FlaggedCondData_TRIG' ),
+ ( 'IDCInDetBSErrContainer', 'StoreGateSvc+SCT_ByteStreamErrs' ),
+ ( 'IDCInDetBSErrContainer', 'StoreGateSvc+PixelByteStreamErrs' ),
( 'xAOD::EventInfo' , 'StoreGateSvc+EventInfo' ),
( 'TagInfo' , 'DetectorStore+ProcessingTags' )]
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/MinBias/MinBiasMenuSequences.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/MinBias/MinBiasMenuSequences.py
index 74a35d12290c..df2d958faf9c 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/MinBias/MinBiasMenuSequences.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/MinBias/MinBiasMenuSequences.py
@@ -110,23 +110,6 @@ def MinBiasTrkSequence():
idTrigConfig = getInDetTrigConfig('minBias')
algs, verifier = makeInDetPatternRecognition(idTrigConfig, verifier='VDVMinBiasIDTracking')
- print("HERE")
- print(algs)
- print(verifier)
- # idAlgs, verifier = makeInDetAlgs(config=idTrigConfig, rois=trkInputMakerAlg.InViewRoIs, viewVerifier='TrkrecoSeqDataVerifier')
- # verifier.DataObjects += [('TrigRoiDescriptorCollection', 'StoreGateSvc+InputRoI'),
- # ('IDCInDetBSErrContainer', 'StoreGateSvc+SCT_FlaggedCondData_TRIG'),
- # ('InDet::SCT_ClusterContainer', 'StoreGateSvc+SCT_TrigClusters'),
- # ('SpacePointContainer', 'StoreGateSvc+SCT_TrigSpacePoints'),
- # ('InDet::PixelClusterContainer', 'StoreGateSvc+PixelTrigClusters'),
- # ('SpacePointContainer', 'StoreGateSvc+PixelTrigSpacePoints')]
-
- # if globalflags.InputFormat.is_bytestream():
- # verifier.DataObjects += [('IDCInDetBSErrContainer', 'StoreGateSvc+PixelByteStreamErrs'),
- # ('IDCInDetBSErrContainer', 'StoreGateSvc+SCT_ByteStreamErrs')]
-
-
- # trkList = idAlgs[-2:] # FTF and Track to xAOD::TrackParticle conversion alg
trackCountHypo = TrackCountHypoAlgMT()
trackCountHypo.trackCountKey = recordable("HLT_TrackCount")
trackCountHypo.tracksKey = recordable("HLT_IDTrack_MinBias_IDTrig")
--
GitLab
From 8c05272725c82b85d5ab8eb391f12e38632d2c3d Mon Sep 17 00:00:00 2001
From: Tomasz Bold <tomasz.bold@gmail.com>
Date: Wed, 30 Dec 2020 09:23:35 +0000
Subject: [PATCH 3/4] Minor cleanups
---
Trigger/TrigTools/TrigInDetConfig/python/EFIDTracking.py | 5 ++---
.../python/HLTMenuConfig/MinBias/MinBiasMenuSequences.py | 2 +-
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/Trigger/TrigTools/TrigInDetConfig/python/EFIDTracking.py b/Trigger/TrigTools/TrigInDetConfig/python/EFIDTracking.py
index 8aee8e024266..a66a496281f2 100644
--- a/Trigger/TrigTools/TrigInDetConfig/python/EFIDTracking.py
+++ b/Trigger/TrigTools/TrigInDetConfig/python/EFIDTracking.py
@@ -29,7 +29,6 @@ def get_idtrig_view_verifier(name):
( 'SpacePointContainer', TrigPixelKeys.SpacePoints ),
( 'SpacePointOverlapCollection', 'StoreGateSvc+OverlapSpacePoints' ),
( 'InDet::PixelGangedClusterAmbiguities' , 'StoreGateSvc+TrigPixelClusterAmbiguitiesMap' )
- # #( 'xAOD::EventInfo', 'StoreGateSvc+EventInfo' )
]
viewDataVerifier.DataObjects += [( 'InDet::PixelClusterContainerCache' , InDetCacheNames.Pixel_ClusterKey ),
@@ -220,8 +219,8 @@ def makePrecisionInDetPatternRecognition( config, inputTracks,verifier = None ):
ambiguitySolverAlg = ambiguitySolverAlg_builder( name = get_full_name( core = 'TrkAmbiguitySolver', suffix = config.name ),
config = config,
inputTrackScoreMap = get_scoremap_name( config.name ), #Map of tracks and their scores,
- outputTrackCollection = config.PT.trkTracksPT()+"_Amb" ) #FIXME: for now keep PT but if TRT added this will ahve to become intermediate collection
-
+ outputTrackCollection = config.PT.trkTracksPT()+"_Amb" ) #FIXME: for now keep PT but if TRT added this will ahve to become intermediate collection
+
ptAlgs.append( ambiguitySolverAlg )
#-----------------------------------------------------------------------------
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/MinBias/MinBiasMenuSequences.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/MinBias/MinBiasMenuSequences.py
index df2d958faf9c..b0b04f38eac1 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/MinBias/MinBiasMenuSequences.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/MinBias/MinBiasMenuSequences.py
@@ -109,7 +109,7 @@ def MinBiasTrkSequence():
# inform scheduler that input data is available in parent view (has to be done by hand)
idTrigConfig = getInDetTrigConfig('minBias')
- algs, verifier = makeInDetPatternRecognition(idTrigConfig, verifier='VDVMinBiasIDTracking')
+ algs,_ = makeInDetPatternRecognition(idTrigConfig, verifier='VDVMinBiasIDTracking')
trackCountHypo = TrackCountHypoAlgMT()
trackCountHypo.trackCountKey = recordable("HLT_TrackCount")
trackCountHypo.tracksKey = recordable("HLT_IDTrack_MinBias_IDTrig")
--
GitLab
From 8489c4463f2943c37423cdbe839580f8775bb992 Mon Sep 17 00:00:00 2001
From: Tomasz Bold <tomasz.bold@gmail.com>
Date: Wed, 30 Dec 2020 15:42:08 +0000
Subject: [PATCH 4/4] Review fix
---
.../python/HLTMenuConfig/MinBias/MinBiasMenuSequences.py | 1 -
1 file changed, 1 deletion(-)
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/MinBias/MinBiasMenuSequences.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/MinBias/MinBiasMenuSequences.py
index b0b04f38eac1..de19773da588 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/MinBias/MinBiasMenuSequences.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/MinBias/MinBiasMenuSequences.py
@@ -9,7 +9,6 @@ from TrigInDetConfig.EFIDTracking import makeInDetPatternRecognition
from TrigEDMConfig.TriggerEDMRun3 import recordable
from ViewAlgs.ViewAlgsConf import EventViewCreatorAlgorithm
from DecisionHandling.DecisionHandlingConf import ViewCreatorInitialROITool
-from AthenaCommon.GlobalFlags import globalflags
from TrigInDetConfig.ConfigSettings import getInDetTrigConfig
--
GitLab