From d077d9a2e1743927ade1e9bcf0c4c347860e68a5 Mon Sep 17 00:00:00 2001 From: Fabrizio Date: Tue, 16 May 2023 19:32:58 +0200 Subject: [PATCH] fixes for 2016 data and mc --- DQM/CTPPS/plugins/CTPPSPixelDQMSource.cc | 6 ++---- DQM/CTPPS/python/ctppsDQM_cff.py | 6 ++++++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/DQM/CTPPS/plugins/CTPPSPixelDQMSource.cc b/DQM/CTPPS/plugins/CTPPSPixelDQMSource.cc index 9a5ae4dadf821..99ca49e4acf39 100644 --- a/DQM/CTPPS/plugins/CTPPSPixelDQMSource.cc +++ b/DQM/CTPPS/plugins/CTPPSPixelDQMSource.cc @@ -7,7 +7,6 @@ * *******************************************/ -#include "FWCore/Framework/interface/ESHandle.h" #include "FWCore/Framework/interface/Event.h" #include "FWCore/Framework/interface/EventSetup.h" #include "FWCore/Framework/interface/MakerMacros.h" @@ -532,7 +531,7 @@ void CTPPSPixelDQMSource::bookHistograms(DQMStore::IBooker &ibooker, edm::Run co 0., double(NplaneMAX * NROCsMAX), 0., - rpixValues::ROCSizeInX *rpixValues::ROCSizeInY, + rpixValues::ROCSizeInX * rpixValues::ROCSizeInY, ""); hp2HitsMultROC_LS[indexP]->getTProfile2D()->SetOption("colz"); hp2HitsMultROC_LS[indexP]->getTProfile2D()->SetMinimum(1.0e-10); @@ -697,8 +696,7 @@ void CTPPSPixelDQMSource::analyze(edm::Event const &event, edm::EventSetup const Handle hltResults; event.getByToken(tokenTrigResults, hltResults); - ESHandle mapping; - mapping = eventSetup.getHandle(tokenPixelDAQMapping); + const CTPPSPixelDAQMapping *mapping = &eventSetup.getData(tokenPixelDAQMapping); if (onlinePlots) { hBX->Fill(event.bunchCrossing()); diff --git a/DQM/CTPPS/python/ctppsDQM_cff.py b/DQM/CTPPS/python/ctppsDQM_cff.py index 413038a3156b7..e1a7cce5f6063 100644 --- a/DQM/CTPPS/python/ctppsDQM_cff.py +++ b/DQM/CTPPS/python/ctppsDQM_cff.py @@ -91,6 +91,12 @@ ) +from Configuration.Eras.Modifier_ctpps_2016_cff import ctpps_2016 +ctpps_2016.toReplaceWith( + _ctppsDQMOfflineSource, + cms.Sequence( + ) +) # the actually used sequences must be empty for pre-PPS data from Configuration.Eras.Modifier_ctpps_cff import ctpps