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

Migrate rest of SiStripMonitorDigi to EventSetup consumes #31764

Merged
merged 1 commit into from
Oct 13, 2020
Merged

Migrate rest of SiStripMonitorDigi to EventSetup consumes #31764

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion DQM/SiStripMonitorDigi/interface/SiStripMonitorDigi.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
// Original Author: dkcira
// Created: Sat Feb 4 20:49:51 CET 2006
#include <memory>
#include "CondFormats/RunInfo/interface/RunInfo.h"
#include "FWCore/Utilities/interface/EDGetToken.h"
#include "FWCore/Framework/interface/Frameworkfwd.h"
#include "FWCore/Framework/interface/LuminosityBlock.h"
Expand Down Expand Up @@ -146,7 +147,7 @@ class SiStripMonitorDigi : public DQMOneEDAnalyzer<edm::LuminosityBlockCache<boo
std::vector<const edm::DetSetVector<SiStripDigi>*> digi_detset_handles;

unsigned long long m_cacheID_;
edm::ESHandle<SiStripDetCabling> SiStripDetCabling_;
const SiStripDetCabling* SiStripDetCabling_;
std::vector<uint32_t> ModulesToBeExcluded_;

//Global MEs to monitor APV Shots properties
Expand Down Expand Up @@ -227,6 +228,11 @@ class SiStripMonitorDigi : public DQMOneEDAnalyzer<edm::LuminosityBlockCache<boo
edm::EDGetTokenT<EventWithHistory> historyProducerToken_;
edm::EDGetTokenT<APVCyclePhaseCollection> apvPhaseProducerToken_;
edm::EDGetTokenT<L1GlobalTriggerEvmReadoutRecord> gtEvmToken_;
edm::ESGetToken<TrackerTopology, TrackerTopologyRcd> tTopoTokenRun_;
edm::ESGetToken<TkDetMap, TrackerTopologyRcd> tkDetMapTokenRun_;
edm::ESGetToken<SiStripDetCabling, SiStripDetCablingRcd> SiStripDetCablingTokenRun_;
edm::ESGetToken<RunInfo, RunInfoRcd> runInfoTokenRun_;
edm::ESGetToken<TrackerTopology, TrackerTopologyRcd> tTopoToken_;

SiStripDCSStatus* dcsStatus_;
};
Expand Down
30 changes: 15 additions & 15 deletions DQM/SiStripMonitorDigi/src/SiStripMonitorDigi.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@
#include "DataFormats/L1GlobalTrigger/interface/L1GlobalTriggerEvmReadoutRecord.h"
#include "DataFormats/L1GlobalTrigger/interface/L1GtFdlWord.h"
#include "DataFormats/L1GlobalTrigger/interface/L1GlobalTriggerReadoutRecord.h"
#include "CondFormats/RunInfo/interface/RunInfo.h"
#include "Geometry/Records/interface/TrackerTopologyRcd.h"

/* mia: but is there not a smarter way ?!?!?! */
Expand Down Expand Up @@ -178,6 +177,16 @@ SiStripMonitorDigi::SiStripMonitorDigi(const edm::ParameterSet& iConfig)

gtEvmToken_ = consumes<L1GlobalTriggerEvmReadoutRecord>(edm::InputTag("gtEvmDigis"));

if (show_mechanical_structure_view) {
tTopoTokenRun_ = esConsumes<edm::Transition::BeginRun>();
tkDetMapTokenRun_ = esConsumes<edm::Transition::BeginRun>();
SiStripDetCablingTokenRun_ = esConsumes<edm::Transition::BeginRun>();
}
if (subdetswitchtotdigifailureon) {
runInfoTokenRun_ = esConsumes<edm::Transition::BeginRun>();
}
tTopoToken_ = esConsumes();

// Create DCS Status
bool checkDCS = conf_.getParameter<bool>("UseDCSFiltering");
if (checkDCS)
Expand Down Expand Up @@ -225,8 +234,6 @@ void SiStripMonitorDigi::dqmBeginRun(const edm::Run& run, const edm::EventSetup&
if (m_cacheID_ != cacheID) {
m_cacheID_ = cacheID;
}
edm::ESHandle<SiStripDetCabling> detCabling_;
es.get<SiStripDetCablingRcd>().get(detCabling_);

//nFEDConnected = 0;
nFedTIB = 0;
Expand All @@ -240,8 +247,7 @@ void SiStripMonitorDigi::dqmBeginRun(const edm::Run& run, const edm::EventSetup&
//const int siStripFedIdMax = FEDNumbering::MAXSiStripFEDID;

if (auto runInfoRec = es.tryToGet<RunInfoRcd>()) {
edm::ESHandle<RunInfo> sumFED;
runInfoRec->get(sumFED);
edm::ESHandle<RunInfo> sumFED = runInfoRec->getHandle(runInfoTokenRun_);

if (sumFED.isValid()) {
std::vector<int> FedsInIds = sumFED->m_fed_in;
Expand Down Expand Up @@ -312,15 +318,11 @@ void SiStripMonitorDigi::globalEndLuminosityBlock(const edm::LuminosityBlock& lb
void SiStripMonitorDigi::createMEs(DQMStore::IBooker& ibooker, const edm::EventSetup& es) {
if (show_mechanical_structure_view) {
//Retrieve tracker topology from geometry
edm::ESHandle<TrackerTopology> tTopoHandle;
es.get<TrackerTopologyRcd>().get(tTopoHandle);
const TrackerTopology* const tTopo = tTopoHandle.product();
edm::ESHandle<TkDetMap> tkDetMapHandle;
es.get<TrackerTopologyRcd>().get(tkDetMapHandle);
const TkDetMap* tkDetMap = tkDetMapHandle.product();
const TrackerTopology* const tTopo = &es.getData(tTopoTokenRun_);
const TkDetMap* tkDetMap = &es.getData(tkDetMapTokenRun_);

// take from eventSetup the SiStripDetCabling object - here will use SiStripDetControl later on
es.get<SiStripDetCablingRcd>().get(SiStripDetCabling_);
SiStripDetCabling_ = &es.getData(SiStripDetCablingTokenRun_);

// get list of active detectors from SiStripDetCabling
std::vector<uint32_t> activeDets;
Expand Down Expand Up @@ -576,9 +578,7 @@ void SiStripMonitorDigi::analyze(const edm::Event& iEvent, const edm::EventSetup
return;

//Retrieve tracker topology from geometry
edm::ESHandle<TrackerTopology> tTopoHandle;
iSetup.get<TrackerTopologyRcd>().get(tTopoHandle);
const TrackerTopology* const tTopo = tTopoHandle.product();
const TrackerTopology* const tTopo = &iSetup.getData(tTopoToken_);

TotalNShots = 0;

Expand Down