diff --git a/Trigger/TrigMonitoring/TrigMETMonitoring/python/TrigMETMonitorAlgorithm.py b/Trigger/TrigMonitoring/TrigMETMonitoring/python/TrigMETMonitorAlgorithm.py
index 3b4e3468399d87b6e8c0c948e04af5bba4de28f9..974aabafaa8e3217702471ec8673c1ec83c6e9f4 100644
--- a/Trigger/TrigMonitoring/TrigMETMonitoring/python/TrigMETMonitorAlgorithm.py
+++ b/Trigger/TrigMonitoring/TrigMETMonitoring/python/TrigMETMonitorAlgorithm.py
@@ -370,33 +370,49 @@ def TrigMETMonConfig(inputFlags):
path='Shifter/L1_{}'.format(alg),
xbins=ec_bins,xmin=ec_min,xmax=ec_max)
metGroup.defineHistogram('L1_{}_HT_Ex'.format(alg),
- title='L1_{} Missing E_{{x}};E_{{x}} [GeV];Events'.format(alg),
+ title='L1_{} HT Missing E_{{x}};E_{{x}} [GeV];Events'.format(alg),
path='Shifter/L1_{}'.format(alg),
xbins=ec_bins,xmin=ec_min,xmax=ec_max)
metGroup.defineHistogram('L1_{}_ST_Ex'.format(alg),
- title='L1_{} Missing E_{{x}};E_{{x}} [GeV];Events'.format(alg),
+ title='L1_{} ST Missing E_{{x}};E_{{x}} [GeV];Events'.format(alg),
path='Shifter/L1_{}'.format(alg),
xbins=ec_bins,xmin=ec_min,xmax=ec_max)
metGroup.defineHistogram('L1_{}_Ex_log'.format(alg),
title='L1_{} Missing E_{{x}} log;sgn(E_{{x}}) log(E_{{x}}/GeV);Events'.format(alg),
path='Shifter/L1_{}'.format(alg),
+ xbins=ec_bins,xmin=ec_min,xmax=ec_max)
+ metGroup.defineHistogram('L1_{}_HT_Ex_log'.format(alg),
+ title='L1_{} HT Missing E_{{x}} log;sgn(E_{{x}}) log(E_{{x}}/GeV);Events'.format(alg),
+ path='Shifter/L1_{}'.format(alg),
+ xbins=ec_bins_log,xmin=ec_min_log,xmax=ec_max_log)
+ metGroup.defineHistogram('L1_{}_ST_Ex_log'.format(alg),
+ title='L1_{} ST Missing E_{{x}} log;sgn(E_{{x}}) log(E_{{x}}/GeV);Events'.format(alg),
+ path='Shifter/L1_{}'.format(alg),
xbins=ec_bins_log,xmin=ec_min_log,xmax=ec_max_log)
metGroup.defineHistogram('L1_{}_Ey'.format(alg),
title='L1_{} Missing E_{{y}};E_{{y}} [GeV];Events'.format(alg),
path='Shifter/L1_{}'.format(alg),
xbins=ec_bins,xmin=ec_min,xmax=ec_max)
metGroup.defineHistogram('L1_{}_HT_Ey'.format(alg),
- title='L1_{} Missing E_{{y}};E_{{y}} [GeV];Events'.format(alg),
+ title='L1_{} HT Missing E_{{y}};E_{{y}} [GeV];Events'.format(alg),
path='Shifter/L1_{}'.format(alg),
xbins=ec_bins,xmin=ec_min,xmax=ec_max)
metGroup.defineHistogram('L1_{}_ST_Ey'.format(alg),
- title='L1_{} Missing E_{{y}};E_{{y}} [GeV];Events'.format(alg),
+ title='L1_{} ST Missing E_{{y}};E_{{y}} [GeV];Events'.format(alg),
path='Shifter/L1_{}'.format(alg),
xbins=ec_bins,xmin=ec_min,xmax=ec_max)
metGroup.defineHistogram('L1_{}_Ey_log'.format(alg),
title='L1_{} Missing E_{{y}} log;sgn(E_{{y}}) log(E_{{y}}/GeV);Events'.format(alg),
path='Shifter/L1_{}'.format(alg),
xbins=ec_bins_log,xmin=ec_min_log,xmax=ec_max_log)
+ metGroup.defineHistogram('L1_{}_HT_Ey_log'.format(alg),
+ title='L1_{} HT Missing E_{{y}} log;sgn(E_{{y}}) log(E_{{y}}/GeV);Events'.format(alg),
+ path='Shifter/L1_{}'.format(alg),
+ xbins=ec_bins_log,xmin=ec_min_log,xmax=ec_max_log)
+ metGroup.defineHistogram('L1_{}_ST_Ey_log'.format(alg),
+ title='L1_{} ST Missing E_{{y}} log;sgn(E_{{y}}) log(E_{{y}}/GeV);Events'.format(alg),
+ path='Shifter/L1_{}'.format(alg),
+ xbins=ec_bins_log,xmin=ec_min_log,xmax=ec_max_log)
metGroup.defineHistogram('L1_{}_Et'.format(alg),
title='L1_{} Missing E_{{T}};E_{{T}} [GeV];Events'.format(alg),
path='Shifter/L1_{}'.format(alg),
diff --git a/Trigger/TrigMonitoring/TrigMETMonitoring/src/TrigMETMonitorAlgorithm.cxx b/Trigger/TrigMonitoring/TrigMETMonitoring/src/TrigMETMonitorAlgorithm.cxx
index 99d962f492bfd77a2321dd02f76a2a2094ee06da..4dbf520d2a250f4bd0fd82aff4cc9258adc3b620 100644
--- a/Trigger/TrigMonitoring/TrigMETMonitoring/src/TrigMETMonitorAlgorithm.cxx
+++ b/Trigger/TrigMonitoring/TrigMETMonitoring/src/TrigMETMonitorAlgorithm.cxx
@@ -412,7 +412,7 @@ StatusCode TrigMETMonitorAlgorithm::fillHistograms( const EventContext& ctx ) co
if (l1_jFexMet_cont.isValid()) {
float L1_met_Ex = 0;
float L1_met_Ey = 0;
- for (const auto l1_jmet: *l1_jFexMet_cont) {
+ for (const auto &l1_jmet: *l1_jFexMet_cont) {
L1_met_Ex += l1_jmet->Ex()*0.001;
L1_met_Ey += l1_jmet->Ey()*0.001;
}
@@ -430,7 +430,7 @@ StatusCode TrigMETMonitorAlgorithm::fillHistograms( const EventContext& ctx ) co
}
if (l1_jFexSumEt_cont.isValid()) {
float L1_met_sumEt = 0;
- for (const auto l1_jsumEt: *l1_jFexSumEt_cont) {
+ for (const auto &l1_jsumEt: *l1_jFexSumEt_cont) {
L1_met_sumEt += l1_jsumEt->Et_lower()*0.001 + l1_jsumEt->Et_upper()*0.001;
}
float L1_met_sumEt_log = signed_log(L1_met_sumEt, epsilon);
@@ -456,61 +456,46 @@ StatusCode TrigMETMonitorAlgorithm::fillHistograms( const EventContext& ctx ) co
auto L1_sumEt_log = Monitored::Scalar<float>("L1_gFexJwoj_sumEt_log", static_cast<float>(L1_met_sumEt_log));
fill(tool, L1_Et, L1_Et_log, L1_sumEt, L1_sumEt_log);
}
-
+
if (l1_gFexJwojMETComponents_cont.isValid()) {
l1_gmet = l1_gFexJwojMETComponents_cont->at(0);
float L1_met_Ex = l1_gmet->METquantityOne()*0.001;
+ float L1_met_Ex_log = signed_log(L1_met_Ex, epsilon);
float L1_met_Ey = l1_gmet->METquantityTwo()*0.001;
+ float L1_met_Ey_log = signed_log(L1_met_Ey, epsilon);
auto L1_Ex = Monitored::Scalar<float>("L1_gFexJwoj_Ex", static_cast<float>(L1_met_Ex));
auto L1_Ey = Monitored::Scalar<float>("L1_gFexJwoj_Ey", static_cast<float>(L1_met_Ey));
- fill(tool, L1_Ex, L1_Ey);
+ auto L1_Ex_log = Monitored::Scalar<float>("L1_gFexJwoj_Ex_log", static_cast<float>(L1_met_Ex_log));
+ auto L1_Ey_log = Monitored::Scalar<float>("L1_gFexJwoj_Ey_log", static_cast<float>(L1_met_Ey_log));
+ fill(tool, L1_Ex, L1_Ey, L1_Ex_log, L1_Ey_log);
}
if (l1_gFexJwojMHTComponents_cont.isValid()) {
l1_gmet = l1_gFexJwojMHTComponents_cont->at(0);
float L1_met_HT_Ex = l1_gmet->METquantityOne()*0.001;
+ float L1_met_HT_Ex_log = signed_log(L1_met_HT_Ex, epsilon);
float L1_met_HT_Ey = l1_gmet->METquantityTwo()*0.001;
+ float L1_met_HT_Ey_log = signed_log(L1_met_HT_Ey, epsilon);
auto L1_HT_Ex = Monitored::Scalar<float>("L1_gFexJwoj_HT_Ex", static_cast<float>(L1_met_HT_Ex));
auto L1_HT_Ey = Monitored::Scalar<float>("L1_gFexJwoj_HT_Ey", static_cast<float>(L1_met_HT_Ey));
- fill(tool, L1_HT_Ex, L1_HT_Ey);
+ auto L1_HT_Ex_log = Monitored::Scalar<float>("L1_gFexJwoj_HT_Ex_log", static_cast<float>(L1_met_HT_Ex_log));
+ auto L1_HT_Ey_log = Monitored::Scalar<float>("L1_gFexJwoj_HT_Ey_log", static_cast<float>(L1_met_HT_Ey_log));
+ fill(tool, L1_HT_Ex, L1_HT_Ey, L1_HT_Ex_log, L1_HT_Ey_log);
}
-
+
if (l1_gFexJwojMSTComponents_cont.isValid()) {
l1_gmet = l1_gFexJwojMSTComponents_cont->at(0);
float L1_met_ST_Ex = l1_gmet->METquantityOne()*0.001;
+ float L1_met_ST_Ex_log = signed_log(L1_met_ST_Ex, epsilon);
float L1_met_ST_Ey = l1_gmet->METquantityTwo()*0.001;
+ float L1_met_ST_Ey_log = signed_log(L1_met_ST_Ey, epsilon);
auto L1_ST_Ex = Monitored::Scalar<float>("L1_gFexJwoj_ST_Ex", static_cast<float>(L1_met_ST_Ex));
auto L1_ST_Ey = Monitored::Scalar<float>("L1_gFexJwoj_ST_Ey", static_cast<float>(L1_met_ST_Ey));
- fill(tool, L1_ST_Ex, L1_ST_Ey);
- }
-
- if (l1_gFexJwojMETComponents_cont.isValid()) {
- l1_gmet = l1_gFexJwojMETComponents_cont->at(0);
- float L1_met_Ex = l1_gmet->METquantityOne()*0.001;
- float L1_met_Ey = l1_gmet->METquantityTwo()*0.001;
- auto L1_Ex = Monitored::Scalar<float>("L1_gFexJwoj_Ex", static_cast<float>(L1_met_Ex));
- auto L1_Ey = Monitored::Scalar<float>("L1_gFexJwoj_Ey", static_cast<float>(L1_met_Ey));
- fill(tool, L1_Ex, L1_Ey);
- }
-
- if (l1_gFexJwojMHTComponents_cont.isValid()) {
- l1_gmet = l1_gFexJwojMHTComponents_cont->at(0);
- float L1_met_HT_Ex = l1_gmet->METquantityOne()*0.001;
- float L1_met_HT_Ey = l1_gmet->METquantityTwo()*0.001;
- auto L1_HT_Ex = Monitored::Scalar<float>("L1_gFexJwoj_HT_Ex", static_cast<float>(L1_met_HT_Ex));
- auto L1_HT_Ey = Monitored::Scalar<float>("L1_gFexJwoj_HT_Ey", static_cast<float>(L1_met_HT_Ey));
- fill(tool, L1_HT_Ex, L1_HT_Ey);
- }
-
- if (l1_gFexJwojMSTComponents_cont.isValid()) {
- l1_gmet = l1_gFexJwojMSTComponents_cont->at(0);
- float L1_met_ST_Ex = l1_gmet->METquantityOne()*0.001;
- float L1_met_ST_Ey = l1_gmet->METquantityTwo()*0.001;
- auto L1_ST_Ex = Monitored::Scalar<float>("L1_gFexJwoj_ST_Ex", static_cast<float>(L1_met_ST_Ex));
- auto L1_ST_Ey = Monitored::Scalar<float>("L1_gFexJwoj_ST_Ey", static_cast<float>(L1_met_ST_Ey));
- fill(tool, L1_ST_Ex, L1_ST_Ey);
- }
-
+ auto L1_ST_Ex_log = Monitored::Scalar<float>("L1_gFexJwoj_ST_Ex_log", static_cast<float>(L1_met_ST_Ex_log));
+ auto L1_ST_Ey_log = Monitored::Scalar<float>("L1_gFexJwoj_ST_Ey_log", static_cast<float>(L1_met_ST_Ey_log));
+ fill(tool, L1_ST_Ex, L1_ST_Ey, L1_ST_Ex_log, L1_ST_Ey_log);
+ }
+
// define TrigMissingET object
const xAOD::TrigMissingET *hlt_met = 0;