Merge branch 'R22_tauRecSeedFlag' into 'master'

Add tauRec flag for minimum seed jet pt

See merge request atlas/athena!36064

Reconstruction/tauRec/python/TauAlgorithmsHolder.py

@@ -54,7 +54,7 @@ def getAtlasExtrapolator():
 
 ########################################################################
 # JetSeedBuilder
-def getJetSeedBuilder(seed_collection_name):
+def getJetSeedBuilder():
     _name = sPrefix + 'JetSeedBuilder'
     
     if _name in cached_instances:

Reconstruction/tauRec/python/TauRecBuilder.py

@@ -78,7 +78,7 @@ class TauRecCoreBuilder ( TauRecConfigured ) :
         
         tools = []
         try:
-            tools.append(taualgs.getJetSeedBuilder(seed_collection_name=tauFlags.tauRecSeedJetCollection()))
+            tools.append(taualgs.getJetSeedBuilder())
 
             # 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

-# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 ################################################################################
 ##
@@ -43,9 +43,8 @@ class TauRecConfigured ( Configured ) :
                                                         Key_tauShotClusOutputContainer="TauShotClusters",
                                                         Key_tauShotPFOOutputContainer="TauShotParticleFlowObjects",
                                                         Key_tauPi0CellOutputContainer="TauCommonPi0Cells",
-                                                        #MaxEta = 2.5,                                                                         
                                                         MaxEta = tauFlags.tauRecSeedMaxEta(),
-                                                        MinPt = 10.*GeV,
+                                                        MinPt = tauFlags.tauRecSeedMinPt(),
                                                         CellMakerTool = TauCellContainerFinalizer)
 
         Configured.__init__(self, ignoreExistingDataObject=ignoreExistingDataObject)

Reconstruction/tauRec/python/tauRecFlags.py

-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 ################################################################################
 ##
@@ -103,6 +103,13 @@ class tauRecDecayModeNNClassifierConfig(JobProperty):
     allowedTypes=['string']
     StoredValue='NNDecayModeWeights-20200625.json'
 
+class tauRecSeedMinPt(JobProperty):
+    """ minimum jet seed pt
+    """
+    statusOn=True
+    allowedTypes=['float']
+    StoredValue=10.*Units.GeV
+
 class tauRecSeedMaxEta(JobProperty):
     """ max allowed abs_eta of jet seed
     """
@@ -217,7 +224,7 @@ class tauRecFlags(JobPropertyContainer):
 jobproperties.add_Container(tauRecFlags)
 
 # I want always the following flags in the Rec container  
-_list_tau=[Enabled,doTauRec,isStandalone,tauRecSeedJetCollection,tauRecToolsCVMFSPath,doTJVA,TauDiscriminantCVMFSPath,tauRecMVATrackClassification,tauRecRNNTrackClassification,tauRecMVATrackClassificationConfig,tauRecRNNTrackClassificationConfig,tauRecDecayModeNNClassifierConfig,tauRecSeedMaxEta,tauRecToolsDevToolList,tauRecToolsDevToolListProcessor,doRunTauDiscriminant,useVertexBasedConvFinder,useNewPIDBasedConvFinder,doPanTau,doPi0,pi0EtCuts,pi0MVACuts_1prong,pi0MVACuts_mprong,shotPtCut_1Photon,shotPtCut_2Photons,useOldVertexFitterAPI,useShowerSubClusters]
+_list_tau=[Enabled,doTauRec,isStandalone,tauRecSeedJetCollection,tauRecToolsCVMFSPath,doTJVA,TauDiscriminantCVMFSPath,tauRecMVATrackClassification,tauRecRNNTrackClassification,tauRecMVATrackClassificationConfig,tauRecRNNTrackClassificationConfig,tauRecDecayModeNNClassifierConfig,tauRecSeedMinPt,tauRecSeedMaxEta,tauRecToolsDevToolList,tauRecToolsDevToolListProcessor,doRunTauDiscriminant,useVertexBasedConvFinder,useNewPIDBasedConvFinder,doPanTau,doPi0,pi0EtCuts,pi0MVACuts_1prong,pi0MVACuts_mprong,shotPtCut_1Photon,shotPtCut_2Photons,useOldVertexFitterAPI,useShowerSubClusters]
 for j in _list_tau: 
     jobproperties.tauRecFlags.add_JobProperty(j)
 del _list_tau