Merge branch 'master_tauRec_PFlowSeed_08Nov19' into 'master'

Towards PFlow-seeded tau reconstruction: baby steps

See merge request atlas/athena!27827

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

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",

Reconstruction/tauRec/python/TauRecRunner.py

@@ -29,7 +29,6 @@ _outputKey = "TauJets"
 _outputAuxType = "xAOD::TauJetAuxContainer"
 _outputAuxKey = "TauJetsAux."
 _track_collection = "InDetTrackParticles"
-_jet_collection = "AntiKt4LCTopoJets"
 
 ################################################################################
 ## @class TauRecRunner

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