Skip to content

Commit 466876b

Browse files
tschuhtschuh
committed
makortel 2
1 parent 2c7833c commit 466876b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+347
-486
lines changed

‎L1Trigger/TrackFindingTracklet/interface/DataFormats.h‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ and in undigitized format in an std::tuple. (This saves CPU)
1010
----------------------------------------------------------------------*/
1111

1212
#include "FWCore/Framework/interface/data_default_record_trait.h"
13-
#include "L1Trigger/TrackFindingTracklet/interface/DataFormatsRcd.h"
1413
#include "L1Trigger/TrackFindingTracklet/interface/ChannelAssignment.h"
1514
#include "L1Trigger/TrackTrigger/interface/Setup.h"
1615
#include "DataFormats/L1TrackTrigger/interface/TTBV.h"
@@ -485,6 +484,6 @@ namespace trklet {
485484

486485
} // namespace trklet
487486

488-
EVENTSETUP_DATA_DEFAULT_RECORD(trklet::DataFormats, trklet::DataFormatsRcd);
487+
EVENTSETUP_DATA_DEFAULT_RECORD(trklet::DataFormats, trklet::ChannelAssignmentRcd);
489488

490489
#endif

‎L1Trigger/TrackFindingTracklet/interface/DataFormatsRcd.h‎

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

‎L1Trigger/TrackFindingTracklet/interface/HitPatternHelperRcd.h‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,11 @@
88
#include "FWCore/Framework/interface/DependentRecordImplementation.h"
99
#include "L1Trigger/TrackTrigger/interface/SetupRcd.h"
1010
#include "L1Trigger/TrackerTFP/interface/DataFormatsRcd.h"
11-
#include "L1Trigger/TrackerTFP/interface/LayerEncodingRcd.h"
1211
#include "FWCore/Utilities/interface/mplVector.h"
1312

1413
namespace hph {
1514

16-
typedef edm::mpl::Vector<tt::SetupRcd, trackerTFP::DataFormatsRcd, trackerTFP::LayerEncodingRcd> Rcds;
15+
typedef edm::mpl::Vector<tt::SetupRcd, trackerTFP::DataFormatsRcd> Rcds;
1716

1817
// record of hph::SetupRcd
1918
class SetupRcd : public edm::eventsetup::DependentRecordImplementation<SetupRcd, Rcds> {};

‎L1Trigger/TrackFindingTracklet/interface/TrackFindingProcessor.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,8 @@ namespace trklet {
8282
const trackerTFP::TrackQuality* trackQuality_;
8383
// storage of tracks
8484
std::vector<Track> tracks_;
85+
// b field
86+
double bfield_;
8587
};
8688

8789
} // namespace trklet

‎L1Trigger/TrackFindingTracklet/plugins/L1FPGATrackProducer.cc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ class L1FPGATrackProducer : public edm::one::EDProducer<edm::one::WatchRuns> {
215215
const ESGetToken<TrackerTopology, TrackerTopologyRcd> esGetTokenTTopo_;
216216
const ESGetToken<Setup, SetupRcd> esGetTokenSetup_;
217217
const ESGetToken<ChannelAssignment, ChannelAssignmentRcd> esGetTokenChannelAssignment_;
218-
const ESGetToken<TrackQuality, TrackQualityRcd> esGetTokenTrackQuality_;
218+
const ESGetToken<TrackQuality, DataFormatsRcd> esGetTokenTrackQuality_;
219219
const ESGetToken<hph::Setup, hph::SetupRcd> esGetTokenHPH_;
220220

221221
/// ///////////////// ///
@@ -247,7 +247,7 @@ L1FPGATrackProducer::L1FPGATrackProducer(edm::ParameterSet const& iConfig)
247247
esGetTokenTTopo_(esConsumes()),
248248
esGetTokenSetup_(esConsumes<Setup, SetupRcd, Transition::BeginRun>()),
249249
esGetTokenChannelAssignment_(esConsumes<ChannelAssignment, ChannelAssignmentRcd, Transition::BeginRun>()),
250-
esGetTokenTrackQuality_(esConsumes<TrackQuality, TrackQualityRcd, Transition::BeginRun>()),
250+
esGetTokenTrackQuality_(esConsumes<TrackQuality, DataFormatsRcd, Transition::BeginRun>()),
251251
esGetTokenHPH_(esConsumes<hph::Setup, hph::SetupRcd, edm::Transition::BeginRun>()) {
252252
if (readMoreMcTruth_) {
253253
getTokenTTClusterMCTruth_ = consumes<TTClusterAssociationMap<Ref_Phase2TrackerDigi_>>(MCTruthClusterInputTag);

‎L1Trigger/TrackFindingTracklet/plugins/ProducerDR.cc‎

Lines changed: 13 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ namespace trklet {
4343
~ProducerDR() override {}
4444

4545
private:
46-
void beginRun(const Run&, const EventSetup&) override;
4746
void produce(Event&, const EventSetup&) override;
4847
// ED input token of Tracks
4948
EDGetTokenT<StreamsTrack> edGetTokenTracks_;
@@ -56,19 +55,11 @@ namespace trklet {
5655
// Setup token
5756
ESGetToken<Setup, SetupRcd> esGetTokenSetup_;
5857
// LayerEncoding token
59-
ESGetToken<LayerEncoding, LayerEncodingRcd> esGetTokenLayerEncoding_;
58+
ESGetToken<LayerEncoding, ChannelAssignmentRcd> esGetTokenLayerEncoding_;
6059
// DataFormats token
61-
ESGetToken<DataFormats, DataFormatsRcd> esGetTokenDataFormats_;
60+
ESGetToken<DataFormats, ChannelAssignmentRcd> esGetTokenDataFormats_;
6261
// ChannelAssignment token
6362
ESGetToken<ChannelAssignment, ChannelAssignmentRcd> esGetTokenChannelAssignment_;
64-
// helper class to store configurations
65-
const Setup* setup_ = nullptr;
66-
// helper class to encode layer
67-
const LayerEncoding* layerEncoding_ = nullptr;
68-
// helper class to extract structured data from tt::Frames
69-
const DataFormats* dataFormats_ = nullptr;
70-
// helper class to assign tracks to channel
71-
const ChannelAssignment* channelAssignment_ = nullptr;
7263
};
7364

7465
ProducerDR::ProducerDR(const ParameterSet& iConfig) {
@@ -82,32 +73,29 @@ namespace trklet {
8273
edPutTokenStubs_ = produces<StreamsStub>(branchStubs);
8374
// book ES products
8475
esGetTokenSetup_ = esConsumes<Setup, SetupRcd, Transition::BeginRun>();
85-
esGetTokenLayerEncoding_ = esConsumes<LayerEncoding, LayerEncodingRcd, Transition::BeginRun>();
86-
esGetTokenDataFormats_ = esConsumes<DataFormats, DataFormatsRcd, Transition::BeginRun>();
76+
esGetTokenLayerEncoding_ = esConsumes<LayerEncoding, ChannelAssignmentRcd, Transition::BeginRun>();
77+
esGetTokenDataFormats_ = esConsumes<DataFormats, ChannelAssignmentRcd, Transition::BeginRun>();
8778
esGetTokenChannelAssignment_ = esConsumes<ChannelAssignment, ChannelAssignmentRcd, Transition::BeginRun>();
8879
}
8980

90-
void ProducerDR::beginRun(const Run& iRun, const EventSetup& iSetup) {
81+
void ProducerDR::produce(Event& iEvent, const EventSetup& iSetup) {
9182
// helper class to store configurations
92-
setup_ = &iSetup.getData(esGetTokenSetup_);
83+
const Setup* setup = &iSetup.getData(esGetTokenSetup_);
9384
// helper class to encode layer
94-
layerEncoding_ = &iSetup.getData(esGetTokenLayerEncoding_);
85+
const LayerEncoding* layerEncoding = &iSetup.getData(esGetTokenLayerEncoding_);
9586
// helper class to extract structured data from tt::Frames
96-
dataFormats_ = &iSetup.getData(esGetTokenDataFormats_);
87+
const DataFormats* dataFormats = &iSetup.getData(esGetTokenDataFormats_);
9788
// helper class to assign tracks to channel
98-
channelAssignment_ = &iSetup.getData(esGetTokenChannelAssignment_);
99-
}
100-
101-
void ProducerDR::produce(Event& iEvent, const EventSetup& iSetup) {
89+
const ChannelAssignment* channelAssignment = &iSetup.getData(esGetTokenChannelAssignment_);
10290
// empty DR products
103-
StreamsStub streamsStub(setup_->numRegions() * setup_->numLayers());
104-
StreamsTrack streamsTrack(setup_->numRegions());
91+
StreamsStub streamsStub(setup->numRegions() * setup->numLayers());
92+
StreamsTrack streamsTrack(setup->numRegions());
10593
// read in TBout Product and produce KFin product
10694
const StreamsStub& stubs = iEvent.get(edGetTokenStubs_);
10795
const StreamsTrack& tracks = iEvent.get(edGetTokenTracks_);
108-
for (int region = 0; region < setup_->numRegions(); region++) {
96+
for (int region = 0; region < setup->numRegions(); region++) {
10997
// object to remove duplicated tracks in a processing region
110-
DuplicateRemoval dr(setup_, layerEncoding_, dataFormats_, channelAssignment_, region);
98+
DuplicateRemoval dr(setup, layerEncoding, dataFormats, channelAssignment, region);
11199
// read in and organize input tracks and stubs
112100
dr.consume(tracks, stubs);
113101
// fill output products

‎L1Trigger/TrackFindingTracklet/plugins/ProducerDataFormats.cc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ namespace trklet {
2424
public:
2525
ProducerDataFormats(const ParameterSet& iConfig);
2626
~ProducerDataFormats() override {}
27-
unique_ptr<DataFormats> produce(const DataFormatsRcd& rcd);
27+
unique_ptr<DataFormats> produce(const ChannelAssignmentRcd& rcd);
2828

2929
private:
3030
ESGetToken<ChannelAssignment, ChannelAssignmentRcd> esGetToken_;
@@ -35,7 +35,7 @@ namespace trklet {
3535
esGetToken_ = cc.consumes();
3636
}
3737

38-
unique_ptr<DataFormats> ProducerDataFormats::produce(const DataFormatsRcd& rcd) {
38+
unique_ptr<DataFormats> ProducerDataFormats::produce(const ChannelAssignmentRcd& rcd) {
3939
const ChannelAssignment* ca = &rcd.get(esGetToken_);
4040
return make_unique<DataFormats>(ca);
4141
}

‎L1Trigger/TrackFindingTracklet/plugins/ProducerHPH.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ namespace hph {
3232
Setup::Config iConfig_;
3333
ESGetToken<tt::Setup, tt::SetupRcd> esGetTokenSetup_;
3434
ESGetToken<trackerTFP::DataFormats, trackerTFP::DataFormatsRcd> esGetTokenDataFormats_;
35-
ESGetToken<trackerTFP::LayerEncoding, trackerTFP::LayerEncodingRcd> esGetTokenLayerEncoding_;
35+
ESGetToken<trackerTFP::LayerEncoding, trackerTFP::DataFormatsRcd> esGetTokenLayerEncoding_;
3636
};
3737

3838
ProducerHPH::ProducerHPH(const ParameterSet& iConfig) {

‎L1Trigger/TrackFindingTracklet/plugins/ProducerKF.cc‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -57,11 +57,7 @@ namespace trklet {
5757
// Setup token
5858
ESGetToken<Setup, SetupRcd> esGetTokenSetup_;
5959
// DataFormats token
60-
ESGetToken<DataFormats, DataFormatsRcd> esGetTokenDataFormats_;
61-
// helper class to store configurations
62-
const Setup* setup_ = nullptr;
63-
// helper class to extract structured data from tt::Frames
64-
const DataFormats* dataFormats_ = nullptr;
60+
ESGetToken<DataFormats, ChannelAssignmentRcd> esGetTokenDataFormats_;
6561
// provides dataformats of Kalman filter internals
6662
KalmanFilterFormats kalmanFilterFormats_;
6763
//
@@ -102,24 +98,28 @@ namespace trklet {
10298
edPutTokenNumStatesTruncated_ = produces<int>(branchTruncated);
10399
// book ES products
104100
esGetTokenSetup_ = esConsumes<Setup, SetupRcd, Transition::BeginRun>();
105-
esGetTokenDataFormats_ = esConsumes<DataFormats, DataFormatsRcd, Transition::BeginRun>();
101+
esGetTokenDataFormats_ = esConsumes<DataFormats, ChannelAssignmentRcd, Transition::BeginRun>();
106102
}
107103

108104
void ProducerKF::beginRun(const Run& iRun, const EventSetup& iSetup) {
109105
// helper class to store configurations
110-
setup_ = &iSetup.getData(esGetTokenSetup_);
106+
const Setup* setup = &iSetup.getData(esGetTokenSetup_);
107+
settings_.setMagneticField(setup->bField());
111108
// helper class to extract structured data from tt::Frames
112-
dataFormats_ = &iSetup.getData(esGetTokenDataFormats_);
109+
const DataFormats* dataFormats = &iSetup.getData(esGetTokenDataFormats_);
113110
// provides dataformats of Kalman filter internals
114-
kalmanFilterFormats_.consume(dataFormats_);
115-
settings_.setMagneticField(setup_->bField());
111+
kalmanFilterFormats_.consume(dataFormats);
116112
}
117113

118114
void ProducerKF::produce(Event& iEvent, const EventSetup& iSetup) {
115+
// helper class to store configurations
116+
const Setup* setup = &iSetup.getData(esGetTokenSetup_);
117+
// helper class to extract structured data from tt::Frames
118+
const DataFormats* dataFormats = &iSetup.getData(esGetTokenDataFormats_);
119119
auto valid = [](int sum, const FrameTrack& f) { return sum += (f.first.isNull() ? 0 : 1); };
120120
// empty KF products
121-
StreamsStub streamsStub(setup_->numRegions() * setup_->numLayers());
122-
StreamsTrack streamsTrack(setup_->numRegions());
121+
StreamsStub streamsStub(setup->numRegions() * setup->numLayers());
122+
StreamsTrack streamsTrack(setup->numRegions());
123123
int numStatesAccepted(0);
124124
int numStatesTruncated(0);
125125
// read in DR Product and produce KF product
@@ -139,9 +139,9 @@ namespace trklet {
139139
if (frame.first.isNonnull())
140140
ttTrackRefs.push_back(frame.first);
141141
}
142-
for (int region = 0; region < setup_->numRegions(); region++) {
142+
for (int region = 0; region < setup->numRegions(); region++) {
143143
// object to fit tracks in a processing region
144-
KalmanFilter kf(setup_, dataFormats_, &kalmanFilterFormats_, &settings_, tmtt_, region, ttTracks);
144+
KalmanFilter kf(setup, dataFormats, &kalmanFilterFormats_, &settings_, tmtt_, region, ttTracks);
145145
// read in and organize input tracks and stubs
146146
kf.consume(tracks, stubs);
147147
// fill output products

‎L1Trigger/TrackFindingTracklet/plugins/ProducerTFP.cc‎

Lines changed: 10 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ namespace trklet {
4040
~ProducerTFP() override {}
4141

4242
private:
43-
void beginRun(const Run&, const EventSetup&) override;
4443
void produce(Event&, const EventSetup&) override;
4544
// ED input token of stubs and tracks
4645
EDGetTokenT<StreamsTrack> edGetTokenTracks_;
@@ -52,15 +51,9 @@ namespace trklet {
5251
// Setup token
5352
ESGetToken<Setup, SetupRcd> esGetTokenSetup_;
5453
// DataFormats token
55-
ESGetToken<DataFormats, DataFormatsRcd> esGetTokenDataFormats_;
54+
ESGetToken<DataFormats, ChannelAssignmentRcd> esGetTokenDataFormats_;
5655
// TrackQuality token
57-
ESGetToken<TrackQuality, TrackQualityRcd> esGetTokenTrackQuality_;
58-
// helper class to store configurations
59-
const Setup* setup_ = nullptr;
60-
// helper class to extract structured data from tt::Frames
61-
const DataFormats* dataFormats_ = nullptr;
62-
// helper class to determine track quality
63-
const TrackQuality* trackQuality_ = nullptr;
56+
ESGetToken<TrackQuality, DataFormatsRcd> esGetTokenTrackQuality_;
6457
};
6558

6659
ProducerTFP::ProducerTFP(const ParameterSet& iConfig) {
@@ -77,29 +70,26 @@ namespace trklet {
7770
edPutTokenTracks_ = produces<StreamsTrack>(branchTracks);
7871
// book ES products
7972
esGetTokenSetup_ = esConsumes<Setup, SetupRcd, Transition::BeginRun>();
80-
esGetTokenDataFormats_ = esConsumes<DataFormats, DataFormatsRcd, Transition::BeginRun>();
81-
esGetTokenTrackQuality_ = esConsumes<TrackQuality, TrackQualityRcd, Transition::BeginRun>();
73+
esGetTokenDataFormats_ = esConsumes<DataFormats, ChannelAssignmentRcd, Transition::BeginRun>();
74+
esGetTokenTrackQuality_ = esConsumes<TrackQuality, DataFormatsRcd, Transition::BeginRun>();
8275
}
8376

84-
void ProducerTFP::beginRun(const Run& iRun, const EventSetup& iSetup) {
77+
void ProducerTFP::produce(Event& iEvent, const EventSetup& iSetup) {
8578
// helper class to store configurations
86-
setup_ = &iSetup.getData(esGetTokenSetup_);
79+
const Setup* setup = &iSetup.getData(esGetTokenSetup_);
8780
// helper class to extract structured data from tt::Frames
88-
dataFormats_ = &iSetup.getData(esGetTokenDataFormats_);
81+
const DataFormats* dataFormats = &iSetup.getData(esGetTokenDataFormats_);
8982
// helper class to determine track quality
90-
trackQuality_ = &iSetup.getData(esGetTokenTrackQuality_);
91-
}
92-
93-
void ProducerTFP::produce(Event& iEvent, const EventSetup& iSetup) {
83+
const TrackQuality* trackQuality = &iSetup.getData(esGetTokenTrackQuality_);
9484
// empty TFP products
9585
TTTracks ttTracks;
96-
StreamsTrack streamsTrack(setup_->numRegions() * setup_->tfpNumChannel());
86+
StreamsTrack streamsTrack(setup->numRegions() * setup->tfpNumChannel());
9787
// read in TQ Products
9888
const StreamsTrack& tracks = iEvent.get(edGetTokenTracks_);
9989
const Streams& tracksAdd = iEvent.get(edGetTokenTracksAdd_);
10090
const StreamsStub& stubs = iEvent.get(edGetTokenStubs_);
10191
// produce TTTracks
102-
TrackFindingProcessor tfp(setup_, dataFormats_, trackQuality_);
92+
TrackFindingProcessor tfp(setup, dataFormats, trackQuality);
10393
tfp.produce(tracks, tracksAdd, stubs, ttTracks, streamsTrack);
10494
// put TTTRacks and produce TTTRackRefs
10595
const int nTrks = ttTracks.size();

0 commit comments

Comments
 (0)