diff --git a/Trigger/TrigTools/TrigInDetConf/python/TrigInDetFTKSequence.py b/Trigger/TrigTools/TrigInDetConf/python/TrigInDetFTKSequence.py
index 18e74c3f662859325f3b143c7b357c67122cd234..9d50737b1603be2689e643984f8b3da9ca8b5c18 100644
--- a/Trigger/TrigTools/TrigInDetConf/python/TrigInDetFTKSequence.py
+++ b/Trigger/TrigTools/TrigInDetConf/python/TrigInDetFTKSequence.py
@@ -1,5 +1,9 @@
# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# import pdb
+# pdb.set_trace()
+
+from TrigFTK_RecAlgs.TrigFTK_RecAlgs_Config import TrigFTK_VxPrimary_EF
from TrigInDetConf.TrigInDetSequence import TrigInDetSequence,TrigInDetSequenceBase
from AthenaCommon.Logging import logging
@@ -10,16 +14,17 @@ class TrigInDetFTKSequence(TrigInDetSequence):
def __init__(self,
signatureName="Electron",
signature="electron",
- sequenceType="",
+ #sequenceType="",
sequenceFlavour=[""]):
TrigInDetSequenceBase.__init__(self)
self.__signatureName__ = signatureName
self.__signature__ = signature
- self.__sequenceType__ = sequenceType
+ self.__sequenceType__ = "FTK"
self.__sequenceFlavour__ = sequenceFlavour
self.__step__ = [signature]
+
if self.__sequenceFlavour__ =="2step":
if self.__signature__ == "tau":
self.__step__ = ["tauCore","tauIso","tau"];
@@ -31,7 +36,7 @@ class TrigInDetFTKSequence(TrigInDetSequence):
fullseq = list()
- log.info("TrigInDetSequence sigName=%s seqFlav=%s sig=%s sequenceType=%s" % (signatureName, sequenceFlavour, signature, sequenceType))
+ log.info("TrigInDetFTKSequence sigName=%s seqFlav=%s sig=%s" % (signatureName, sequenceFlavour, signature))
dataprep = [
("PixelClustering", "PixelClustering_IDTrig"),
@@ -50,47 +55,32 @@ class TrigInDetFTKSequence(TrigInDetSequence):
cnvname = "InDetTrigTrackingxAODCnv_%s_"+suffix;
- if "2step" in sequenceFlavour:
- ftfname = "TrigFastTrackFinder_"+suffix; ftf2name = "TrigFastTrackFinder_"+suffix;
- cnvname = "InDetTrigTrackingxAODCnv_%sCore_"+suffix; cnv2name = "InDetTrigTrackingxAODCnv_%sIso_"+suffix;
- roiupdater = "IDTrigRoiUpdater_%sCore_IDTrig"; roi2updater="IDTrigRoiUpdater_%sIso_IDTrig"
- if self.__signature__=="bjet":
- ftfname = "TrigFastTrackFinder_"+suffix; ftf2name = ftfname;
- cnvname = "InDetTrigTrackingxAODCnv_%sPrmVtx_"+suffix; cnv2name = "InDetTrigTrackingxAODCnv_%s_"+suffix;
- roiupdater = "IDTrigRoiUpdater_%sVtx_IDTrig"; roi2updater="";
- elif self.__signature__=="muon":
- ftfname = "TrigFastTrackFinder_"+suffix; ftf2name = ftfname;
- cnvname = "InDetTrigTrackingxAODCnv_%s_"+suffix; cnv2name = "InDetTrigTrackingxAODCnv_%sIso_"+suffix;
- roiupdater = "IDTrigRoiUpdater_%s_IDTrig"; roi2updater="IDTrigRoiUpdater_%sIso_IDTrig"
-
-
algos = list()
- if True: #not (sequenceFlavour == "FTF" and self.__signature__=="beamSpot"):
- algos += [("IDTrigRoiUpdater", roiupdater)]
+ #the first step can be FTK only vertexing
+ if "FTKVtx" in sequenceFlavour:
+ algos += [("TrigFTK_VxPrimary","")]
+
+ fullseq.append(algos)
+
+
+ #always run FTF
+ algos = [("IDTrigRoiUpdater", roiupdater)]
algos += [("TrigFastTrackFinder",ftfname),
("InDetTrigTrackingxAODCnv",cnvname),
]
- if "2step" in sequenceFlavour and self.__signature__=="bjet":
- algos += [("TrigVxPrimary",""),
- ("InDetTrigVertexxAODCnv","")]
-
fullseq.append(algos)
- if "2step" in sequenceFlavour:
- algos = [("IDTrigRoiUpdater", roi2updater)]
- algos += dataprep
- algos += [("TrigFastTrackFinder",ftf2name),
- ("InDetTrigTrackingxAODCnv",cnv2name),
- ]
- fullseq.append(algos)
+ if "PT" in sequenceFlavour:
+ algos = list()
+
+ if "dev" in sequenceFlavour:
+ algos += dataprep
- if "FTF" not in sequenceFlavour:
- algos = dataprep
algos += [("TrigAmbiguitySolver",""),
("TRTDriftCircleMaker",""),
("InDetTrigPRD_MultiTruthMaker",""),
@@ -98,23 +88,13 @@ class TrigInDetFTKSequence(TrigInDetSequence):
("TrigExtProcessor",""),
("InDetTrigTrackSlimmer",""),
("InDetTrigTrackingxAODCnv",""),
- ("InDetTrigDetailedTrackTruthMaker",""),
- #("TrigVxPrimary",""),
- #("InDetTrigParticleCreation",""),
- #("InDetTrigTrackParticleTruthMaker",""),
- #("InDetTrigVertexxAODCnv","")
+ #("InDetTrigDetailedTrackTruthMaker",""),
]
-
- if self.__signature__ != "bjet":
- algos += [("TrigVxPrimary",""),
- ("InDetTrigVertexxAODCnv","")]
fullseq.append(algos)
log.info("Full sequence has %d items" % len(fullseq) )
- #print fullseq
- #log.info("generate python now")
for i in fullseq:
#print i
diff --git a/Trigger/TrigTools/TrigInDetConf/python/TrigInDetPostTools.py b/Trigger/TrigTools/TrigInDetConf/python/TrigInDetPostTools.py
new file mode 100644
index 0000000000000000000000000000000000000000..140b4263820c7c97417fba2cc15cb863c703536e
--- /dev/null
+++ b/Trigger/TrigTools/TrigInDetConf/python/TrigInDetPostTools.py
@@ -0,0 +1,96 @@
+# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+
+"""
+#
+# the configuration of tools for postprocessing
+#
+"""
+
+___author___ = "Jiri Masik"
+___version___ = "$Id: TrigInDetPostTools.py 716748 2016-01-07 11:43:21Z masik $"
+
+from AthenaCommon.AppMgr import ToolSvc
+from InDetTrigRecExample.InDetTrigFlags import InDetTrigFlags
+
+
+from InDetTrigRecExample.InDetTrigConfigRecLoadTools import InDetTrigTrackSummaryHelperTool
+
+# from TrkTrackSummaryTool.TrkTrackSummaryToolConf import Trk__TrackSummaryTool
+# InDetTrigFastTrackSummaryTool = Trk__TrackSummaryTool(name = "InDetTrigFastTrackSummaryTool",
+# InDetSummaryHelperTool = InDetTrigTrackSummaryHelperTool,
+# InDetHoleSearchTool = None,
+# doSharedHits = False,
+# TRT_ElectronPidTool = None
+# )
+# ToolSvc += InDetTrigFastTrackSummaryTool
+# if (InDetTrigFlags.doPrintConfigurables()):
+# print InDetTrigFastTrackSummaryTool
+
+
+# from InDetTrigRecExample.InDetTrigConfigRecLoadTools import InDetTrigHoleSearchTool
+# InDetTrigTrackSummaryToolWithHoleSearch = Trk__TrackSummaryTool(name = "InDetTrigTrackSummaryToolWithHoleSearch",
+# InDetSummaryHelperTool = InDetTrigTrackSummaryHelperTool,
+# InDetHoleSearchTool = InDetTrigHoleSearchTool,
+# doSharedHits = False,
+# TRT_ElectronPidTool = None
+# )
+# ToolSvc += InDetTrigTrackSummaryToolWithHoleSearch
+# if (InDetTrigFlags.doPrintConfigurables()):
+# print InDetTrigTrackSummaryToolWithHoleSearch
+
+
+from InDetTrigRecExample.InDetTrigConfigRecLoadTools import \
+ InDetTrigTrackSummaryHelperTool, InDetTrigTrackSummaryTool, InDetTrigTrackSummaryToolSharedHits, \
+ InDetTrigHoleSearchTool,InDetTrigExtrapolator
+from TrigInDetConf.TrigInDetRecCommonTools import InDetTrigFastTrackSummaryTool
+
+
+from TrkParticleCreator.TrkParticleCreatorConf import Trk__TrackParticleCreatorTool
+InDetTrigParticleCreatorTool = \
+ Trk__TrackParticleCreatorTool( name = "InDetTrigParticleCreatorTool",
+ Extrapolator = InDetTrigExtrapolator,
+ TrackSummaryTool = InDetTrigTrackSummaryToolSharedHits,
+ KeepParameters = False,
+ ForceTrackSummaryUpdate = False,
+ )
+
+ToolSvc += InDetTrigParticleCreatorTool
+if (InDetTrigFlags.doPrintConfigurables()):
+ print InDetTrigParticleCreatorTool
+
+InDetTrigParticleCreatorToolWithSummary = \
+ Trk__TrackParticleCreatorTool( name = "InDetTrigParticleCreatorToolWithSummary",
+ Extrapolator = InDetTrigExtrapolator,
+ TrackSummaryTool = InDetTrigTrackSummaryToolSharedHits,
+ KeepParameters = True,
+ ForceTrackSummaryUpdate = True,
+ )
+
+ToolSvc += InDetTrigParticleCreatorToolWithSummary
+if (InDetTrigFlags.doPrintConfigurables()):
+ print InDetTrigParticleCreatorToolWithSummary
+
+InDetTrigParticleCreatorToolParams = \
+ Trk__TrackParticleCreatorTool( name = "InDetTrigParticleCreatorToolParams",
+ Extrapolator = InDetTrigExtrapolator,
+ TrackSummaryTool = InDetTrigTrackSummaryToolSharedHits,
+ KeepParameters = True,
+ ForceTrackSummaryUpdate = False,
+ )
+
+ToolSvc += InDetTrigParticleCreatorToolParams
+if (InDetTrigFlags.doPrintConfigurables()):
+ print InDetTrigParticleCreatorToolParams
+
+InDetTrigParticleCreatorToolFTF = \
+ Trk__TrackParticleCreatorTool( name = "InDetTrigParticleCreatorToolFTF",
+ Extrapolator = InDetTrigExtrapolator,
+ TrackSummaryTool = InDetTrigFastTrackSummaryTool,
+ KeepParameters = True,
+ ForceTrackSummaryUpdate = False,
+ )
+
+ToolSvc += InDetTrigParticleCreatorToolFTF
+if (InDetTrigFlags.doPrintConfigurables()):
+ print InDetTrigParticleCreatorToolFTF
+
diff --git a/Trigger/TrigTools/TrigInDetConf/python/TrigInDetRecCommonTools.py b/Trigger/TrigTools/TrigInDetConf/python/TrigInDetRecCommonTools.py
index 487fa38a1d35e62d5fae55f42188086b23d5b34e..f89c88873df28cf624e718791d7b99e8c100f0e4 100644
--- a/Trigger/TrigTools/TrigInDetConf/python/TrigInDetRecCommonTools.py
+++ b/Trigger/TrigTools/TrigInDetConf/python/TrigInDetRecCommonTools.py
@@ -7,7 +7,7 @@
"""
___author___ = "Jiri Masik"
-___version___ = "$Id: TrigInDetRecCommonTools.py 590759 2014-04-02 03:25:17Z masik $"
+___version___ = "$Id: TrigInDetRecCommonTools.py 713540 2015-12-09 10:36:59Z masik $"
from AthenaCommon.AppMgr import ToolSvc
from InDetTrigRecExample.InDetTrigFlags import InDetTrigFlags
@@ -25,3 +25,17 @@ InDetTrigFastTrackSummaryTool = Trk__TrackSummaryTool(name = "InDetTrigFastTrack
ToolSvc += InDetTrigFastTrackSummaryTool
if (InDetTrigFlags.doPrintConfigurables()):
print InDetTrigFastTrackSummaryTool
+
+
+from InDetTrigRecExample.InDetTrigConfigRecLoadTools import InDetTrigHoleSearchTool
+InDetTrigTrackSummaryToolWithHoleSearch = Trk__TrackSummaryTool(name = "InDetTrigTrackSummaryToolWithHoleSearch",
+ InDetSummaryHelperTool = InDetTrigTrackSummaryHelperTool,
+ InDetHoleSearchTool = InDetTrigHoleSearchTool,
+ doSharedHits = False,
+ TRT_ElectronPidTool = None
+ )
+ToolSvc += InDetTrigTrackSummaryToolWithHoleSearch
+if (InDetTrigFlags.doPrintConfigurables()):
+ print InDetTrigTrackSummaryToolWithHoleSearch
+
+
diff --git a/Trigger/TrigTools/TrigInDetConf/python/TrigInDetSequence.py b/Trigger/TrigTools/TrigInDetConf/python/TrigInDetSequence.py
index 1f1e5f2172fef8a45e5596a643e1fa3225d4b2df..8710b9fcc89a349e548f6981d458537a36c69b50 100644
--- a/Trigger/TrigTools/TrigInDetConf/python/TrigInDetSequence.py
+++ b/Trigger/TrigTools/TrigInDetConf/python/TrigInDetSequence.py
@@ -29,6 +29,11 @@ from InDetTrigRecExample.InDetTrigRecLowPtTracking \
import SiTrigSpacePointFinderLowPt_EF, SiTrigTrackFinderLowPt_EF, \
TrigAmbiguitySolverLowPt_EF
+try:
+ from TrigFTK_RecAlgs.TrigFTK_RecAlgs_Config import TrigFTK_VxPrimary_EF
+except:
+ pass
+
from TrigInDetConf.RoiManipulators import IDTrigRoiUpdater
from TrigInDetConf.TrackingAlgCfgble import TrigFastTrackFinder
@@ -63,7 +68,8 @@ class TrigInDetSequence(TrigInDetSequenceBase):
"TrigVxPrimary",
"InDetTrigParticleCreation",
"InDetTrigTrackParticleTruthMaker",
- "InDetTrigVertexxAODCnv"
+ "InDetTrigVertexxAODCnv",
+ "TrigFTK_VxPrimary",
]
clname = algname
@@ -82,8 +88,10 @@ class TrigInDetSequence(TrigInDetSequenceBase):
_inst = algName+'_%s_FTF'
elif "L2Star" in seqType:
_inst = algName+'_%s_L2ID'
- elif "IDTrig" in seqType or "FTK" in seqType:
+ elif "IDTrig" in seqType:
_inst = algName+'_%s_IDTrig'
+ elif "FTK" in seqType:
+ _inst = algName+'_%s_FTK'
else:
_inst = algName+'_%s_EFID'
else: