Merge pull request #33193 from quark2/GEMonlineDQM_PR_113X

Fix on the indexing of VFATs in GEM onlineDQM
cms-sw · Mar 17, 2021 · 709c175 · 709c175
2 parents 53893ec + f051705
commit 709c175
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/DQM/GEM/interface/GEMDQMBase.h b/DQM/GEM/interface/GEMDQMBase.h
@@ -446,7 +446,7 @@ inline int GEMDQMBase::getVFATNumberGE11(const int station, const int ieta, cons
 }
 
 inline int GEMDQMBase::getVFATNumberByStrip(const int station, const int ieta, const int strip) {
-  const int vfat_phi = (strip % GEMeMap::maxChan_) ? strip / GEMeMap::maxChan_ + 1 : strip / GEMeMap::maxChan_;
+  const int vfat_phi = (strip % GEMeMap::maxChan_) ? strip / GEMeMap::maxChan_ : strip / GEMeMap::maxChan_ - 1;
   return getVFATNumber(station, ieta, vfat_phi);
 }
 

diff --git a/DQM/GEM/plugins/GEMDAQStatusSource.cc b/DQM/GEM/plugins/GEMDAQStatusSource.cc
@@ -393,7 +393,7 @@ void GEMDAQStatusSource::analyze(edm::Event const &event, edm::EventSetup const
         mapChamberStatus[key4Ch] = false;
       }
 
-      Int_t nIdxVFAT = getVFATNumber(gid.station(), gid.roll(), vfatStat->phi() + 1);
+      Int_t nIdxVFAT = getVFATNumber(gid.station(), gid.roll(), vfatStat->phi());
       mapStatusVFAT_.FillBits(key3, nIdxVFAT, unQFVFAT);
       mapStatusVFATPerCh_.FillBits(key4Ch, nIdxVFAT, unQFVFAT);
     }

diff --git a/DQM/GEM/plugins/GEMDigiSource.cc b/DQM/GEM/plugins/GEMDigiSource.cc
@@ -16,6 +16,8 @@
 
 #include "DataFormats/GEMDigi/interface/GEMDigiCollection.h"
 
+#include "DataFormats/Scalers/interface/LumiScalers.h"
+
 #include "DQM/GEM/interface/GEMDQMBase.h"
 
 #include <string>
@@ -39,6 +41,8 @@ class GEMDigiSource : public GEMDQMBase {
 
   edm::EDGetToken tagDigi_;
 
+  edm::EDGetTokenT<LumiScalersCollection> lumiScalers_;
+
   MEMap3Inf mapTotalDigi_layer_;
   MEMap3Inf mapStripOcc_ieta_;
   MEMap3Inf mapStripOcc_phi_;
@@ -58,6 +62,8 @@ using namespace edm;
 
 GEMDigiSource::GEMDigiSource(const edm::ParameterSet& cfg) : GEMDQMBase(cfg) {
   tagDigi_ = consumes<GEMDigiCollection>(cfg.getParameter<edm::InputTag>("digisInputLabel"));
+  lumiScalers_ = consumes<LumiScalersCollection>(
+      cfg.getUntrackedParameter<edm::InputTag>("lumiCollection", edm::InputTag("scalersRawToDigi")));
 }
 
 void GEMDigiSource::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
@@ -161,6 +167,9 @@ int GEMDigiSource::ProcessWithMEMap3WithChamber(BookingHelper& bh, ME4IdsKey key
 void GEMDigiSource::analyze(edm::Event const& event, edm::EventSetup const& eventSetup) {
   edm::Handle<GEMDigiCollection> gemDigis;
   event.getByToken(this->tagDigi_, gemDigis);
+  edm::Handle<LumiScalersCollection> lumiScalers;
+  event.getByToken(lumiScalers_, lumiScalers);
+
   std::map<ME3IdsKey, Int_t> total_strip_layer;
   for (const auto& ch : gemChambers_) {
     GEMDetId gid = ch.id();