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

Migration of pixel code to esConsumes #32093

Merged
merged 47 commits into from
Dec 3, 2020
Merged

Migration of pixel code to esConsumes #32093

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
0a0751c
migration to esConsumes in Validation/SiPixelPhase1HitsV
ferencek Nov 3, 2020
e782ea5
migration to esConsumes in Validation/SiPixelPhase1TrackClustersV
ferencek Nov 3, 2020
04f8bc3
unused code cleanup in Validation/SiPixelPhase1HitsV
ferencek Nov 3, 2020
4f1cbdf
migration to esConsumes in SimTracker/SiPixelDigitizer/test
ferencek Nov 3, 2020
9c663fb
semi-random header file cleanup
ferencek Nov 3, 2020
9c1895c
migration to esConsumes in DQM/SiPixelMonitorClient
ferencek Nov 10, 2020
bad6798
migration to esConsumes in DQM/SiPixelMonitorCluster
ferencek Nov 10, 2020
226be17
additional esConsumes updates in DQM/SiPixelMonitorCluster
ferencek Nov 11, 2020
89f2c85
preserve old behavior where edm::EventSetup::tryToGet() is used
ferencek Nov 11, 2020
6c41889
switched from ESHandle to the actual product as data member to avoid …
ferencek Nov 11, 2020
0ad199b
migration to esConsumes in DQM/SiPixelMonitorDigi
ferencek Nov 12, 2020
638e721
migration to esConsumes in DQM/SiPixelMonitorRawData
ferencek Nov 12, 2020
090b248
migration to esConsumes in DQM/SiPixelMonitorRecHit
ferencek Nov 12, 2020
41d416d
simplifying code, adding comment about intentional copy
ferencek Nov 12, 2020
6441e9c
migration to esConsumes in DQM/SiPixelPhase1Common
ferencek Nov 12, 2020
e3fc1a7
migration to esConsumes in DQM/SiPixelMonitorTrack
ferencek Nov 13, 2020
e7fe132
migration to esConsumes in DQM/SiPixelPhase1Track
ferencek Nov 13, 2020
93ccef4
code format updates in DQM/SiPixelMonitorClient
ferencek Nov 16, 2020
a97fe8d
code format updates in DQM/SiPixelMonitorCluster
ferencek Nov 16, 2020
4c019ae
code format updates in DQM/SiPixelMonitorDigi
ferencek Nov 16, 2020
a73ab1f
code format updates in DQM/SiPixelMonitorRecHit
ferencek Nov 16, 2020
57ff993
code format updates in DQM/SiPixelMonitorTrack
ferencek Nov 16, 2020
728164c
code format updates in DQM/SiPixelPhase1Common
ferencek Nov 16, 2020
36798b0
code format updates in DQM/SiPixelPhase1Track
ferencek Nov 16, 2020
91c264f
code format updates in Validation/SiPixelPhase1TrackClustersV
ferencek Nov 16, 2020
f1ef1b3
esConsumes update in DQM/SiPixelMonitorDigi (removing consumes regist…
ferencek Nov 23, 2020
13ea7f7
esConsumes update in DQM/SiPixelMonitorCluster (removing consumes reg…
ferencek Nov 23, 2020
9d2ce2f
esConsumes update in DQM/SiPixelMonitorRecHit (removing consumes regi…
ferencek Nov 23, 2020
a7d8853
esConsumes update in DQM/SiPixelMonitorTrack (removing consumes regis…
ferencek Nov 23, 2020
6800360
migration to esConsumes in CalibTracker/SiPixelConnectivity
ferencek Nov 23, 2020
ba89446
migration to esConsumes in CalibTracker/SiPixelErrorEstimation
ferencek Nov 23, 2020
c991e95
migration to esConsumes in CalibTracker/SiPixelESProducers
ferencek Nov 24, 2020
ab285fe
migration to esConsumes in CalibTracker/SiPixelLorentzAngle
ferencek Nov 24, 2020
a53d431
code format updates in DQM/SiPixelMonitorTrack
ferencek Nov 24, 2020
0a8eca1
code format updates in DQM/SiPixelMonitorRecHit
ferencek Nov 24, 2020
0dd07a3
code format updates in DQM/SiPixelMonitorDigi
ferencek Nov 24, 2020
5fa9e75
code format updates in DQM/SiPixelMonitorCluster
ferencek Nov 24, 2020
b17511b
code format updates in CalibTracker/SiPixelLorentzAngle
ferencek Nov 24, 2020
b409f0b
code format updates in CalibTracker/SiPixelESProducers
ferencek Nov 24, 2020
74a1a86
migration to esConsumes in CalibTracker/SiPixelGainCalibration
ferencek Nov 24, 2020
d5112ee
migration to esConsumes in CalibTracker/SiPixelTools
ferencek Nov 24, 2020
e9320a3
code format updates in CalibTracker/SiPixelTools
ferencek Nov 24, 2020
a424cfd
migration to esConsumes in SiPixelClusterProducer
ferencek Nov 24, 2020
2640878
migration to esConsumes in RecoLocalTracker/SiPixelClusterizer/test
ferencek Nov 24, 2020
2c88809
full migration to consumes in RecoLocalTracker/SiPixelClusterizer/test
ferencek Nov 24, 2020
48adff9
code format updates in RecoLocalTracker/SiPixelClusterizer/test
ferencek Nov 24, 2020
7b3711f
added missing include after updates to SiPixelOfflineCalibAnalysisBase.h
ferencek Nov 24, 2020
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
5 changes: 0 additions & 5 deletions DQM/SiPixelMonitorClient/interface/SiPixelActionExecutor.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,6 @@
#include "DQM/SiPixelMonitorClient/interface/SiPixelConfigParser.h"
#include "DQM/SiPixelMonitorClient/interface/SiPixelConfigWriter.h"
#include "DQMServices/Core/interface/DQMStore.h"
#include "FWCore/Framework/interface/ESHandle.h"
#include "FWCore/Framework/interface/Event.h"
#include "FWCore/Framework/interface/EventSetup.h"
#include "FWCore/ParameterSet/interface/ParameterSet.h"
#include <fstream>
#include <map>
#include <string>
Expand Down Expand Up @@ -112,7 +108,6 @@ class SiPixelActionExecutor {

SiPixelConfigParser *configParser_;
SiPixelConfigWriter *configWriter_;
edm::ESHandle<SiPixelFedCablingMap> theCablingMap;

std::vector<std::string> summaryMENames;
std::vector<std::string> tkMapMENames;
Expand Down
14 changes: 1 addition & 13 deletions DQM/SiPixelMonitorClient/interface/SiPixelCertification.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,8 @@
#include <iostream>
#include <memory>

// FWCore
#include "DQMServices/Core/interface/DQMEDHarvester.h"
#include "FWCore/Framework/interface/EDAnalyzer.h"
#include "FWCore/Framework/interface/ESHandle.h"
#include "FWCore/Framework/interface/Event.h"
#include "FWCore/Framework/interface/EventSetup.h"
#include "FWCore/Framework/interface/Frameworkfwd.h"
#include "FWCore/Framework/interface/LuminosityBlock.h"
#include "FWCore/Framework/interface/MakerMacros.h"
#include "FWCore/ParameterSet/interface/ParameterSet.h"
#include "FWCore/ServiceRegistry/interface/Service.h"

// DQM
#include "DQMServices/Core/interface/DQMStore.h"
#include "DQMServices/Core/interface/DQMEDHarvester.h"

class SiPixelCertification : public DQMEDHarvester {
public:
Expand Down
17 changes: 4 additions & 13 deletions DQM/SiPixelMonitorClient/interface/SiPixelDaqInfo.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,21 +6,11 @@
#include <iostream>
#include <memory>

// FWCore
#include "DQMServices/Core/interface/DQMEDHarvester.h"
#include "FWCore/Framework/interface/EDAnalyzer.h"
#include "FWCore/Framework/interface/ESHandle.h"
#include "FWCore/Framework/interface/Event.h"
#include "FWCore/Framework/interface/EventSetup.h"
#include "FWCore/Framework/interface/Frameworkfwd.h"
#include "FWCore/Framework/interface/LuminosityBlock.h"
#include "FWCore/Framework/interface/MakerMacros.h"
#include "FWCore/ParameterSet/interface/ParameterSet.h"
#include "FWCore/ServiceRegistry/interface/Service.h"

// DQM
#include "DQMServices/Core/interface/DQMStore.h"
#include "DQMServices/Core/interface/DQMEDHarvester.h"

#include "CondFormats/DataRecord/interface/RunSummaryRcd.h"
#include "CondFormats/RunInfo/interface/RunInfo.h"
#include "DataFormats/FEDRawData/interface/FEDRawDataCollection.h"

class SiPixelDaqInfo : public DQMEDHarvester {
Expand Down Expand Up @@ -53,6 +43,7 @@ class SiPixelDaqInfo : public DQMEDHarvester {

// define Token(-s)
edm::EDGetTokenT<FEDRawDataCollection> daqSourceToken_;
edm::ESGetToken<RunInfo, RunInfoRcd> runInfoToken_;
};

#endif
6 changes: 0 additions & 6 deletions DQM/SiPixelMonitorClient/interface/SiPixelDataQuality.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,6 @@
#include "DQM/SiPixelMonitorClient/interface/SiPixelLayoutParser.h"
#include "DQMServices/Core/interface/DQMStore.h"

#include "FWCore/Framework/interface/ESHandle.h"
#include "FWCore/Framework/interface/Event.h"
#include "FWCore/Framework/interface/EventSetup.h"
#include "FWCore/ParameterSet/interface/ParameterSet.h"

#include "CondFormats/DataRecord/interface/SiPixelFedCablingMapRcd.h"
#include "CondFormats/SiPixelObjects/interface/DetectorIndex.h"
#include "CondFormats/SiPixelObjects/interface/SiPixelFedCablingMap.h"
Expand Down Expand Up @@ -82,7 +77,6 @@ class SiPixelDataQuality {
std::ofstream myfile_;
int nevents_;
bool endOfModules_;
edm::ESHandle<SiPixelFedCablingMap> theCablingMap;

// Final combined Data Quality Flags:
MonitorElement *SummaryReportMap;
Expand Down
12 changes: 0 additions & 12 deletions DQM/SiPixelMonitorClient/interface/SiPixelDcsInfo.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,8 @@
#include <iostream>
#include <memory>

// FWCore
#include "FWCore/Framework/interface/EDAnalyzer.h"
#include "FWCore/Framework/interface/ESHandle.h"
#include "FWCore/Framework/interface/Event.h"
#include "FWCore/Framework/interface/EventSetup.h"
#include "FWCore/Framework/interface/Frameworkfwd.h"
#include "FWCore/Framework/interface/LuminosityBlock.h"
#include "FWCore/Framework/interface/MakerMacros.h"
#include "FWCore/ParameterSet/interface/ParameterSet.h"
#include "FWCore/ServiceRegistry/interface/Service.h"

// DQM
#include "DQMServices/Core/interface/DQMEDHarvester.h"
#include "DQMServices/Core/interface/DQMStore.h"

class SiPixelDcsInfo : public DQMEDHarvester {
public:
Expand Down
2 changes: 2 additions & 0 deletions DQM/SiPixelMonitorClient/interface/SiPixelEDAClient.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,8 @@ class SiPixelEDAClient : public DQMEDHarvester {

edm::EDGetTokenT<FEDRawDataCollection> inputSourceToken_;
edm::ESHandle<SiPixelFedCablingMap> theCablingMap;

edm::ESGetToken<SiPixelFedCablingMap, SiPixelFedCablingMapRcd> cablingMapToken_;
};

#endif
5 changes: 0 additions & 5 deletions DQM/SiPixelMonitorClient/interface/SiPixelInformationExtractor.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,6 @@
#include "DQM/SiPixelMonitorClient/interface/SiPixelConfigWriter.h"
#include "DQM/SiPixelMonitorClient/interface/SiPixelLayoutParser.h"

#include "FWCore/Framework/interface/ESHandle.h"
#include "FWCore/Framework/interface/Event.h"
#include "FWCore/Framework/interface/EventSetup.h"
#include "FWCore/ParameterSet/interface/ParameterSet.h"

#include "CondFormats/DataRecord/interface/SiPixelFedCablingMapRcd.h"
#include "CondFormats/SiPixelObjects/interface/DetectorIndex.h"
#include "CondFormats/SiPixelObjects/interface/SiPixelFedCablingMap.h"
Expand Down
9 changes: 3 additions & 6 deletions DQM/SiPixelMonitorClient/src/SiPixelDaqInfo.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
#include "CondFormats/DataRecord/interface/RunSummaryRcd.h"
#include "CondFormats/RunInfo/interface/RunInfo.h"
#include "CondFormats/RunInfo/interface/RunSummary.h"

#include "DQM/SiPixelMonitorClient/interface/SiPixelDaqInfo.h"
#include "DataFormats/FEDRawData/interface/FEDNumbering.h"
#include "DataFormats/FEDRawData/interface/FEDRawData.h"
Expand All @@ -23,6 +21,7 @@ SiPixelDaqInfo::SiPixelDaqInfo(const edm::ParameterSet &ps) {

// set Token(-s)
daqSourceToken_ = consumes<FEDRawDataCollection>(ps.getUntrackedParameter<string>("daqSource", "source"));
runInfoToken_ = esConsumes<RunInfo, RunInfoRcd, edm::Transition::EndLuminosityBlock>();
}

SiPixelDaqInfo::~SiPixelDaqInfo() {}
Expand All @@ -42,10 +41,8 @@ void SiPixelDaqInfo::dqmEndLuminosityBlock(DQMStore::IBooker &iBooker,
firstLumi = false;
}

if (auto runInfoRec = iSetup.tryToGet<RunInfoRcd>()) {
if ( edm::ESHandle<RunInfo> sumFED = iSetup.getHandle(runInfoToken_) ) {
ferencek marked this conversation as resolved.
Show resolved Hide resolved
// get fed summary information
ESHandle<RunInfo> sumFED;
runInfoRec->get(sumFED);
vector<int> FedsInIds = sumFED->m_fed_in;

int FedCount = 0;
Expand Down
3 changes: 2 additions & 1 deletion DQM/SiPixelMonitorClient/src/SiPixelEDAClient.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ SiPixelEDAClient::SiPixelEDAClient(const edm::ParameterSet &ps) {
sipixelDataQuality_ = new SiPixelDataQuality(offlineXMLfile_);

inputSourceToken_ = consumes<FEDRawDataCollection>(ps.getUntrackedParameter<string>("inputSource", "source"));
cablingMapToken_ = esConsumes<SiPixelFedCablingMap, SiPixelFedCablingMapRcd, edm::Transition::EndLuminosityBlock>();
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@makortel, here the token is defined with the EndLuminosityBlock transition because the event setup is accessed in SiPixelEDAClient::dqmEndLuminosityBlock(...). However, the edm::ESHandle assigned in the SiPixelEDAClient::dqmEndLuminosityBlock(...) is later also used in SiPixelEDAClient::dqmEndJob(...). I am not sure if this could have any unwanted implications.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unfortunately use of EventSetup products at endJob() (or at endProcessBlockProduce() to which dqmEndJob() translates now) is not allowed (framework may clean up the object before reaching that point).

Best option would be to move all computations using SiPixelFedCablingMap to dqmEndLuminosityBlock(). If that is not possible (or feasible), I believe the best workaround would be to copy the SiPixelFedCablingMap (or necessary parts of it if the full object is no not needed) from dqmEndLuminosityBlock() to dqmEndJob().

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Here is my attempt at implementing a workaround 6c41889

// cout<<"...leaving SiPixelEDAClient::SiPixelEDAClient. "<<endl;
}

Expand Down Expand Up @@ -202,7 +203,7 @@ void SiPixelEDAClient::dqmEndLuminosityBlock(DQMStore::IBooker &iBooker,
nFEDs_ += mefed->getBinContent(i + 1);
}
}
eSetup.get<SiPixelFedCablingMapRcd>().get(theCablingMap);
theCablingMap = eSetup.getHandle(cablingMapToken_);

firstLumi = false;
}
Expand Down
10 changes: 0 additions & 10 deletions DQM/SiPixelMonitorCluster/interface/SiPixelClusterModule.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,19 +22,9 @@
#include "DQMServices/Core/interface/DQMStore.h"
#include "DataFormats/Common/interface/DetSetVectorNew.h"
#include "DataFormats/SiPixelCluster/interface/SiPixelCluster.h"
#include "FWCore/ParameterSet/interface/ParameterSet.h"

#include "DataFormats/TrackerCommon/interface/TrackerTopology.h"
#include "FWCore/Framework/interface/ESHandle.h"
#include "Geometry/CommonDetUnit/interface/GeomDet.h"
#include "Geometry/CommonDetUnit/interface/GeomDetType.h"
#include "Geometry/CommonDetUnit/interface/GluedGeomDet.h"
#include "Geometry/CommonTopologies/interface/PixelTopology.h"
#include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
#include "Geometry/CommonDetUnit/interface/PixelGeomDetType.h"
#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h"
#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
#include "Geometry/TrackerNumberingBuilder/interface/GeometricDet.h"
#include <cstdint>

class SiPixelClusterModule {
Expand Down
34 changes: 8 additions & 26 deletions DQM/SiPixelMonitorCluster/interface/SiPixelClusterSource.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,36 +23,13 @@
#include <memory>

// user include files
#include "FWCore/Framework/interface/EDAnalyzer.h"
#include "FWCore/Framework/interface/Frameworkfwd.h"
#include "FWCore/Framework/interface/MakerMacros.h"

#include "DQMServices/Core/interface/DQMEDAnalyzer.h"
#include "DQMServices/Core/interface/DQMStore.h"

#include "DQM/SiPixelMonitorCluster/interface/SiPixelClusterModule.h"

#include "DataFormats/Common/interface/DetSetVectorNew.h"
#include "DataFormats/SiPixelCluster/interface/SiPixelCluster.h"
#include "DataFormats/SiPixelDigi/interface/PixelDigi.h"

#include "DataFormats/Common/interface/Handle.h"
#include "FWCore/Framework/interface/EDProducer.h"
#include "FWCore/Framework/interface/ESHandle.h"
#include "FWCore/Framework/interface/Event.h"
#include "FWCore/Framework/interface/EventSetup.h"

#include "FWCore/ParameterSet/interface/ParameterSet.h"

#include "Geometry/CommonDetUnit/interface/GeomDet.h"
#include "Geometry/CommonDetUnit/interface/GeomDetType.h"
#include "Geometry/CommonDetUnit/interface/GluedGeomDet.h"
#include "Geometry/CommonTopologies/interface/PixelTopology.h"
#include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
#include "Geometry/CommonDetUnit/interface/PixelGeomDetType.h"
#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h"
#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
#include "Geometry/TrackerNumberingBuilder/interface/GeometricDet.h"
#include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
#include "DataFormats/TrackerCommon/interface/TrackerTopology.h"
#include "Geometry/Records/interface/TrackerTopologyRcd.h"
#include <cstdint>

class SiPixelClusterSource : public DQMEDAnalyzer {
Expand Down Expand Up @@ -123,6 +100,11 @@ class SiPixelClusterSource : public DQMEDAnalyzer {
// define Token(-s)
edm::EDGetTokenT<edmNew::DetSetVector<SiPixelCluster>> srcToken_;
edm::EDGetTokenT<edm::DetSetVector<PixelDigi>> digisrcToken_;

edm::ESGetToken<TrackerTopology, TrackerTopologyRcd> trackerTopoToken_;
edm::ESGetToken<TrackerGeometry, TrackerDigiGeometryRecord> trackerGeomToken_;
edm::ESGetToken<TrackerTopology, TrackerTopologyRcd> trackerTopoTokenBeginRun_;
edm::ESGetToken<TrackerGeometry, TrackerDigiGeometryRecord> trackerGeomTokenBeginRun_;
};

#endif
23 changes: 11 additions & 12 deletions DQM/SiPixelMonitorCluster/src/SiPixelClusterSource.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,23 +21,20 @@
// Framework
#include "FWCore/MessageLogger/interface/MessageLogger.h"
#include "FWCore/ServiceRegistry/interface/Service.h"
#include "FWCore/Framework/interface/MakerMacros.h"
// DQM Framework
#include "DQM/SiPixelCommon/interface/SiPixelFolderOrganizer.h"
#include "DQMServices/Core/interface/DQMStore.h"
// Geometry
#include "DataFormats/TrackerCommon/interface/TrackerTopology.h"
#include "Geometry/CommonTopologies/interface/PixelTopology.h"
#include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h"
#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
// DataFormats
#include "DataFormats/DetId/interface/DetId.h"
#include "DataFormats/TrackerCommon/interface/PixelBarrelName.h"
#include "DataFormats/SiPixelDetId/interface/PixelBarrelNameUpgrade.h"
#include "DataFormats/TrackerCommon/interface/PixelEndcapName.h"
#include "DataFormats/SiPixelDetId/interface/PixelEndcapNameUpgrade.h"
#include "DataFormats/SiPixelDetId/interface/PixelSubdetector.h"
#include "DataFormats/TrackerCommon/interface/TrackerTopology.h"
//
#include <cstdlib>
#include <string>
Expand Down Expand Up @@ -71,6 +68,12 @@ SiPixelClusterSource::SiPixelClusterSource(const edm::ParameterSet &iConfig)
// set Token(-s)
srcToken_ = consumes<edmNew::DetSetVector<SiPixelCluster>>(conf_.getParameter<edm::InputTag>("src"));
digisrcToken_ = consumes<edm::DetSetVector<PixelDigi>>(conf_.getParameter<edm::InputTag>("digisrc"));

trackerTopoToken_ = esConsumes<TrackerTopology, TrackerTopologyRcd>();
trackerGeomToken_ = esConsumes<TrackerGeometry, TrackerDigiGeometryRecord>();
trackerTopoTokenBeginRun_ = esConsumes<TrackerTopology, TrackerTopologyRcd, edm::Transition::BeginRun>();
trackerGeomTokenBeginRun_ = esConsumes<TrackerGeometry, TrackerDigiGeometryRecord, edm::Transition::BeginRun>();

firstRun = true;
topFolderName_ = conf_.getParameter<std::string>("TopFolderName");
}
Expand Down Expand Up @@ -228,16 +231,14 @@ void SiPixelClusterSource::analyze(const edm::Event &iEvent, const edm::EventSet
iEvent.getByToken(srcToken_, input);
auto const &clustColl = *(input.product());

edm::ESHandle<TrackerGeometry> pDD;
iSetup.get<TrackerDigiGeometryRecord>().get(pDD);
edm::ESHandle<TrackerGeometry> pDD = iSetup.getHandle(trackerGeomToken_);
const TrackerGeometry *tracker = &(*pDD);

edm::Handle<edm::DetSetVector<PixelDigi>> digiinput;
iEvent.getByToken(digisrcToken_, digiinput);
const edm::DetSetVector<PixelDigi> diginp = *(digiinput.product());

edm::ESHandle<TrackerTopology> tTopoHandle;
iSetup.get<TrackerTopologyRcd>().get(tTopoHandle);
edm::ESHandle<TrackerTopology> tTopoHandle = iSetup.getHandle(trackerTopoToken_);
const TrackerTopology *pTT = tTopoHandle.product();

int lumiSection = (int)iEvent.luminosityBlock();
Expand Down Expand Up @@ -311,11 +312,9 @@ void SiPixelClusterSource::analyze(const edm::Event &iEvent, const edm::EventSet
//------------------------------------------------------------------
void SiPixelClusterSource::buildStructure(const edm::EventSetup &iSetup) {
LogInfo("PixelDQM") << " SiPixelClusterSource::buildStructure";
edm::ESHandle<TrackerGeometry> pDD;
iSetup.get<TrackerDigiGeometryRecord>().get(pDD);
edm::ESHandle<TrackerGeometry> pDD = iSetup.getHandle(trackerGeomTokenBeginRun_);

edm::ESHandle<TrackerTopology> tTopoHandle;
iSetup.get<TrackerTopologyRcd>().get(tTopoHandle);
edm::ESHandle<TrackerTopology> tTopoHandle = iSetup.getHandle(trackerTopoTokenBeginRun_);
const TrackerTopology *pTT = tTopoHandle.product();

LogVerbatim("PixelDQM") << " *** Geometry node for TrackerGeom is " << &(*pDD) << std::endl;
Expand Down
16 changes: 0 additions & 16 deletions DQM/SiPixelMonitorDigi/interface/SiPixelDigiModule.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,22 +23,6 @@
#include "DQMServices/Core/interface/DQMStore.h"
#include "DataFormats/SiPixelDigi/interface/PixelDigi.h"
#include "DataFormats/Common/interface/DetSetVector.h"
#include "FWCore/ParameterSet/interface/ParameterSet.h"
#include "CondFormats/SiPixelObjects/interface/SiPixelFedCablingMap.h"
#include "CondFormats/DataRecord/interface/SiPixelFedCablingMapRcd.h"
#include "CondFormats/SiPixelObjects/interface/SiPixelFrameReverter.h"
#include "CondFormats/SiPixelObjects/interface/GlobalPixel.h"

#include "FWCore/Framework/interface/ESHandle.h"
#include "Geometry/CommonTopologies/interface/PixelTopology.h"
#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h"
#include "Geometry/CommonDetUnit/interface/GeomDetType.h"
#include "Geometry/CommonDetUnit/interface/GeomDet.h"
#include "Geometry/CommonDetUnit/interface/GluedGeomDet.h"
#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
#include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
#include "Geometry/TrackerNumberingBuilder/interface/GeometricDet.h"
#include "Geometry/CommonDetUnit/interface/PixelGeomDetType.h"
#include <cstdint>

class SiPixelDigiModule {
Expand Down
17 changes: 0 additions & 17 deletions DQM/SiPixelMonitorDigi/interface/SiPixelDigiSource.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,26 +21,9 @@
#include <memory>

// user include files
#include "FWCore/Framework/interface/Frameworkfwd.h"
#include "FWCore/Framework/interface/EDAnalyzer.h"
#include "FWCore/Framework/interface/MakerMacros.h"

#include "DQMServices/Core/interface/DQMStore.h"
#include "DQMServices/Core/interface/DQMOneEDAnalyzer.h"

#include "DQM/SiPixelMonitorDigi/interface/SiPixelDigiModule.h"

#include "DataFormats/Common/interface/DetSetVector.h"
#include "DataFormats/SiPixelDigi/interface/PixelDigi.h"
#include "DataFormats/SiPixelCluster/interface/SiPixelCluster.h"

#include "FWCore/Framework/interface/EDProducer.h"
#include "FWCore/Framework/interface/Event.h"
#include "FWCore/Framework/interface/EventSetup.h"
#include "DataFormats/Common/interface/Handle.h"
#include "FWCore/Framework/interface/ESHandle.h"

#include "FWCore/ParameterSet/interface/ParameterSet.h"
#include <cstdint>

class SiPixelDigiSource : public DQMOneLumiEDAnalyzer<> {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this module is on this list: #25090 (comment) of modules prohibiting concurrent lumis in RelVal workflows, as you are touching it. I was wondering if you could address that too. TRK DQM conveners might help with this.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure what exactly needs to be done but I guess it could be incorporated in this PR (with an appropriate change in the PR title and description). Unless people prefer not to mix these two things.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The problem is explained extensively in the thread of #25090
There are some instructions on how to fix it here: https://indico.cern.ch/event/870369/contributions/3670615/attachments/2006693/3351542/dqm-one-and-legacy-modules.pdf

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@mmusich, I had a quick (probably too quick) look at the above links and couldn't quite figure out the extent of changes needed in the DQM code so in the interest of not delaying further this PR, I decided not to touch that part of the code.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

pity...

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, it is a pity, this is one of the missing pieces, it would be nice to have a PR at some point

Expand Down
1 change: 1 addition & 0 deletions DQM/SiPixelMonitorDigi/src/SiPixelDigiSource.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
//
#include "DQM/SiPixelMonitorDigi/interface/SiPixelDigiSource.h"
// Framework
#include "FWCore/Framework/interface/MakerMacros.h"
#include "FWCore/ServiceRegistry/interface/Service.h"
#include "FWCore/MessageLogger/interface/MessageLogger.h"
#include "FWCore/ParameterSet/interface/ParameterSet.h"
Expand Down
Loading