diff --git a/Reconstruction/tauRec/python/tauRecFlags.py b/Reconstruction/tauRec/python/tauRecFlags.py index 3e9f8fa0b4e9f312581eb5fc34d6903762a213bf..6ec2d19d5914c4df43419f33acf3848784bfb84c 100644 --- a/Reconstruction/tauRec/python/tauRecFlags.py +++ b/Reconstruction/tauRec/python/tauRecFlags.py @@ -52,6 +52,12 @@ class tauRecToolsCVMFSPath(JobProperty): allowedTypes=['string'] StoredValue="tauRecTools/00-02-00/" +class doTJVA(JobProperty): + """ switch of TJVA """ + statusOn=True + allowedTypes=['bool'] + StoredValue=True + #deprecated class TauDiscriminantCVMFSPath(JobProperty): """ path to cvmfs file location @@ -141,11 +147,10 @@ class doPanTau(JobProperty): StoredValue=True class doPi0(JobProperty): - """ switch on Pi0 Finder - """ + """ switch of Pi0 Finder """ statusOn=True allowedTypes=['bool'] - StoredValue=False + StoredValue=True class pi0EtCuts(JobProperty): """ Set |eta| dependent Et requirement for pi0 tag @@ -205,7 +210,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,TauDiscriminantCVMFSPath,tauRecMVATrackClassification,tauRecRNNTrackClassification,tauRecMVATrackClassificationConfig,tauRecRNNTrackClassificationConfig,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,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 diff --git a/Reconstruction/tauRec/share/tauRec_jobOptions.py b/Reconstruction/tauRec/share/tauRec_jobOptions.py index 50f62486ad0eedb3ffd0c9c8922a291d2db7b91e..7523c60066c9d03320841f9c11780d5c344b6468 100644 --- a/Reconstruction/tauRec/share/tauRec_jobOptions.py +++ b/Reconstruction/tauRec/share/tauRec_jobOptions.py @@ -12,29 +12,19 @@ from RecExConfig.RecFlags import rec from AthenaCommon.BeamFlags import jobproperties from AthenaCommon.GlobalFlags import globalflags import AthenaCommon.SystemOfUnits as Units -from tauRec.tauRecFlags import jobproperties as taujp +from tauRec.tauRecFlags import tauFlags # use Tau Jet Vertex Association Tool -# each Tau candidate gets its own primary vertex -# and the tracks are selected accroding to this vertex -_doTJVA = True +_doTJVA = tauFlags.doTJVA() # Pi0-finding algorithm -_doPi0Clus = taujp.tauRecFlags.doPi0() #False by default -_doPi0Clus = True +_doPi0Clus = tauFlags.doPi0() -# Change jet seed (default AntiKt4LCTopoJets) -# taujp.tauRecFlags.tauRecSeedJetCollection.set_Value_and_Lock("AntiKt4LCTopoJets") - -# the TauCoreBuilder from tauRec.TauRecBuilder import TauRecCoreBuilder TauRecCoreBuilder(doPi0Clus=_doPi0Clus, doTJVA=_doTJVA) -#include("tauRec/Pi0ClusterMaker_Crakow_jobOptions.py") if _doPi0Clus: include("tauRec/Pi0ClusterMaker_jobOptions.py") from tauRec.TauRecRunner import TauRecRunner TauRecRunner(doPi0Clus=_doPi0Clus, doTJVA=_doTJVA) - -