Merge pull request #38500 from quark2/GEM-onlineDQMMoreGE21-12_4_X

More plots from GE21 for the GEM DQMs, a backport to 12_4_X
cms-sw · Jun 29, 2022 · 865cffb · 865cffb
2 parents 91210bf + 2752588
commit 865cffb
Show file tree

Hide file tree

Showing 12 changed files with 219 additions and 176 deletions.
diff --git a/DQM/GEM/interface/GEMDAQStatusSource.h b/DQM/GEM/interface/GEMDAQStatusSource.h
@@ -76,9 +76,9 @@ class GEMDAQStatusSource : public GEMDQMBase {
   edm::EDGetToken tagAMC_;
   edm::EDGetToken tagAMC13_;
 
+  Bool_t bWarnedNotFound_;
+
   MonitorElement *h2AMC13Status_;
-  MonitorElement *h2AMCStatusPos_;
-  MonitorElement *h2AMCStatusNeg_;
 
   MEMap3Inf mapStatusOH_;
   MEMap3Inf mapStatusVFAT_;
@@ -100,9 +100,14 @@ class GEMDAQStatusSource : public GEMDQMBase {
 
   std::string strFolderMain_;
 
+  Bool_t bFillAMC_;
+
   Int_t nBXMin_, nBXMax_;
 
   std::map<UInt_t, int> mapFEDIdToRe_;
+  std::map<UInt_t, int> mapFEDIdToSt_;
+  std::map<UInt_t, int> mapFEDIdToPosition_;
+  std::map<UInt_t, MonitorElement *> mapFEDIdToAMCStatus_;
   std::map<int, std::vector<GEMDetId>> mapAMC13ToListChamber_;
   std::map<std::tuple<int, int>, std::vector<GEMDetId>> mapAMCToListChamber_;
   Int_t nAMCSlots_;

diff --git a/DQM/GEM/interface/GEMDQMBase.h b/DQM/GEM/interface/GEMDQMBase.h
@@ -334,7 +334,7 @@ class GEMDQMBase : public DQMEDAnalyzer {
       return mapHist[key];
     };
 
-    int SetLabelForChambers(K key, Int_t nAxis, Int_t nNumBin = -1) {
+    int SetLabelForChambers(K key, Int_t nAxis, Int_t nNumBin = -1, Int_t nIdxStart = 1) {
       if (!bOperating_)
         return 0;
       if (nNumBin <= 0) {
@@ -348,7 +348,7 @@ class GEMDQMBase : public DQMEDAnalyzer {
       dqm::impl::MonitorElement *histCurr = FindHist(key);
       if (histCurr == nullptr)
         return -999;
-      for (Int_t i = 1; i <= nNumBin; i++) {
+      for (Int_t i = nIdxStart; i <= nNumBin; i++) {
         histCurr->setBinLabel(i, Form("%i", i), nAxis);
       }
       return 0;
@@ -492,6 +492,8 @@ class GEMDQMBase : public DQMEDAnalyzer {
     Int_t nMaxVFAT_;  // the number of all VFATs in each chamber (= # of VFATs in eta partition * nNumEtaPartitions_)
     Int_t nNumDigi_;  // the number of digis of each VFAT
 
+    Int_t nMinIdxChamber_;
+    Int_t nMaxIdxChamber_;
     Float_t fMinPhi_;
 
     std::vector<Float_t> listRadiusEvenChamber_;

diff --git a/DQM/GEM/interface/GEMRecHitSource.h b/DQM/GEM/interface/GEMRecHitSource.h
@@ -35,7 +35,6 @@ class GEMRecHitSource : public GEMDQMBase {
   int nNumDivideEtaPartitionInRPhi_;
 
   MEMap3Inf mapRecHitXY_layer_;
-  MEMap3Inf mapRecHitWheel_layer_;
   MEMap3Inf mapRecHitOcc_ieta_;
   MEMap3Inf mapRecHitOcc_phi_;
   MEMap3Inf mapTotalRecHitPerEvtLayer_;