diff --git a/Reconstruction/tauRec/python/tauRecFlags.py b/Reconstruction/tauRec/python/tauRecFlags.py index 586f9a66f48cd6327dd1974ed9c73c66050d7180..2f054ea48721825ad96859773715e7dbeec0a02a 100644 --- a/Reconstruction/tauRec/python/tauRecFlags.py +++ b/Reconstruction/tauRec/python/tauRecFlags.py @@ -149,7 +149,7 @@ class tauRecTauJetRNNConfig(JobProperty): """ statusOn=True allowedTypes=[['string']] - StoredValue=[ 'tauid_rnn_1p_R22_v0.json', 'tauid_rnn_2p_R22_v0.json', 'tauid_rnn_3p_R22_v0.json' ] + StoredValue=[ 'tauid_rnn_1p_R22_v1.json', 'tauid_rnn_2p_R22_v1.json', 'tauid_rnn_3p_R22_v1.json' ] class tauRecTauJetRNNWPConfig(JobProperty): """Config files for TauWPDecorator for RNN jet ID @@ -163,14 +163,14 @@ class tauRecTauEleRNNConfig(JobProperty): """ statusOn=True allowedTypes=[['string']] - StoredValue=[ 'rnneveto_mc16d_config_1p.json', 'rnneveto_mc16d_config_3p.json' ] + StoredValue=[ 'taueveto_rnn_config_1P_r22.json', 'taueveto_rnn_config_3P_r22.json' ] class tauRecTauEleRNNWPConfig(JobProperty): """Config files for TauWPDecorator for RNN eVeto """ statusOn=True allowedTypes=[['string']] - StoredValue=[ 'rnneveto_mc16d_flat_1p.root', 'rnneveto_mc16d_flat_3p.root' ] + StoredValue=[ 'taueveto_rnn_flat_1P_r22.root', 'taueveto_rnn_flat_3P_r22.root' ] class tauRecPi0ScoreConfig(JobProperty): """Config file for TauPi0ScoreCalculator diff --git a/Reconstruction/tauRecTools/Root/TauJetRNNUtils.cxx b/Reconstruction/tauRecTools/Root/TauJetRNNUtils.cxx index 972a6a05ff1ca56249717e4ec96b1e060f36d6fe..d9a3b535b75bd3b48870057f375b236bfc055dfa 100644 --- a/Reconstruction/tauRecTools/Root/TauJetRNNUtils.cxx +++ b/Reconstruction/tauRecTools/Root/TauJetRNNUtils.cxx @@ -114,6 +114,7 @@ std::unique_ptr<VarCalc> get_default_calculator() { calc->insert("trFlightPathSig", Variables::trFlightPathSig); calc->insert("massTrkSys", Variables::massTrkSys); calc->insert("pt", Variables::pt); + calc->insert("pt_tau_log", Variables::pt_tau_log); calc->insert("ptDetectorAxis", Variables::ptDetectorAxis); calc->insert("ptIntermediateAxis", Variables::ptIntermediateAxis); //---added for the eVeto @@ -254,6 +255,11 @@ bool pt(const xAOD::TauJet &tau, double &out) { return true; } +bool pt_tau_log(const xAOD::TauJet &tau, double &out) { + out = std::log10(std::max(tau.pt() / GeV, 1e-6)); + return true; +} + bool ptDetectorAxis(const xAOD::TauJet &tau, double &out) { out = std::log10(std::min(tau.ptDetectorAxis() / GeV, 100.0)); return true; diff --git a/Reconstruction/tauRecTools/tauRecTools/TauJetRNNUtils.h b/Reconstruction/tauRecTools/tauRecTools/TauJetRNNUtils.h index 9f2058a23cffdf0743a425833a174c8ddc9420ac..01e2e578ed2255ad406dfe4dcbbedccd3a35d299 100644 --- a/Reconstruction/tauRecTools/tauRecTools/TauJetRNNUtils.h +++ b/Reconstruction/tauRecTools/tauRecTools/TauJetRNNUtils.h @@ -102,6 +102,8 @@ bool massTrkSys(const xAOD::TauJet &tau, double &out); bool pt(const xAOD::TauJet &tau, double &out); +bool pt_tau_log(const xAOD::TauJet &tau, double &out); + bool ptDetectorAxis(const xAOD::TauJet &tau, double &out); bool ptIntermediateAxis(const xAOD::TauJet &tau, double &out);