diff --git a/Reconstruction/tauRec/python/TauRecBuilder.py b/Reconstruction/tauRec/python/TauRecBuilder.py index 66273909e94afb3965b1e3dbbac53f7aa5f70498..163c2cc76a7a1576b63ff91e8bc9f894ae0c0618 100644 --- a/Reconstruction/tauRec/python/TauRecBuilder.py +++ b/Reconstruction/tauRec/python/TauRecBuilder.py @@ -29,7 +29,6 @@ _outputKey = "TauJets" _outputAuxType = "xAOD::TauJetAuxContainer" _outputAuxKey = "TauJetsAux." _track_collection = "InDetTrackParticles" -_jet_collection = "AntiKt4LCTopoJets" ################################################################################ ## @class TauRecCoreBuilder @@ -79,7 +78,7 @@ class TauRecCoreBuilder ( TauRecConfigured ) : tools = [] try: - tools.append(taualgs.getJetSeedBuilder(_jet_collection)) + tools.append(taualgs.getJetSeedBuilder(seed_collection_name=tauFlags.tauRecSeedJetCollection())) # run vertex finder only in case vertexing is available. This check can also be done in TauAlgorithmsHolder instead doing it here. from InDetRecExample.InDetJobProperties import InDetFlags diff --git a/Reconstruction/tauRec/python/TauRecConfigured.py b/Reconstruction/tauRec/python/TauRecConfigured.py index 8747fd7fb314fd619b3b37d46a0acf8d6e7b14a9..97190f34fd3809e0b7bb0f05f8f94f689dee5ef8 100644 --- a/Reconstruction/tauRec/python/TauRecConfigured.py +++ b/Reconstruction/tauRec/python/TauRecConfigured.py @@ -37,7 +37,7 @@ class TauRecConfigured ( Configured ) : from AthenaCommon.AppMgr import ToolSvc self._TauProcessorAlgHandle = TauProcessorAlg ( name=self.name+'Alg', - Key_jetInputContainer="AntiKt4LCTopoJets", + Key_jetInputContainer=tauFlags.tauRecSeedJetCollection(), Key_tauOutputContainer="tmp_TauJets", Key_tauTrackOutputContainer="TauTracks", Key_tauShotClusOutputContainer="TauShotClusters", diff --git a/Reconstruction/tauRec/python/TauRecRunner.py b/Reconstruction/tauRec/python/TauRecRunner.py index 665aecafed013d87b88d376de4fdcb6b639dd99c..6de522b0b034d4d1887cb6100ea093b6e918583b 100644 --- a/Reconstruction/tauRec/python/TauRecRunner.py +++ b/Reconstruction/tauRec/python/TauRecRunner.py @@ -29,7 +29,6 @@ _outputKey = "TauJets" _outputAuxType = "xAOD::TauJetAuxContainer" _outputAuxKey = "TauJetsAux." _track_collection = "InDetTrackParticles" -_jet_collection = "AntiKt4LCTopoJets" ################################################################################ ## @class TauRecRunner diff --git a/Reconstruction/tauRec/python/tauRecFlags.py b/Reconstruction/tauRec/python/tauRecFlags.py index 0a5d9699939d540dcd66032759f7059873b9154d..3202001ce541f7eb4c6fc606f7fe7e3d35038624 100644 --- a/Reconstruction/tauRec/python/tauRecFlags.py +++ b/Reconstruction/tauRec/python/tauRecFlags.py @@ -31,6 +31,13 @@ class doTauRec(JobProperty): def get_Value(self): return self.statusOn and self.StoredValue and jobproperties.tauRecFlags.Enabled() +class tauRecSeedJetCollection(JobProperty): + """ jet collection used to seed tau reconstruction + """ + statusOn=True + allowedTypes=['string'] + StoredValue="AntiKt4LCTopoJets" + class tauRecToolsCVMFSPath(JobProperty): """ path to cvmfs file location """ @@ -185,7 +192,7 @@ class tauRecFlags(JobPropertyContainer): jobproperties.add_Container(tauRecFlags) # I want always the following flags in the Rec container -_list_tau=[Enabled,doTauRec,tauRecToolsCVMFSPath,TauDiscriminantCVMFSPath,tauRecMVATrackClassification,tauRecRNNTrackClassification,tauRecMVATrackClassificationConfig,tauRecRNNTrackClassificationConfig,tauRecSeedMaxEta,tauRecToolsDevToolList,tauRecToolsDevToolListProcessor,doRunTauDiscriminant,useVertexBasedConvFinder,useNewPIDBasedConvFinder,doPanTau,doPi0,pi0EtCuts,pi0MVACuts_1prong,pi0MVACuts_mprong,shotPtCut_1Photon,shotPtCut_2Photons,useOldVertexFitterAPI] +_list_tau=[Enabled,doTauRec,tauRecSeedJetCollection,tauRecToolsCVMFSPath,TauDiscriminantCVMFSPath,tauRecMVATrackClassification,tauRecRNNTrackClassification,tauRecMVATrackClassificationConfig,tauRecRNNTrackClassificationConfig,tauRecSeedMaxEta,tauRecToolsDevToolList,tauRecToolsDevToolListProcessor,doRunTauDiscriminant,useVertexBasedConvFinder,useNewPIDBasedConvFinder,doPanTau,doPi0,pi0EtCuts,pi0MVACuts_1prong,pi0MVACuts_mprong,shotPtCut_1Photon,shotPtCut_2Photons,useOldVertexFitterAPI] for j in _list_tau: jobproperties.tauRecFlags.add_JobProperty(j) del _list_tau