Skip to content

Commit f144c44

Browse files
committed
test finished
1 parent c39aeee commit f144c44

File tree

2 files changed

+19
-14
lines changed

2 files changed

+19
-14
lines changed

DQMOffline/MuonDPG/plugins/GEMTnPEfficiencyTask.cc

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
#include "DataFormats/GEMDigi/interface/GEMVFATStatusCollection.h"
1818
#include "DataFormats/GEMDigi/interface/GEMOHStatusCollection.h"
19-
//#include "DataFormats/GEMDigi/interface/GEMAMCStatusCollection.h"
19+
#include "DataFormats/GEMDigi/interface/GEMAMCStatusCollection.h"
2020

2121
class GEMTnPEfficiencyTask : public BaseTnPEfficiencyTask {
2222
public:
@@ -29,17 +29,10 @@ class GEMTnPEfficiencyTask : public BaseTnPEfficiencyTask {
2929
/// Destructor
3030
~GEMTnPEfficiencyTask() override;
3131

32-
const bool m_MaskChamberWithError_ = true;
33-
34-
edm::EDGetTokenT<GEMOHStatusCollection> m_GEMOHStatusCollectionToken_ =
35-
consumes<GEMOHStatusCollection>(edm::InputTag("muonGEMDigis", "OHStatus"));
36-
37-
//const edm::EDGetTokenT<GEMVFATStatusCollection> m_GEMVFATStatusCollectionToken_;
38-
//const edm::EDGetTokenT<GEMAMCStatusCollection> m_GEMAMCStatusCollectionToken_;
39-
//maskChamberWithError=cms.untracked.bool(True),
40-
// ohStatusTag=cms.untracked.InputTag("muonGEMDigis", "OHStatus"),
41-
// vfatStatusTag=cms.untracked.InputTag("muonGEMDigis","VFATStatus"),
42-
// amcStatusTag=cms.untracked.InputTag("muonGEMDigis","AMCStatus"),
32+
const bool m_maskChamberWithError_;
33+
const edm::EDGetTokenT<GEMOHStatusCollection> m_GEMOHStatusCollectionToken_;
34+
const edm::EDGetTokenT<GEMVFATStatusCollection> m_GEMVFATStatusCollectionToken_;
35+
const edm::EDGetTokenT<GEMAMCStatusCollection> m_GEMAMCStatusCollectionToken_;
4336

4437
protected:
4538
std::string topFolder() const override;
@@ -50,7 +43,15 @@ class GEMTnPEfficiencyTask : public BaseTnPEfficiencyTask {
5043
void analyze(const edm::Event& event, const edm::EventSetup& context) override;
5144
};
5245

53-
GEMTnPEfficiencyTask::GEMTnPEfficiencyTask(const edm::ParameterSet& config) : BaseTnPEfficiencyTask(config) {
46+
GEMTnPEfficiencyTask::GEMTnPEfficiencyTask(const edm::ParameterSet& config)
47+
: BaseTnPEfficiencyTask(config),
48+
m_maskChamberWithError_((config.getUntrackedParameter<bool>("maskChamberWithError"))),
49+
m_GEMOHStatusCollectionToken_(
50+
consumes<GEMOHStatusCollection>(config.getUntrackedParameter<edm::InputTag>("ohStatusTag"))),
51+
m_GEMVFATStatusCollectionToken_(
52+
consumes<GEMVFATStatusCollection>(config.getUntrackedParameter<edm::InputTag>("vfatStatusTag"))),
53+
m_GEMAMCStatusCollectionToken_(
54+
consumes<GEMAMCStatusCollection>(config.getUntrackedParameter<edm::InputTag>("amcStatusTag"))) {
5455
LogTrace("DQMOffline|MuonDPG|GEMTnPEfficiencyTask") << "[GEMTnPEfficiencyTask]: Constructor" << std::endl;
5556
}
5657

@@ -1321,7 +1322,7 @@ void GEMTnPEfficiencyTask::analyze(const edm::Event& event, const edm::EventSetu
13211322
GEMVFATStatusCollection vfat_status;
13221323
edm::Handle<GEMOHStatusCollection> oh_status_collection;
13231324
edm::Handle<GEMVFATStatusCollection> vfat_status_collection;
1324-
if (m_MaskChamberWithError_) {
1325+
if (m_maskChamberWithError_) {
13251326
event.getByToken(m_GEMOHStatusCollectionToken_, oh_status_collection);
13261327
//if (oh_status_collem_tion.isValid()) {
13271328
oh_status = *oh_status_collection;

DQMOffline/MuonDPG/python/gemTnPEfficiencyTask_cfi.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,10 @@
1616
# CutBasedIdMedium = 1UL << 1
1717
# CutBasedIdMediumPrompt = 1UL << 2
1818
# CutBasedIdTight = 1UL << 3
19+
maskChamberWithError=cms.untracked.bool(True),
20+
ohStatusTag=cms.untracked.InputTag("muonGEMDigis", "OHStatus"),
21+
vfatStatusTag=cms.untracked.InputTag("muonGEMDigis","VFATStatus"),
22+
amcStatusTag=cms.untracked.InputTag("muonGEMDigis","AMCStatus"),
1923
tagCut = cms.untracked.string('(selectors & 8) && ((isolationR03.sumPt)/(pt) < 0.05) && pt>24.'),
2024
borderCut = cms.untracked.double(-2.),
2125
lowPairMassCut = cms.untracked.double (80.),

0 commit comments

Comments
 (0)