Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

EMTF 2017 PR #5 - DQM #20006

Merged
merged 6 commits into from Aug 17, 2017
Merged

EMTF 2017 PR #5 - DQM #20006

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f80d2bf
EMTF DQM with RPC hit and MPC link monitoring
abrinke1 Aug 1, 2017
d3cb819
EMTF fix small bug in DQM code
abrinke1 Aug 1, 2017
deca10a
EMTF DQM small fix to RPC timing plot
abrinke1 Aug 2, 2017
d16e3a4
EMTF DQM address David Lange comments
abrinke1 Aug 11, 2017
03d914d
Merged EMTF_PR_2017_93X_part5 from repository abrinke1
abrinke1 Aug 14, 2017
d0d882c
EMTF DQM fix map access location
abrinke1 Aug 17, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
37 changes: 27 additions & 10 deletions DQM/L1TMonitor/interface/L1TStage2EMTF.h
View file
Open in desktop
Expand Up @@ -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"


Expand All @@ -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;
Expand All @@ -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
629 changes: 464 additions & 165 deletions DQM/L1TMonitor/src/L1TStage2EMTF.cc
View file
Open in desktop

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions DQM/L1TMonitorClient/data/L1TStage2EMTFQualityTests.xml
View file
Open in desktop
Expand Up @@ -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.996</PARAM>
<PARAM name="warning">0.999</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 -->
Expand Down
8 changes: 4 additions & 4 deletions DQM/L1TMonitorClient/python/L1TStage2EventInfoClient_cfi.py
View file
Open in desktop
Expand Up @@ -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(
Expand Down
2 changes: 0 additions & 2 deletions EventFilter/L1TRawToDigi/plugins/implementations_stage2/EMTFCollections.cc
View file
Open in desktop
Expand Up @@ -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_));
}
}
Expand Down
8 changes: 0 additions & 8 deletions EventFilter/L1TRawToDigi/plugins/implementations_stage2/EMTFCollections.h
View file
Open in desktop
Expand Up @@ -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"
Expand All @@ -25,8 +23,6 @@ namespace l1t {
EMTFDaqOuts_(new EMTFDaqOutCollection()),
EMTFHits_(new EMTFHitCollection()),
EMTFTracks_(new EMTFTrackCollection()),
EMTFHit2016s_(new EMTFHit2016Collection()),
EMTFTrack2016s_(new EMTFTrack2016Collection()),
EMTFLCTs_(new CSCCorrelatedLCTDigiCollection())
{};

Expand All @@ -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:
Expand All @@ -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_;

};
Expand Down
2 changes: 0 additions & 2 deletions EventFilter/L1TRawToDigi/plugins/implementations_stage2/EMTFSetup.cc
View file
Open in desktop
Expand Up @@ -47,8 +47,6 @@ namespace l1t {
prod.produces<EMTFDaqOutCollection>();
prod.produces<EMTFHitCollection>();
prod.produces<EMTFTrackCollection>();
prod.produces<EMTFHit2016Collection>();
prod.produces<EMTFTrack2016Collection>();
prod.produces<CSCCorrelatedLCTDigiCollection>();
}

Expand Down
2 changes: 0 additions & 2 deletions EventFilter/L1TRawToDigi/plugins/implementations_stage2/EMTFTokens.cc
View file
Open in desktop
Expand Up @@ -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);
}
}
Expand Down
6 changes: 0 additions & 6 deletions EventFilter/L1TRawToDigi/plugins/implementations_stage2/EMTFTokens.h
View file
Open in desktop
Expand Up @@ -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"
Expand All @@ -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:
Expand All @@ -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_;

};
Expand Down