Merge pull request cms-sw#20006 from abrinke1/EMTF_PR_2017_93X_part5

EMTF 2017 PR #5 - DQM
gpetruc · Aug 17, 2017 · d157ff9 · d157ff9
2 parents 8e40a2d + d0d882c
commit d157ff9
Show file tree

Hide file tree

Showing 9 changed files with 500 additions and 204 deletions.
diff --git a/DQM/L1TMonitor/interface/L1TStage2EMTF.h b/DQM/L1TMonitor/interface/L1TStage2EMTF.h
@@ -9,8 +9,8 @@
 #include "DQMServices/Core/interface/MonitorElement.h"
 
 #include "DataFormats/L1TMuon/interface/EMTFDaqOut.h"
-#include "DataFormats/L1TMuon/interface/EMTFHit2016.h"
-#include "DataFormats/L1TMuon/interface/EMTFTrack2016.h"
+#include "DataFormats/L1TMuon/interface/EMTFHit.h"
+#include "DataFormats/L1TMuon/interface/EMTFTrack.h"
 #include "DataFormats/L1TMuon/interface/RegionalMuonCand.h"
 
 
@@ -31,24 +31,30 @@ class L1TStage2EMTF : public DQMEDAnalyzer {
  private:
 
   edm::EDGetTokenT<l1t::EMTFDaqOutCollection> daqToken;
-  edm::EDGetTokenT<l1t::EMTFHit2016Collection> hitToken;
-  edm::EDGetTokenT<l1t::EMTFTrack2016Collection> trackToken;
+  edm::EDGetTokenT<l1t::EMTFHitCollection> hitToken;
+  edm::EDGetTokenT<l1t::EMTFTrackCollection> trackToken;
   edm::EDGetTokenT<l1t::RegionalMuonCandBxCollection> muonToken;
   std::string monitorDir;
   bool verbose;
 
   MonitorElement* emtfErrors;
+  MonitorElement* mpcLinkErrors;
+  MonitorElement* mpcLinkGood;
 
-  MonitorElement* emtfHitBX;
-  MonitorElement* emtfHitStrip[18];
-  MonitorElement* emtfHitWire[18];
-  MonitorElement* emtfChamberStrip[18];
-  MonitorElement* emtfChamberWire[18];
-  MonitorElement* emtfHitOccupancy;
+  MonitorElement* cscLCTBX;
+  MonitorElement* cscLCTStrip[20];
+  MonitorElement* cscLCTWire[20];
+  MonitorElement* cscChamberStrip[20];
+  MonitorElement* cscChamberWire[20];
+  MonitorElement* cscLCTOccupancy;
+  MonitorElement* cscLCTTiming[5];
+  MonitorElement* cscLCTTimingFrac[4];
 
   MonitorElement* emtfnTracks;
   MonitorElement* emtfTracknHits;
   MonitorElement* emtfTrackBX;
+  MonitorElement* emtfTrackBXVsCSCLCT[3];
+  MonitorElement* emtfTrackBXVsRPCHit[3];
   MonitorElement* emtfTrackPt;
   MonitorElement* emtfTrackEta;
   MonitorElement* emtfTrackPhi;
@@ -63,6 +69,17 @@ class L1TStage2EMTF : public DQMEDAnalyzer {
   MonitorElement* emtfMuonhwEta;
   MonitorElement* emtfMuonhwPhi;
   MonitorElement* emtfMuonhwQual;
+
+  MonitorElement* rpcHitBX;
+  MonitorElement* rpcHitOccupancy;
+  MonitorElement* rpcHitTiming[5];
+  MonitorElement* rpcHitTimingFrac[4];
+  MonitorElement* rpcHitPhi[12];
+  MonitorElement* rpcHitTheta[12];
+  MonitorElement* rpcChamberPhi[12];
+  MonitorElement* rpcChamberTheta[12];
+
+  MonitorElement* rpcHitTimingInTrack;
 };
 
 #endif
diff --git a/DQM/L1TMonitor/src/L1TStage2EMTF.cc b/DQM/L1TMonitor/src/L1TStage2EMTF.cc
diff --git a/DQM/L1TMonitorClient/data/L1TStage2EMTFQualityTests.xml b/DQM/L1TMonitorClient/data/L1TStage2EMTFQualityTests.xml
@@ -2,24 +2,24 @@
 
   <!-- EMTF Hit Occupancy -->
 
-  <QTEST name="EMTF_HitOccupancyDeadChamber">
+  <QTEST name="EMTF_LCTOccupancyDeadChamber">
     <TYPE>DeadChannel</TYPE>	
     <PARAM name="threshold">0</PARAM>
     <PARAM name="error">0.60</PARAM>
     <PARAM name="warning">0.80</PARAM>
   </QTEST>
 
-  <QTEST name="EMTF_HitOccupancyNoisyChamber">
+  <QTEST name="EMTF_LCTOccupancyNoisyChamber">
     <TYPE>NoisyChannel</TYPE>	
     <PARAM name="tolerance">20</PARAM>
     <PARAM name="neighbours">9</PARAM>
     <PARAM name="error">0.990</PARAM>
     <PARAM name="warning">0.995</PARAM>
   </QTEST>
 
-  <LINK name="*/L1TStage2EMTF/emtfHitOccupancy">
-      <TestName activate="true">EMTF_HitOccupancyDeadChamber</TestName>
-      <TestName activate="true">EMTF_HitOccupancyNoisyChamber</TestName>
+  <LINK name="*/L1TStage2EMTF/cscLCTOccupancy">
+      <TestName activate="true">EMTF_LCTOccupancyDeadChamber</TestName>
+      <TestName activate="true">EMTF_LCTOccupancyNoisyChamber</TestName>
   </LINK>
 
   <!-- EMTF Track BX -->

diff --git a/DQM/L1TMonitorClient/python/L1TStage2EventInfoClient_cfi.py b/DQM/L1TMonitorClient/python/L1TStage2EventInfoClient_cfi.py
@@ -146,13 +146,13 @@
                         SystemDisable  = cms.uint32(0),
                         QualityTests = cms.VPSet(
                             cms.PSet(
-                                QualityTestName = cms.string("EMTF_HitOccupancyDeadChambe"),
-                                QualityTestHist = cms.string("L1T/L1TStage2EMTF/emtfHitOccupancy"),
+                                QualityTestName = cms.string("EMTF_LCTOccupancyDeadChambe"),
+                                QualityTestHist = cms.string("L1T/L1TStage2EMTF/cscLCTOccupancy"),
                                 QualityTestSummaryEnabled = cms.uint32(1)
                                 ),
                             cms.PSet(
-                                QualityTestName = cms.string("EMTF_HitOccupancyNoisyChamber"),
-                                QualityTestHist = cms.string("L1T/L1TStage2EMTF/emtfHitOccupancy"),
+                                QualityTestName = cms.string("EMTF_LCTOccupancyNoisyChamber"),
+                                QualityTestHist = cms.string("L1T/L1TStage2EMTF/cscLCTOccupancy"),
                                 QualityTestSummaryEnabled = cms.uint32(1)
                                 ),
                             cms.PSet(

diff --git a/EventFilter/L1TRawToDigi/plugins/implementations_stage2/EMTFCollections.cc b/EventFilter/L1TRawToDigi/plugins/implementations_stage2/EMTFCollections.cc
@@ -10,8 +10,6 @@ namespace l1t {
       event_.put(std::move(EMTFDaqOuts_));
       event_.put(std::move(EMTFHits_));
       event_.put(std::move(EMTFTracks_));
-      event_.put(std::move(EMTFHit2016s_));
-      event_.put(std::move(EMTFTrack2016s_));
       event_.put(std::move(EMTFLCTs_));
     }
   }

diff --git a/EventFilter/L1TRawToDigi/plugins/implementations_stage2/EMTFCollections.h b/EventFilter/L1TRawToDigi/plugins/implementations_stage2/EMTFCollections.h
@@ -9,8 +9,6 @@
 #include "DataFormats/L1TMuon/interface/EMTFDaqOut.h"
 #include "DataFormats/L1TMuon/interface/EMTFHit.h"
 #include "DataFormats/L1TMuon/interface/EMTFTrack.h"
-#include "DataFormats/L1TMuon/interface/EMTFHit2016.h"
-#include "DataFormats/L1TMuon/interface/EMTFTrack2016.h"
 #include "DataFormats/CSCDigi/interface/CSCCorrelatedLCTDigiCollection.h"
 
 #include "EventFilter/L1TRawToDigi/interface/UnpackerCollections.h"
@@ -25,8 +23,6 @@ namespace l1t {
 	EMTFDaqOuts_(new EMTFDaqOutCollection()),
 	EMTFHits_(new EMTFHitCollection()),
 	EMTFTracks_(new EMTFTrackCollection()),
-	EMTFHit2016s_(new EMTFHit2016Collection()),
-	EMTFTrack2016s_(new EMTFTrack2016Collection()),
 	EMTFLCTs_(new CSCCorrelatedLCTDigiCollection())
 	  {};
 
@@ -37,8 +33,6 @@ namespace l1t {
       inline EMTFDaqOutCollection* getEMTFDaqOuts() { return EMTFDaqOuts_.get(); }
       inline EMTFHitCollection*    getEMTFHits()    { return EMTFHits_.get();    }       
       inline EMTFTrackCollection*  getEMTFTracks()  { return EMTFTracks_.get();  }       
-      inline EMTFHit2016Collection*    getEMTFHit2016s()    { return EMTFHit2016s_.get();    }       
-      inline EMTFTrack2016Collection*  getEMTFTrack2016s()  { return EMTFTrack2016s_.get();  }       
       inline CSCCorrelatedLCTDigiCollection* getEMTFLCTs() { return EMTFLCTs_.get(); }
 
     private:
@@ -47,8 +41,6 @@ namespace l1t {
       std::unique_ptr<EMTFDaqOutCollection>         EMTFDaqOuts_;
       std::unique_ptr<EMTFHitCollection>            EMTFHits_;
       std::unique_ptr<EMTFTrackCollection>          EMTFTracks_;
-      std::unique_ptr<EMTFHit2016Collection>            EMTFHit2016s_;
-      std::unique_ptr<EMTFTrack2016Collection>          EMTFTrack2016s_;
       std::unique_ptr<CSCCorrelatedLCTDigiCollection> EMTFLCTs_;
 
     };

diff --git a/EventFilter/L1TRawToDigi/plugins/implementations_stage2/EMTFSetup.cc b/EventFilter/L1TRawToDigi/plugins/implementations_stage2/EMTFSetup.cc
@@ -47,8 +47,6 @@ namespace l1t {
          prod.produces<EMTFDaqOutCollection>();
          prod.produces<EMTFHitCollection>();
          prod.produces<EMTFTrackCollection>();
-         prod.produces<EMTFHit2016Collection>();
-         prod.produces<EMTFTrack2016Collection>();
          prod.produces<CSCCorrelatedLCTDigiCollection>();
       }
 

diff --git a/EventFilter/L1TRawToDigi/plugins/implementations_stage2/EMTFTokens.cc b/EventFilter/L1TRawToDigi/plugins/implementations_stage2/EMTFTokens.cc
@@ -15,8 +15,6 @@ namespace l1t {
       EMTFDaqOutToken_ = cc.consumes<EMTFDaqOutCollection>(tag);
       EMTFHitToken_ = cc.consumes<EMTFHitCollection>(tag);
       EMTFTrackToken_ = cc.consumes<EMTFTrackCollection>(tag);
-      EMTFHit2016Token_ = cc.consumes<EMTFHit2016Collection>(tag);
-      EMTFTrack2016Token_ = cc.consumes<EMTFTrack2016Collection>(tag);
       EMTFLCTToken_ = cc.consumes<CSCCorrelatedLCTDigiCollection>(tag);   
     }
   }

diff --git a/EventFilter/L1TRawToDigi/plugins/implementations_stage2/EMTFTokens.h b/EventFilter/L1TRawToDigi/plugins/implementations_stage2/EMTFTokens.h
@@ -6,8 +6,6 @@
 #include "DataFormats/L1TMuon/interface/EMTFDaqOut.h"
 #include "DataFormats/L1TMuon/interface/EMTFHit.h"
 #include "DataFormats/L1TMuon/interface/EMTFTrack.h"
-#include "DataFormats/L1TMuon/interface/EMTFHit2016.h"
-#include "DataFormats/L1TMuon/interface/EMTFTrack2016.h"
 #include "DataFormats/CSCDigi/interface/CSCCorrelatedLCTDigiCollection.h"
 
 #include "EventFilter/L1TRawToDigi/interface/PackerTokens.h"
@@ -22,8 +20,6 @@ namespace l1t {
       inline const edm::EDGetTokenT<EMTFDaqOutCollection>& getEMTFDaqOutToken() const { return EMTFDaqOutToken_; }
       inline const edm::EDGetTokenT<EMTFHitCollection>& getEMTFHitToken() const { return EMTFHitToken_; }
       inline const edm::EDGetTokenT<EMTFTrackCollection>& getEMTFTrackToken() const { return EMTFTrackToken_; }
-      inline const edm::EDGetTokenT<EMTFHit2016Collection>& getEMTFHit2016Token() const { return EMTFHit2016Token_; }
-      inline const edm::EDGetTokenT<EMTFTrack2016Collection>& getEMTFTrack2016Token() const { return EMTFTrack2016Token_; }
       inline const edm::EDGetTokenT<CSCCorrelatedLCTDigiCollection>& getEMTFLCTToken() const { return EMTFLCTToken_; }
 
     private:
@@ -32,8 +28,6 @@ namespace l1t {
       edm::EDGetTokenT<EMTFDaqOutCollection> EMTFDaqOutToken_;
       edm::EDGetTokenT<EMTFHitCollection> EMTFHitToken_;
       edm::EDGetTokenT<EMTFTrackCollection> EMTFTrackToken_;
-      edm::EDGetTokenT<EMTFHit2016Collection> EMTFHit2016Token_;
-      edm::EDGetTokenT<EMTFTrack2016Collection> EMTFTrack2016Token_;
       edm::EDGetTokenT<CSCCorrelatedLCTDigiCollection> EMTFLCTToken_;
 
     };