diff --git a/Trigger/TrigMonitoring/TrigMETMonitoring/share/HLTMETMon_jobOptions.py b/Trigger/TrigMonitoring/TrigMETMonitoring/share/HLTMETMon_jobOptions.py
index f202ff3d316e7e0bae7097b0f38c6efd79fc1156..fc9a6c94c1de59ea3d2047edf57b9d5fd85c6e02 100644
--- a/Trigger/TrigMonitoring/TrigMETMonitoring/share/HLTMETMon_jobOptions.py
+++ b/Trigger/TrigMonitoring/TrigMETMonitoring/share/HLTMETMon_jobOptions.py
@@ -12,10 +12,13 @@ import sys
##############
#InputFiles = ['/hep300/data-shared/MET/271595/files/data15_13TeV.00271595.physics_Main.merge.AOD.f611_m1463._lb0331._0001.1']
+InputFiles = ['/hep300/data/khamano/data16/data16_13TeV.00298967.physics_Main.merge.AOD.f696_m1588/data16_13TeV.00298967.physics_Main.merge.AOD.f696_m1588._lb0157._0006.1']
+
+
# xs trigger
#InputFiles = ['/hep300/data/khamano/data15/data15_13TeV.00276952.physics_EnhancedBias.merge.AOD.r7124_p2424_tid06589898_00/AOD.06589898._000130.pool.root.1','/hep300/data/khamano/data15/data15_13TeV.00280500.physics_EnhancedBias.merge.AOD.r7128_p2424_tid06595858_00/AOD.06595858._000083.pool.root.1']
-InputFiles = ['/hep300/data/khamano/data15/data15_13TeV.00276952.physics_EnhancedBias.merge.AOD.r7124_p2424_tid06589898_00/AOD.06589898._000130.pool.root.1']
+#InputFiles = ['/hep300/data/khamano/data15/data15_13TeV.00276952.physics_EnhancedBias.merge.AOD.r7124_p2424_tid06589898_00/AOD.06589898._000130.pool.root.1']
#InputFiles = ['/hep300/data-shared/MET/271595/files/data15_13TeV.00271595.physics_Main.merge.AOD.f611_m1463._lb0331._0001.1']
@@ -114,6 +117,7 @@ globalflags.DetGeo = 'atlas'
from RecExConfig.RecFlags import rec
rec.readRDO = False
+rec.readESD = False
rec.readAOD = True
rec.doWriteESD = False
rec.doWriteAOD = False
diff --git a/Trigger/TrigMonitoring/TrigMETMonitoring/src/HLTMETMonTool.cxx b/Trigger/TrigMonitoring/TrigMETMonitoring/src/HLTMETMonTool.cxx
index fd5ebaf9aca9ba7f734bdf8bab257609e2cadbc0..6eaf093ca92719d066ee07b87b89eb463802c1c8 100755
--- a/Trigger/TrigMonitoring/TrigMETMonitoring/src/HLTMETMonTool.cxx
+++ b/Trigger/TrigMonitoring/TrigMETMonitoring/src/HLTMETMonTool.cxx
@@ -209,9 +209,11 @@ StatusCode HLTMETMonTool::book() {
for (it = m_hlt_met_signatures_tolook.begin(); it != m_hlt_met_signatures_tolook.end(); it++) {
std::string name = it->first;
std::string mu_profname = "Eff_mu_"+name;
- addProfile(new TProfile(mu_profname.c_str(), "Efficiency on Wmunu-like events wrt Offline MET", m_eff_bins, m_eff_min, m_eff_max));
+ std::string mu_prof_title = mu_profname + " Efficiency Missing E_{T};ME_{T} (GeV) (Wmunu-like events)";
+ addProfile(new TProfile(mu_profname.c_str(), mu_prof_title.c_str(), m_eff_bins, m_eff_min, m_eff_max));
std::string el_profname = "Eff_el_"+name;
- addProfile(new TProfile(el_profname.c_str(), "Efficiency on Wenu-like events wrt Offline MET", m_eff_bins, m_eff_min, m_eff_max));
+ std::string el_prof_title = el_profname + " Efficiency Missing E_{T};ME_{T} (GeV) (Wenu-like events)";
+ addProfile(new TProfile(el_profname.c_str(), el_prof_title.c_str(), m_eff_bins, m_eff_min, m_eff_max));
}
@@ -607,7 +609,14 @@ StatusCode HLTMETMonTool::fillMETHist() {
StatusCode sc = StatusCode::SUCCESS;
- // retrieve xAOD L1 ROI
+ // Check HLTResult
+ if(getTDT()->ExperimentalAndExpertMethods()->isHLTTruncated()){
+ ATH_MSG_WARNING("HLTResult truncated, skip event");
+ return false;
+ }
+
+
+ // retrieve xAOD L1 ROI
const xAOD::EnergySumRoI *m_l1_roi_cont = 0;
sc = m_storeGate->retrieve(m_l1_roi_cont, m_lvl1_roi_key);
if(sc.isFailure() || !m_l1_roi_cont) {
@@ -966,7 +975,8 @@ StatusCode HLTMETMonTool::fillMETHist() {
electronEtaReq = ( fabsf(eg->eta()) < 1.37 || fabsf(eg->eta()) > 1.52 ) && fabsf(eg->eta()) < 2.47;
- if (eg->pt()/CLHEP::GeV > m_electron_pt_thresh && electronEtaReq && eg->trackParticle()) {
+ //if (eg->pt()/CLHEP::GeV > m_electron_pt_thresh && electronEtaReq && eg->trackParticle()) {
+ if (eg->pt()/CLHEP::GeV > m_electron_pt_thresh && electronEtaReq) {
METElectronFilled = true;
}
}
@@ -1261,23 +1271,28 @@ StatusCode HLTMETMonTool::fillMETHist() {
if ((h = hist("HLT_XS"))) h->Fill(hlt_significance);
// status histogram; available only for cell MET
- missETEF = *(m_hlt_cell_met_cont->begin());
- //ATH_MSG_INFO("missETEF = " << missETEF);
- //ATH_MSG_INFO("missETEF flag = " << missETEF->flag());
- TH1F *h1i(0);
- bool m_fill_stat = false;
- if((h1i = (TH1F *) hist("HLT_MET_status"))) m_fill_stat = true;
- for (int i=0; i<32; ++i) {
- unsigned mask = (1<<i);
- if (missETEF->flag() & mask) {
+ const xAOD::TrigMissingET *missETEF_cell = 0;
+ if (m_hlt_cell_met_cont && m_hlt_cell_met_cont->size()) {
+ missETEF_cell = *(m_hlt_cell_met_cont->begin());
+ //ATH_MSG_INFO("missETEF_cell = " << missETEF_cell);
+ //ATH_MSG_INFO("missETEF_cell flag = " << missETEF_cell->flag());
+ }
+ if(missETEF_cell) {
+ TH1F *h1i(0);
+ bool m_fill_stat = false;
+ if((h1i = (TH1F *) hist("HLT_MET_status"))) m_fill_stat = true;
+ for (int i=0; i<32; ++i) {
+ unsigned mask = (1<<i);
+ if (missETEF_cell->flag() & mask) {
if(m_fill_stat && h1i) h1i->Fill(i,1.);
- ATH_MSG_DEBUG("missETEF flag Trig = " << missETEF->flag());
+ ATH_MSG_DEBUG("missETEF_cell flag Trig = " << missETEF_cell->flag());
//m_status_flag[i] = 1;
- } else {
+ } else {
if(m_fill_stat && h1i) h1i->Fill(i,0);
//m_status_flag[i] = 0;
- }
- }
+ }
+ }
+ }
}
@@ -1488,10 +1503,10 @@ StatusCode HLTMETMonTool::fillMETHist() {
int electronMult = 0;
if (electronContEmpty == false) {
for (auto eg : *m_hlt_electronEFcontainer) {
- if (eg->trackParticle()) {
- if((h = hist("HLT_electronpt") )) h->Fill(eg->pt()/CLHEP::GeV);
- electronMult += 1;
- }
+ //if (eg->trackParticle()) {
+ if((h = hist("HLT_electronpt") )) h->Fill(eg->pt()/CLHEP::GeV);
+ electronMult += 1;
+ //}
}
ATH_MSG_DEBUG("Electron multiciplicity: " << electronMult);
if((h = hist("HLT_electronmult") )) h->Fill(electronMult);