diff --git a/TileCalorimeter/TileMonitoring/TileMonitoring/TileJetMonTool.h b/TileCalorimeter/TileMonitoring/TileMonitoring/TileJetMonTool.h index 145fe1f5df47a70f94310815b7ae1984fd12ff3d..d47f2bc67abfbcc78bbaaa1d5fe818e0360923a7 100644 --- a/TileCalorimeter/TileMonitoring/TileMonitoring/TileJetMonTool.h +++ b/TileCalorimeter/TileMonitoring/TileMonitoring/TileJetMonTool.h @@ -125,6 +125,7 @@ class TileJetMonTool: public TileFatherMonTool { bool m_do_jet_cleaning; float m_jet_tracking_eta_limit; float m_jet_jvt_threshold; + float m_jet_jvt_ptmax; bool m_first_event; // JVT ToolHandle<IJetUpdateJvt> m_jvt; diff --git a/TileCalorimeter/TileMonitoring/share/TileMon_jobOptions.py b/TileCalorimeter/TileMonitoring/share/TileMon_jobOptions.py index a77da8e3ab7803ea86d5adbd5312630db9151ae7..7f1a58af0ff48cc53783821536d921b9f554221b 100644 --- a/TileCalorimeter/TileMonitoring/share/TileMon_jobOptions.py +++ b/TileCalorimeter/TileMonitoring/share/TileMon_jobOptions.py @@ -125,7 +125,8 @@ if tileESDMon: , do_jet_cleaning = False # , useJVTTool = jvt # , useJetCleaning = cleaning - , jet_JVT_threshold = 0.64 + , jet_JVT_threshold = 0.59 + , jet_JVT_pTmax = 120000 # MeV , histoPathBase = "/Tile/Jet") from JetRec.JetRecFlags import jetFlags diff --git a/TileCalorimeter/TileMonitoring/share/Tile_JetMonTool_time.py b/TileCalorimeter/TileMonitoring/share/Tile_JetMonTool_time.py index c58ded5ffbf5a50d309c34253c7e1115167a0138..7be9bd604e17bfa1650973dc5662df0f042f9876 100644 --- a/TileCalorimeter/TileMonitoring/share/Tile_JetMonTool_time.py +++ b/TileCalorimeter/TileMonitoring/share/Tile_JetMonTool_time.py @@ -262,7 +262,8 @@ TileJetMonTool = TileJetMonTool(name = 'TileJetMonTool', useJetCleaning = cleaning, useEventCleaning = ecTool, jet_tracking_eta_limit = 2.4, - jet_JVT_threshold = 0.64, + jet_JVT_threshold = 0.59, + jet_JVT_pTmax = 120000, # MeV OutputLevel = INFO); ToolSvc += TileJetMonTool; ManagedAthenaTileMon.AthenaMonTools += [ TileJetMonTool ]; diff --git a/TileCalorimeter/TileMonitoring/src/TileJetMonTool.cxx b/TileCalorimeter/TileMonitoring/src/TileJetMonTool.cxx index 33fb225caae77d8c472fd313fe74c2ed52596551..aa5d99e358cbb7657fab8bdd925f5bcd7ed73c9d 100644 --- a/TileCalorimeter/TileMonitoring/src/TileJetMonTool.cxx +++ b/TileCalorimeter/TileMonitoring/src/TileJetMonTool.cxx @@ -44,7 +44,7 @@ #include "xAODEventInfo/EventInfo.h" #include "JetMomentTools/JetVertexTaggerTool.h" -//#include "JetJvtEfficiency/JetJvtEfficiency.h" + //#include "CaloIdentifier/Tile_Base_ID.h" //#include "TH2F.h" //#include "TH1F.h" @@ -85,6 +85,7 @@ TileJetMonTool::TileJetMonTool(const std::string & type, const std::string & nam declareProperty("OrDecorator",m_OrDecorator = "passOR"); declareProperty("jet_tracking_eta_limit",m_jet_tracking_eta_limit = 2.4); declareProperty("jet_JVT_threshold",m_jet_jvt_threshold = 0.59); + declareProperty("jet_JVT_pTmax",m_jet_jvt_ptmax = 120000); m_path = "/Tile/Jet"; m_partname[0] = "LBA"; @@ -749,7 +750,7 @@ bool TileJetMonTool::isGoodEvent() { bool TileJetMonTool::passesJvt(const xAOD::Jet& jet) { if (jet.pt() > 20000 - && jet.pt() < 60000 + && jet.pt() < m_jet_jvt_ptmax && fabs(jet.getAttribute<float>("DetectorEta")) < m_jet_tracking_eta_limit && m_jvt->updateJvt(jet) < m_jet_jvt_threshold) return false;