Skip to content

Commit 983b10f

Browse files
mmusichmmusich
committed
reorganize RecoTracker/TrackProducer/plugins/ to avoid SealModules.cc
1 parent a02520a commit 983b10f

File tree

11 files changed

+193
-263
lines changed

11 files changed

+193
-263
lines changed

‎RecoTracker/TrackProducer/plugins/DAFTrackProducer.cc‎

Lines changed: 41 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,54 @@
1+
/** \class DAFTrackProducer
2+
* EDProducer for DAFTrackProducerAlgorithm.
3+
*
4+
* \author tropiano, genta
5+
* \review in May 2014 by brondolin
6+
*/
7+
18
#include <memory>
29

10+
#include "DataFormats/TrackerCommon/interface/TrackerTopology.h"
311
#include "FWCore/Framework/interface/Frameworkfwd.h"
4-
#include "FWCore/Framework/interface/MakerMacros.h"
12+
#include "FWCore/Framework/interface/stream/EDProducer.h"
513
#include "FWCore/MessageLogger/interface/MessageLogger.h"
14+
#include "Geometry/Records/interface/TrackerTopologyRcd.h"
615
#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
716
#include "RecoTracker/Record/interface/MultiRecHitRecord.h"
817
#include "RecoTracker/SiTrackerMRHTools/interface/MultiRecHitCollector.h"
918
#include "RecoTracker/SiTrackerMRHTools/interface/SiTrackerMultiRecHitUpdator.h"
10-
#include "RecoTracker/TrackProducer/plugins/DAFTrackProducer.h"
19+
#include "RecoTracker/TrackProducer/interface/DAFTrackProducerAlgorithm.h"
20+
#include "RecoTracker/TrackProducer/interface/KfTrackProducerBase.h"
1121
#include "TrackingTools/GeomPropagators/interface/Propagator.h"
12-
#include "TrackingTools/PatternTools/interface/Trajectory.h"
1322
#include "TrackingTools/PatternTools/interface/TrajAnnealing.h"
1423
#include "TrackingTools/PatternTools/interface/TrajTrackAssociation.h"
24+
#include "TrackingTools/PatternTools/interface/Trajectory.h"
1525
#include "TrackingTools/Records/interface/TrackingComponentsRecord.h"
1626

17-
#include "DataFormats/TrackerCommon/interface/TrackerTopology.h"
18-
#include "Geometry/Records/interface/TrackerTopologyRcd.h"
27+
//class MultiRecHitRecord;
28+
29+
class DAFTrackProducer : public KfTrackProducerBase, public edm::stream::EDProducer<> {
30+
public:
31+
typedef std::vector<Trajectory> TrajectoryCollection;
32+
// typedef std::vector<TrajAnnealing> TrajAnnealingCollection;
33+
explicit DAFTrackProducer(const edm::ParameterSet& iConfig);
34+
35+
// Implementation of produce method
36+
void produce(edm::Event&, const edm::EventSetup&) override;
37+
38+
private:
39+
DAFTrackProducerAlgorithm theAlgo;
40+
using TrackProducerBase<reco::Track>::getFromEvt;
41+
void getFromEvt(edm::Event&, edm::Handle<TrajTrackAssociationCollection>&, reco::BeamSpot&);
42+
void putInEvtTrajAnn(edm::Event& theEvent,
43+
TrajAnnealingCollection& trajannResults,
44+
std::unique_ptr<TrajAnnealingCollection>& selTrajAnn);
45+
46+
bool TrajAnnSaving_;
47+
edm::EDGetTokenT<TrajTrackAssociationCollection> srcTT_;
48+
edm::ESGetToken<TrackerTopology, TrackerTopologyRcd> ttopoToken_;
49+
edm::ESGetToken<MultiRecHitCollector, MultiRecHitRecord> measurementCollectorToken_;
50+
edm::ESGetToken<SiTrackerMultiRecHitUpdator, MultiRecHitRecord> updatorToken_;
51+
};
1952

2053
DAFTrackProducer::DAFTrackProducer(const edm::ParameterSet& iConfig)
2154
: KfTrackProducerBase(iConfig.getParameter<bool>("TrajectoryInEvent"), false), theAlgo(iConfig) {
@@ -193,3 +226,6 @@ void DAFTrackProducer::putInEvtTrajAnn(edm::Event& theEvent,
193226

194227
theEvent.put(std::move(outputTrajAnnColl));
195228
}
229+
230+
#include "FWCore/Framework/interface/MakerMacros.h"
231+
DEFINE_FWK_MODULE(DAFTrackProducer);

‎RecoTracker/TrackProducer/plugins/DAFTrackProducer.h‎

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

‎RecoTracker/TrackProducer/plugins/ExtraFromSeeds.cc‎

Lines changed: 35 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,36 @@
1919
// system include files
2020
#include <memory>
2121

22-
#include "RecoTracker/TrackProducer/plugins/ExtraFromSeeds.h"
22+
// user include files
23+
#include "DataFormats/TrackReco/interface/Track.h"
24+
#include "DataFormats/TrackReco/interface/TrackExtra.h"
25+
#include "DataFormats/TrackReco/interface/TrackExtraFwd.h"
26+
#include "DataFormats/TrackReco/interface/TrackFwd.h"
27+
#include "FWCore/Framework/interface/Event.h"
28+
#include "FWCore/Framework/interface/Frameworkfwd.h"
29+
#include "FWCore/Framework/interface/MakerMacros.h"
30+
#include "FWCore/Framework/interface/global/EDProducer.h"
31+
#include "FWCore/ParameterSet/interface/ParameterSet.h"
32+
33+
//
34+
// class declaration
35+
//
36+
37+
class ExtraFromSeeds : public edm::global::EDProducer<> {
38+
public:
39+
explicit ExtraFromSeeds(const edm::ParameterSet&);
40+
~ExtraFromSeeds() override = default;
41+
42+
static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);
43+
44+
private:
45+
void produce(edm::StreamID, edm::Event&, const edm::EventSetup&) const override;
46+
47+
const edm::EDGetTokenT<reco::TrackCollection> tracks_;
48+
typedef std::vector<unsigned int> ExtremeLight;
49+
50+
// ----------member data ---------------------------
51+
};
2352

2453
//
2554
// constructors and destructor
@@ -30,11 +59,6 @@ ExtraFromSeeds::ExtraFromSeeds(const edm::ParameterSet& iConfig)
3059
produces<TrackingRecHitCollection>();
3160
}
3261

33-
ExtraFromSeeds::~ExtraFromSeeds() {
34-
// do anything here that needs to be done at desctruction time
35-
// (e.g. close files, deallocate resources etc.)
36-
}
37-
3862
//
3963
// member functions
4064
//
@@ -72,9 +96,10 @@ void ExtraFromSeeds::produce(edm::StreamID, edm::Event& iEvent, const edm::Event
7296

7397
// ------------ method fills 'descriptions' with the allowed parameters for the module ------------
7498
void ExtraFromSeeds::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
75-
//The following says we do not know what parameters are allowed so do no validation
76-
// Please change this to state exactly what you do use, even if it is no parameters
7799
edm::ParameterSetDescription desc;
78-
desc.setUnknown();
79-
descriptions.addDefault(desc);
100+
desc.add<edm::InputTag>("tracks", edm::InputTag("generalTracks"));
101+
descriptions.addWithDefaultLabel(desc);
80102
}
103+
104+
#include "FWCore/Framework/interface/MakerMacros.h"
105+
DEFINE_FWK_MODULE(ExtraFromSeeds);

‎RecoTracker/TrackProducer/plugins/ExtraFromSeeds.h‎

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

‎RecoTracker/TrackProducer/plugins/GsfTrackRefitter.cc‎

Lines changed: 40 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,47 @@
1-
#include "RecoTracker/TrackProducer/plugins/GsfTrackRefitter.h"
1+
/** \class GsfTrackRefitter
2+
* Refit GSF Tracks. Based on the TrackRefitter.
3+
*/
4+
25
// system include files
36
#include <memory>
7+
48
// user include files
9+
#include "DataFormats/TrackerCommon/interface/TrackerTopology.h"
510
#include "FWCore/Framework/interface/Frameworkfwd.h"
6-
11+
#include "FWCore/Framework/interface/stream/EDProducer.h"
712
#include "FWCore/MessageLogger/interface/MessageLogger.h"
8-
9-
#include "TrackingTools/PatternTools/interface/Trajectory.h"
10-
#include "TrackingTools/PatternTools/interface/TrajTrackAssociation.h"
11-
#include "TrackingTools/GsfTracking/interface/TrajGsfTrackAssociation.h"
12-
#include "TrackingTools/GsfTracking/interface/GsfTrackConstraintAssociation.h"
13+
#include "FWCore/Utilities/interface/InputTag.h"
14+
#include "Geometry/Records/interface/TrackerTopologyRcd.h"
1315
#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
16+
#include "RecoTracker/TrackProducer/interface/GsfTrackProducerBase.h"
17+
#include "RecoTracker/TrackProducer/interface/TrackProducerAlgorithm.h"
18+
#include "TrackingTools/GsfTracking/interface/GsfTrackConstraintAssociation.h"
19+
#include "TrackingTools/GsfTracking/interface/TrajGsfTrackAssociation.h"
20+
#include "TrackingTools/PatternTools/interface/TrajTrackAssociation.h"
21+
#include "TrackingTools/PatternTools/interface/Trajectory.h"
1422

15-
#include "DataFormats/TrackerCommon/interface/TrackerTopology.h"
16-
#include "Geometry/Records/interface/TrackerTopologyRcd.h"
23+
class GsfTrackRefitter : public GsfTrackProducerBase, public edm::stream::EDProducer<> {
24+
public:
25+
/// Constructor
26+
explicit GsfTrackRefitter(const edm::ParameterSet& iConfig);
27+
28+
/// Implementation of produce method
29+
void produce(edm::Event&, const edm::EventSetup&) override;
30+
31+
/// fillDescriptions
32+
static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);
33+
34+
private:
35+
TrackProducerAlgorithm<reco::GsfTrack> theAlgo;
36+
enum Constraint {
37+
none,
38+
// momentum,
39+
vertex
40+
};
41+
Constraint constraint_;
42+
edm::EDGetTokenT<GsfTrackVtxConstraintAssociationCollection> gsfTrackVtxConstraintTag_;
43+
edm::ESGetToken<TrackerTopology, TrackerTopologyRcd> ttopoToken_;
44+
};
1745

1846
GsfTrackRefitter::GsfTrackRefitter(const edm::ParameterSet& iConfig)
1947
: GsfTrackProducerBase(iConfig.getParameter<bool>("TrajectoryInEvent"),
@@ -165,3 +193,6 @@ void GsfTrackRefitter::produce(edm::Event& theEvent, const edm::EventSetup& setu
165193
LogDebug("GsfTrackRefitter") << "end"
166194
<< "\n";
167195
}
196+
197+
#include "FWCore/Framework/interface/MakerMacros.h"
198+
DEFINE_FWK_MODULE(GsfTrackRefitter);

‎RecoTracker/TrackProducer/plugins/GsfTrackRefitter.h‎

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

‎RecoTracker/TrackProducer/plugins/SealModules.cc‎

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

0 commit comments

Comments
 (0)