From 50cb3e6893f2ef4bb4e391b9143c9ee6bb6f69b0 Mon Sep 17 00:00:00 2001 From: Viktor Khristenko Date: Thu, 18 Jun 2015 14:19:14 +0200 Subject: [PATCH] Temporary Fix to match Hcal Trig Towers --- DQM/HcalMonitorTasks/src/HcalTrigPrimMonitor.cc | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/DQM/HcalMonitorTasks/src/HcalTrigPrimMonitor.cc b/DQM/HcalMonitorTasks/src/HcalTrigPrimMonitor.cc index f4428f1ca91f4..fb3b181b1e3b0 100644 --- a/DQM/HcalMonitorTasks/src/HcalTrigPrimMonitor.cc +++ b/DQM/HcalMonitorTasks/src/HcalTrigPrimMonitor.cc @@ -198,6 +198,7 @@ HcalTrigPrimMonitor::processEvent ( const edm::Handle & data_tp_col, const edm::Handle & emul_tp_col) { + bool useD1=false; std::vector errorflag_per_event[2][2]; std::vector errorflag_per_event_oot[2][2]; for (int isZS = 0; isZS <= 1; ++isZS) { @@ -221,6 +222,9 @@ HcalTrigPrimMonitor::processEvent ( int iphi = data_tp->id().iphi(); int isHF = data_tp->id().ietaAbs() >= 29 ? 1 : 0; + // Temporary fix for Hcal Trig Towers Mismatch + if (data_tp->id().depth()==1) + useD1 = true; // if (data_tp->SOI_compressedEt() > 0) { @@ -239,7 +243,11 @@ HcalTrigPrimMonitor::processEvent ( } //check missing from emulator - HcalTrigPrimDigiCollection::const_iterator emul_tp = emul_tp_col->find(data_tp->id()); + // Temporary fix for Hcal Trig Towers Mismatch + HcalTrigPrimDigiCollection::const_iterator emul_tp = + emul_tp_col->find(HcalTrigTowerDetId( + data_tp->id().ieta(), data_tp->id().iphi(), + 0)); if (emul_tp == emul_tp_col->end()) { bool pass_ZS = true; bool pass_ZS_OOT = true; @@ -466,7 +474,11 @@ HcalTrigPrimMonitor::processEvent ( int iphi(emul_tp->id().iphi()); int isHF = emul_tp->id().ietaAbs() >= 29 ? 1 : 0; - HcalTrigPrimDigiCollection::const_iterator data_tp = data_tp_col->find(emul_tp->id()); + // Temporary fix for Hcal Trig Towers Mismatch + HcalTrigPrimDigiCollection::const_iterator data_tp = + data_tp_col->find(HcalTrigTowerDetId( + emul_tp->id().ieta(), emul_tp->id().iphi(), + useD1 ? 1 : 0)); if (data_tp == data_tp_col->end()) { bool pass_ZS = true; bool pass_OOT_ZS = true;