Skip to content

Commit

Permalink
Merge pull request #16910 from cms-sw/revert-16636-DQMOfflineBTVatHLT
Browse files Browse the repository at this point in the history 
Revert "adding DQM Offline histograms for BTV at HLT"
  • Loading branch information
@davidlange6
davidlange6 committed Dec 8, 2016
2 parents 8e4a3cf + e8b6c46 commit fe58472
Show file tree
Hide file tree
Showing 4 changed files with 263 additions and 375 deletions.
48 changes: 12 additions & 36 deletions DQMOffline/Trigger/interface/BTVHLTOfflineSource.h
View file
Expand Up @@ -59,14 +59,11 @@ class BTVHLTOfflineSource : public DQMEDAnalyzer {
std::string processname_;
std::string pathname_;
std::string filtername_;
std::string triggerPathPF_;


std::vector<std::pair<std::string, std::string> > custompathnamepairs_;

edm::InputTag triggerSummaryLabel_;
edm::InputTag triggerResultsLabel_;
edm::InputTag triggerFilterPFbfCSV_;
edm::InputTag triggerFilterPFafCSV_;

edm::EDGetTokenT<reco::JetTagCollection> offlineCSVTokenPF_;
edm::EDGetTokenT<reco::JetTagCollection> offlineCSVTokenCalo_;
Expand Down Expand Up @@ -104,17 +101,10 @@ class BTVHLTOfflineSource : public DQMEDAnalyzer {
public:
void setHistos(
MonitorElement* const CSV, MonitorElement* const Pt, MonitorElement* const Eta,
MonitorElement* const CSV_RECO, MonitorElement* const CSV_HLTMinusRECO, MonitorElement* const CSV_RECOvsHLT,
MonitorElement* const CSVbeforefilter_RECO, MonitorElement* const CSVafterfilter_RECO,
MonitorElement* const CSV_turnon, MonitorElement* const CSVratio_calofilter, MonitorElement* const CSVratio_PFfilter,
MonitorElement* const PVz, MonitorElement* const fastPVz,
MonitorElement* const CSV_RECOvsHLT, MonitorElement* const PVz, MonitorElement* const fastPVz,
MonitorElement* const PVz_HLTMinusRECO, MonitorElement* const fastPVz_HLTMinusRECO
)
{ CSV_ = CSV; Pt_ = Pt; Eta_ = Eta;
CSV_RECO_ = CSV_RECO; ; CSV_HLTMinusRECO_ = CSV_HLTMinusRECO; CSV_RECOvsHLT_ = CSV_RECOvsHLT;
CSVbeforefilter_RECO_ = CSVbeforefilter_RECO; CSVafterfilter_RECO_ = CSVafterfilter_RECO;
CSV_turnon_ = CSV_turnon; CSVratio_calofilter_ = CSVratio_calofilter; CSVratio_PFfilter_ = CSVratio_PFfilter;
PVz_ = PVz; fastPVz_ = fastPVz;
{ CSV_ = CSV; Pt_ = Pt; Eta_ = Eta; CSV_RECOvsHLT_ = CSV_RECOvsHLT; PVz_ = PVz; fastPVz_ = fastPVz;
PVz_HLTMinusRECO_ = PVz_HLTMinusRECO; fastPVz_HLTMinusRECO_ = fastPVz_HLTMinusRECO;
};

Expand All @@ -133,21 +123,14 @@ class BTVHLTOfflineSource : public DQMEDAnalyzer {
objectType_(type),
triggerType_(triggerType){};

MonitorElement * getMEhisto_CSV() { return CSV_; }
MonitorElement * getMEhisto_Pt() { return Pt_; }
MonitorElement * getMEhisto_Eta() { return Eta_; }
MonitorElement * getMEhisto_CSV_RECO() { return CSV_RECO_; }
MonitorElement * getMEhisto_CSV_HLTMinusRECO() { return CSV_HLTMinusRECO_; }
MonitorElement * getMEhisto_CSV_RECOvsHLT() { return CSV_RECOvsHLT_; }
MonitorElement * getMEhisto_CSVbeforefilter_RECO() { return CSVbeforefilter_RECO_; }
MonitorElement * getMEhisto_CSVafterfilter_RECO() { return CSVafterfilter_RECO_; }
MonitorElement * getMEhisto_CSV_turnon() { return CSV_turnon_; }
MonitorElement * getMEhisto_CSVratio_calofilter() { return CSVratio_calofilter_; }
MonitorElement * getMEhisto_CSVratio_PFfilter() { return CSVratio_PFfilter_; }
MonitorElement * getMEhisto_PVz() { return PVz_; }
MonitorElement * getMEhisto_fastPVz() { return fastPVz_; }
MonitorElement * getMEhisto_PVz_HLTMinusRECO() { return PVz_HLTMinusRECO_; }
MonitorElement * getMEhisto_fastPVz_HLTMinusRECO() { return fastPVz_HLTMinusRECO_; }
MonitorElement * getMEhisto_CSV() { return CSV_;}
MonitorElement * getMEhisto_Pt() { return Pt_; }
MonitorElement * getMEhisto_Eta() { return Eta_;}
MonitorElement * getMEhisto_CSV_RECOvsHLT() { return CSV_RECOvsHLT_;}
MonitorElement * getMEhisto_PVz() { return PVz_;}
MonitorElement * getMEhisto_fastPVz() { return fastPVz_;}
MonitorElement * getMEhisto_PVz_HLTMinusRECO() { return PVz_HLTMinusRECO_;}
MonitorElement * getMEhisto_fastPVz_HLTMinusRECO() { return fastPVz_HLTMinusRECO_;}

const std::string getLabel(void ) const {
return filterName_;
Expand Down Expand Up @@ -192,14 +175,7 @@ class BTVHLTOfflineSource : public DQMEDAnalyzer {
MonitorElement* CSV_;
MonitorElement* Pt_;
MonitorElement* Eta_;
MonitorElement* CSV_RECO_;
MonitorElement* CSV_HLTMinusRECO_;
MonitorElement* CSV_RECOvsHLT_;
MonitorElement* CSVbeforefilter_RECO_;
MonitorElement* CSVafterfilter_RECO_;
MonitorElement* CSV_turnon_;
MonitorElement* CSVratio_calofilter_;
MonitorElement* CSVratio_PFfilter_;
MonitorElement* CSV_RECOvsHLT_;
MonitorElement* PVz_;
MonitorElement* fastPVz_;
MonitorElement* PVz_HLTMinusRECO_;
Expand Down
19 changes: 7 additions & 12 deletions DQMOffline/Trigger/python/BTVHLTOfflineSource_cfi.py
View file
Expand Up @@ -7,19 +7,14 @@
processname = cms.string("HLT"),
verbose = cms.untracked.bool(False),
#
triggerSummaryLabel = cms.InputTag("hltTriggerSummaryAOD", "", "HLT"),
triggerResultsLabel = cms.InputTag("TriggerResults", "", "HLT"),
triggerPathPF = cms.string('HLT_QuadPFJet_BTagCSV_p016_VBF_Mqq460_v5'),
triggerFilterPFbfCSV = cms.InputTag('hltBTagCaloCSVp022Single', '', 'HLT'),
#triggerFilterPFbfCSV = cms.InputTag('hltSelector6PFJets', '', 'HLT'),
triggerFilterPFafCSV = cms.InputTag('hltBTagPFCSVp016SingleWithMatching', '', 'HLT'),

offlineCSVLabelPF = cms.InputTag("pfCombinedInclusiveSecondaryVertexV2BJetTags"),
triggerSummaryLabel = cms.InputTag("hltTriggerSummaryAOD","","HLT"),
triggerResultsLabel = cms.InputTag("TriggerResults","","HLT"),
offlineCSVLabelPF = cms.InputTag("pfCombinedInclusiveSecondaryVertexV2BJetTags"),
offlineCSVLabelCalo = cms.InputTag("pfCombinedInclusiveSecondaryVertexV2BJetTags"),
hltFastPVLabel = cms.InputTag("hltFastPrimaryVertex"),
hltPFPVLabel = cms.InputTag("hltVerticesPFSelector"),
hltCaloPVLabel = cms.InputTag("hltVerticesL3"),
offlinePVLabel = cms.InputTag("offlinePrimaryVertices"),
hltFastPVLabel = cms.InputTag("hltFastPrimaryVertex"),
hltPFPVLabel = cms.InputTag("hltVerticesPFSelector"),
hltCaloPVLabel = cms.InputTag("hltVerticesL3"),
offlinePVLabel = cms.InputTag("offlinePrimaryVertices"),

#
pathPairs = cms.VPSet(
Expand Down

0 comments on commit fe58472

Please sign in to comment.