Skip to content

Commit fe8df6b

Browse files
tschuhtschuh
committed
makortel 4
1 parent 9149bfb commit fe8df6b

31 files changed

+70
-327
lines changed

‎L1Trigger/TrackFindingTracklet/plugins/L1FPGATrackProducer.cc‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -245,10 +245,10 @@ L1FPGATrackProducer::L1FPGATrackProducer(edm::ParameterSet const& iConfig)
245245
esGetTokenBfield_(esConsumes<edm::Transition::BeginRun>()),
246246
esGetTokenTGeom_(esConsumes()),
247247
esGetTokenTTopo_(esConsumes()),
248-
esGetTokenSetup_(esConsumes<Setup, SetupRcd, Transition::BeginRun>()),
249-
esGetTokenChannelAssignment_(esConsumes<ChannelAssignment, ChannelAssignmentRcd, Transition::BeginRun>()),
250-
esGetTokenTrackQuality_(esConsumes<TrackQuality, DataFormatsRcd, Transition::BeginRun>()),
251-
esGetTokenHPH_(esConsumes<hph::Setup, hph::SetupRcd, edm::Transition::BeginRun>()) {
248+
esGetTokenSetup_(esConsumes<Transition::BeginRun>()),
249+
esGetTokenChannelAssignment_(esConsumes<Transition::BeginRun>()),
250+
esGetTokenTrackQuality_(esConsumes<Transition::BeginRun>()),
251+
esGetTokenHPH_(esConsumes<Transition::BeginRun>()) {
252252
if (readMoreMcTruth_) {
253253
getTokenTTClusterMCTruth_ = consumes<TTClusterAssociationMap<Ref_Phase2TrackerDigi_>>(MCTruthClusterInputTag);
254254
getTokenTrackingParticle_ = consumes<std::vector<TrackingParticle>>(TrackingParticleInputTag);

‎L1Trigger/TrackFindingTracklet/plugins/ProducerDR.cc‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -72,10 +72,10 @@ namespace trklet {
7272
edPutTokenTracks_ = produces<StreamsTrack>(branchTracks);
7373
edPutTokenStubs_ = produces<StreamsStub>(branchStubs);
7474
// book ES products
75-
esGetTokenSetup_ = esConsumes<Setup, SetupRcd, Transition::BeginRun>();
76-
esGetTokenLayerEncoding_ = esConsumes<LayerEncoding, ChannelAssignmentRcd, Transition::BeginRun>();
77-
esGetTokenDataFormats_ = esConsumes<DataFormats, ChannelAssignmentRcd, Transition::BeginRun>();
78-
esGetTokenChannelAssignment_ = esConsumes<ChannelAssignment, ChannelAssignmentRcd, Transition::BeginRun>();
75+
esGetTokenSetup_ = esConsumes();
76+
esGetTokenLayerEncoding_ = esConsumes();
77+
esGetTokenDataFormats_ = esConsumes();
78+
esGetTokenChannelAssignment_ = esConsumes();
7979
}
8080

8181
void ProducerDR::produce(Event& iEvent, const EventSetup& iSetup) {

‎L1Trigger/TrackFindingTracklet/plugins/ProducerKF.cc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,8 +139,8 @@ namespace trklet {
139139
edPutTokenNumStatesAccepted_ = produces<int>(branchTracks);
140140
edPutTokenNumStatesTruncated_ = produces<int>(branchTruncated);
141141
// book ES products
142-
esGetTokenSetup_ = esConsumes<Setup, SetupRcd, Transition::BeginRun>();
143-
esGetTokenDataFormats_ = esConsumes<DataFormats, ChannelAssignmentRcd, Transition::BeginRun>();
142+
esGetTokenSetup_ = esConsumes();
143+
esGetTokenDataFormats_ = esConsumes();
144144
}
145145

146146
void ProducerKF::beginRun(const Run& iRun, const EventSetup& iSetup) {

‎L1Trigger/TrackFindingTracklet/plugins/ProducerTFP.cc‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,9 +69,9 @@ namespace trklet {
6969
edPutTokenTTTracks_ = produces<TTTracks>(branchTTTracks);
7070
edPutTokenTracks_ = produces<StreamsTrack>(branchTracks);
7171
// book ES products
72-
esGetTokenSetup_ = esConsumes<Setup, SetupRcd, Transition::BeginRun>();
73-
esGetTokenDataFormats_ = esConsumes<DataFormats, ChannelAssignmentRcd, Transition::BeginRun>();
74-
esGetTokenTrackQuality_ = esConsumes<TrackQuality, DataFormatsRcd, Transition::BeginRun>();
72+
esGetTokenSetup_ = esConsumes();
73+
esGetTokenDataFormats_ = esConsumes();
74+
esGetTokenTrackQuality_ = esConsumes();
7575
}
7676

7777
void ProducerTFP::produce(Event& iEvent, const EventSetup& iSetup) {

‎L1Trigger/TrackFindingTracklet/plugins/ProducerTM.cc‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,9 @@ namespace trklet {
7272
edPutTokenStubs_ = produces<StreamsStub>(branchStubs);
7373
edPutTokenTracks_ = produces<StreamsTrack>(branchTracks);
7474
// book ES products
75-
esGetTokenSetup_ = esConsumes<Setup, SetupRcd, Transition::BeginRun>();
76-
esGetTokenDataFormats_ = esConsumes<DataFormats, ChannelAssignmentRcd, Transition::BeginRun>();
77-
esGetTokenChannelAssignment_ = esConsumes<ChannelAssignment, ChannelAssignmentRcd, Transition::BeginRun>();
75+
esGetTokenSetup_ = esConsumes();
76+
esGetTokenDataFormats_ = esConsumes();
77+
esGetTokenChannelAssignment_ = esConsumes();
7878
}
7979

8080
void ProducerTM::produce(Event& iEvent, const EventSetup& iSetup) {

‎L1Trigger/TrackFindingTracklet/test/AnalyzerDR.cc‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -112,9 +112,9 @@ namespace trklet {
112112
edGetTokenReconstructable_ = consumes<StubAssociation>(inputTagReconstructable);
113113
}
114114
// book ES products
115-
esGetTokenSetup_ = esConsumes<Setup, SetupRcd, Transition::BeginRun>();
116-
esGetTokenDataFormats_ = esConsumes<DataFormats, ChannelAssignmentRcd, Transition::BeginRun>();
117-
esGetTokenChannelAssignment_ = esConsumes<ChannelAssignment, ChannelAssignmentRcd, Transition::BeginRun>();
115+
esGetTokenSetup_ = esConsumes<Transition::BeginRun>();
116+
esGetTokenDataFormats_ = esConsumes<Transition::BeginRun>();
117+
esGetTokenChannelAssignment_ = esConsumes<Transition::BeginRun>();
118118
// log config
119119
log_.setf(ios::fixed, ios::floatfield);
120120
log_.precision(4);

‎L1Trigger/TrackFindingTracklet/test/AnalyzerDemonstrator.cc‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,9 +89,9 @@ namespace trklet {
8989
if (labelOut != "ProducerIRin")
9090
edGetTokenTracksOut_ = consumes<StreamsTrack>(InputTag(labelOut, branchTracks));
9191
// book ES products
92-
esGetTokenSetup_ = esConsumes<Setup, SetupRcd, Transition::BeginRun>();
93-
esGetTokenChannelAssignment_ = esConsumes<ChannelAssignment, ChannelAssignmentRcd, Transition::BeginRun>();
94-
esGetTokenDemonstrator_ = esConsumes<Demonstrator, SetupRcd, Transition::BeginRun>();
92+
esGetTokenSetup_ = esConsumes<Transition::BeginRun>();
93+
esGetTokenChannelAssignment_ = esConsumes<Transition::BeginRun>();
94+
esGetTokenDemonstrator_ = esConsumes<Transition::BeginRun>();
9595
//
9696
TBin_ = labelIn == "l1tTTTracksFromTrackletEmulation";
9797
TBout_ = labelOut == "l1tTTTracksFromTrackletEmulation";

‎L1Trigger/TrackFindingTracklet/test/AnalyzerKF.cc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,8 +135,8 @@ namespace trklet {
135135
edGetTokenReconstructable_ = consumes<StubAssociation>(inputTagReconstructable);
136136
}
137137
// book ES products
138-
esGetTokenSetup_ = esConsumes<Setup, SetupRcd, Transition::BeginRun>();
139-
esGetTokenDataFormats_ = esConsumes<DataFormats, ChannelAssignmentRcd, Transition::BeginRun>();
138+
esGetTokenSetup_ = esConsumes<Transition::BeginRun>();
139+
esGetTokenDataFormats_ = esConsumes<Transition::BeginRun>();
140140
// log config
141141
log_.setf(ios::fixed, ios::floatfield);
142142
log_.precision(4);

‎L1Trigger/TrackFindingTracklet/test/AnalyzerKFout.cc‎

Lines changed: 0 additions & 252 deletions
This file was deleted.

‎L1Trigger/TrackFindingTracklet/test/AnalyzerTM.cc‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -112,9 +112,9 @@ namespace trklet {
112112
edGetTokenReconstructable_ = consumes<StubAssociation>(inputTagReconstructable);
113113
}
114114
// book ES products
115-
esGetTokenSetup_ = esConsumes<Setup, SetupRcd, Transition::BeginRun>();
116-
esGetTokenDataFormats_ = esConsumes<DataFormats, ChannelAssignmentRcd, Transition::BeginRun>();
117-
esGetTokenChannelAssignment_ = esConsumes<ChannelAssignment, ChannelAssignmentRcd, Transition::BeginRun>();
115+
esGetTokenSetup_ = esConsumes<Transition::BeginRun>();
116+
esGetTokenDataFormats_ = esConsumes<Transition::BeginRun>();
117+
esGetTokenChannelAssignment_ = esConsumes<Transition::BeginRun>();
118118
// log config
119119
log_.setf(ios::fixed, ios::floatfield);
120120
log_.precision(4);

0 commit comments

Comments
 (0)