From 2090d621f62f44750540159bcb9c43a82a761113 Mon Sep 17 00:00:00 2001
From: Long <long.wang@cern.ch>
Date: Tue, 6 Jul 2021 18:33:58 +0200
Subject: [PATCH] fix bin edges to allow for mismatched TP to be filled

---
 DQM/HcalCommon/interface/ValueQuantity.h | 12 +++----
 DQM/HcalTasks/plugins/TPTask.cc          | 41 +++++++++++++++---------
 2 files changed, 32 insertions(+), 21 deletions(-)

diff --git a/DQM/HcalCommon/interface/ValueQuantity.h b/DQM/HcalCommon/interface/ValueQuantity.h
index 7e09a9d826e17..d97199f60ba75 100644
--- a/DQM/HcalCommon/interface/ValueQuantity.h
+++ b/DQM/HcalCommon/interface/ValueQuantity.h
@@ -166,8 +166,8 @@ namespace hcaldqm {
         {fEnergyTotal, 0},
         {fN_m0to10000, -0.05},
         {fEtCorr_256, -1},
-        {fEtCorr_data, 0},
-        {fEtCorr_emul, 0},
+        {fEtCorr_data, -4},
+        {fEtCorr_emul, -4},
         {fADCCorr_128, -2},
         {fBX, -0.5},
         {fEnergy_1TeV, 0},
@@ -228,8 +228,8 @@ namespace hcaldqm {
         {fEnergyTotal, 100000},
         {fN_m0to10000, 10000},
         {fEtCorr_256, 257},
-        {fEtCorr_data, 1024},
-        {fEtCorr_emul, 1024},
+        {fEtCorr_data, 1028},
+        {fEtCorr_emul, 1028},
         {fADCCorr_128, 128},
         {fBX, 3600.5},
         {fEnergy_1TeV, 1000},
@@ -289,8 +289,8 @@ namespace hcaldqm {
         {fEnergyTotal, 500},
         {fN_m0to10000, 100},
         {fEtCorr_256, 258},
-        {fEtCorr_data, 256},
-        {fEtCorr_emul, 256},
+        {fEtCorr_data, 258},
+        {fEtCorr_emul, 258},
         {fADCCorr_128, 130},
         {fBX, 3601},
         {fEnergy_1TeV, 200},
diff --git a/DQM/HcalTasks/plugins/TPTask.cc b/DQM/HcalTasks/plugins/TPTask.cc
index 6b1aac8bcaf47..9513773eb958b 100644
--- a/DQM/HcalTasks/plugins/TPTask.cc
+++ b/DQM/HcalTasks/plugins/TPTask.cc
@@ -761,8 +761,10 @@ TPTask::TPTask(edm::ParameterSet const& ps)
       }
     }
     if (_ptype != fOffline) {  // hidefed2crate
-      _cOccupancyData_ElectronicsuTCA.fill(eid);
-      _cEtData_ElectronicsuTCA.fill(eid, soiEt_d);
+      if (!eid.isVMEid()) {
+        _cOccupancyData_ElectronicsuTCA.fill(eid);
+        _cEtData_ElectronicsuTCA.fill(eid, soiEt_d);
+      }
     }
 
     //	FILL w/a CUT
@@ -779,7 +781,8 @@ TPTask::TPTask(edm::ParameterSet const& ps)
       }
       //	^^^ONLINE ONLY!
       if (_ptype != fOffline) {  // hidefed2crate
-        _cOccupancyCutData_ElectronicsuTCA.fill(eid);
+        if (!eid.isVMEid())
+          _cOccupancyCutData_ElectronicsuTCA.fill(eid);
       }
     }
 
@@ -820,7 +823,8 @@ TPTask::TPTask(edm::ParameterSet const& ps)
         _cFGCorr_TTSubdet[ibit].fill(tid, soiFG_d[ibit], soiFG_e[ibit]);
       //	FILL w/o a CUT
       if (_ptype != fOffline) {  // hidefed2crate
-        _cEtCorrRatio_ElectronicsuTCA.fill(eid, rEt);
+        if (!eid.isVMEid())
+          _cEtCorrRatio_ElectronicsuTCA.fill(eid, rEt);
       }
 
       //	if SOI Et are not equal
@@ -829,7 +833,8 @@ TPTask::TPTask(edm::ParameterSet const& ps)
         tid.ietaAbs() >= 29 ? numMsmHF++ : numMsmHBHE++;
         _cEtMsm_depthlike.fill(tid);
         if (_ptype != fOffline) {  // hidefed2crate
-          _cEtMsm_ElectronicsuTCA.fill(eid);
+          if (!eid.isVMEid())
+            _cEtMsm_ElectronicsuTCA.fill(eid);
         }
         if (_ptype == fOnline)
           _xEtMsm.get(eid)++;
@@ -841,19 +846,21 @@ TPTask::TPTask(edm::ParameterSet const& ps)
         if (soiFG_d[ibit] != soiFG_e[ibit] && _vFGBitsReady[ibit]) {
           _cFGMsm_depthlike.fill(tid);
           if (_ptype != fOffline) {  // hidefed2crate
-            _cFGMsm_ElectronicsuTCA.fill(eid);
+            if (!eid.isVMEid())
+              _cFGMsm_ElectronicsuTCA.fill(eid);
           }
           if (_ptype == fOnline)
             _xFGMsm.get(eid)++;
         }
     } else {
       //	IF MISSING
-      _cEtCorr_TTSubdet.fill(tid, eid, soiEt_d, -2);
-      _cSOIEtCorr_TTSubdet.fill(tid, eid, soiEt_d, -2);
+      _cEtCorr_TTSubdet.fill(tid, eid, soiEt_d, -1);
+      _cSOIEtCorr_TTSubdet.fill(tid, eid, soiEt_d, -1);
       _cMsnEmul_depthlike.fill(tid);
       tid.ietaAbs() >= 29 ? numMsnHF++ : numMsnHBHE++;
       if (_ptype != fOffline) {  // hidefed2crate
-        _cMsnEmul_ElectronicsuTCA.fill(eid);
+        if (!eid.isVMEid())
+          _cMsnEmul_ElectronicsuTCA.fill(eid);
       }
 
       if (soiEt_d > _cutEt) {
@@ -972,8 +979,10 @@ TPTask::TPTask(edm::ParameterSet const& ps)
     _cEtEmul_depthlike.fill(tid, soiEt);
     _cOccupancyEmul_depthlike.fill(tid);
     if (_ptype != fOffline) {  // hidefed2crate
-      _cOccupancyEmul_ElectronicsuTCA.fill(eid);
-      _cEtEmul_ElectronicsuTCA.fill(eid, soiEt);
+      if (!eid.isVMEid()) {
+        _cOccupancyEmul_ElectronicsuTCA.fill(eid);
+        _cEtEmul_ElectronicsuTCA.fill(eid, soiEt);
+      }
     }
 
     //	FILL w/ a CUT
@@ -982,7 +991,8 @@ TPTask::TPTask(edm::ParameterSet const& ps)
       _cOccupancyCutEmul_depthlike.fill(tid);
       _cEtCutEmul_depthlike.fill(tid, soiEt);
       if (_ptype != fOffline) {  // hidefed2crate
-        _cOccupancyCutEmul_ElectronicsuTCA.fill(eid);
+        if (!eid.isVMEid())
+          _cOccupancyCutEmul_ElectronicsuTCA.fill(eid);
       }
 
       //	ONLINE ONLY!
@@ -1000,11 +1010,12 @@ TPTask::TPTask(edm::ParameterSet const& ps)
       HcalTrigPrimDigiCollection::const_iterator jt = cdata->find(tid);
       if (jt == cdata->end()) {
         tid.ietaAbs() >= 29 ? numMsnHF++ : numMsnHBHE++;
-        _cEtCorr_TTSubdet.fill(tid, eid, -2, soiEt);
-        _cSOIEtCorr_TTSubdet.fill(tid, eid, -2, soiEt);
+        _cEtCorr_TTSubdet.fill(tid, eid, -1, soiEt);
+        _cSOIEtCorr_TTSubdet.fill(tid, eid, -1, soiEt);
         _cMsnData_depthlike.fill(tid);
         if (_ptype != fOffline) {  // hidefed2crate
-          _cMsnData_ElectronicsuTCA.fill(eid);
+          if (!eid.isVMEid())
+            _cMsnData_ElectronicsuTCA.fill(eid);
         }
         if (soiEt > _cutEt) {
           tid.ietaAbs() >= 29 ? numMsnCutHF++ : numMsnCutHBHE++;