add fillDescriptions to DAFTrackProducer and extraFromSeeds

Author: mmusich

RecoTracker/TrackProducer/interface/DAFTrackProducerAlgorithm.h

@@ -10,13 +10,15 @@
 
 #include "AlgoProductTraits.h"
 
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
-#include "TrackingTools/TransientTrackingRecHit/interface/TransientTrackingRecHit.h"
+#include "DataFormats/BeamSpot/interface/BeamSpot.h"
 #include "DataFormats/TrackCandidate/interface/TrackCandidateCollection.h"
 #include "DataFormats/TrajectorySeed/interface/PropagationDirection.h"
-#include "DataFormats/BeamSpot/interface/BeamSpot.h"
+#include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "FWCore/ParameterSet/interface/ParameterSetDescription.h"
 #include "RecoTracker/MeasurementDet/interface/MeasurementTrackerEvent.h"
 #include "TrackingTools/PatternTools/interface/TrajTrackAssociation.h"
+#include "TrackingTools/TransientTrackingRecHit/interface/TransientTrackingRecHit.h"
 
 class MagneticField;
 class TrackingGeometry;
@@ -60,6 +62,8 @@ class DAFTrackProducerAlgorithm : public AlgoProductTraits<reco::Track> {
                         AlgoProductCollection&,
                         AlgoProductCollection&) const;
 
+  static void fillPSetDescription(edm::ParameterSetDescription& desc);
+
 private:
   /// Construct Tracks to be put in the event
   bool buildTrack(

RecoTracker/TrackProducer/plugins/DAFTrackProducer.cc

@@ -24,8 +24,6 @@
 #include "TrackingTools/PatternTools/interface/Trajectory.h"
 #include "TrackingTools/Records/interface/TrackingComponentsRecord.h"
 
-//class MultiRecHitRecord;
-
 class DAFTrackProducer : public KfTrackProducerBase, public edm::stream::EDProducer<> {
 public:
   typedef std::vector<Trajectory> TrajectoryCollection;
@@ -35,6 +33,9 @@ class DAFTrackProducer : public KfTrackProducerBase, public edm::stream::EDProdu
   // Implementation of produce method
   void produce(edm::Event&, const edm::EventSetup&) override;
 
+  /// fillDescriptions
+  static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);
+
 private:
   DAFTrackProducerAlgorithm theAlgo;
   using TrackProducerBase<reco::Track>::getFromEvt;
@@ -77,6 +78,18 @@ DAFTrackProducer::DAFTrackProducer(const edm::ParameterSet& iConfig)
   updatorToken_ = esConsumes(edm::ESInputTag("", updatorName));
 }
 
+void DAFTrackProducer::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
+  edm::ParameterSetDescription desc;
+  desc.add<bool>("TrajectoryInEvent", false);
+  desc.add<edm::InputTag>("src", edm::InputTag("DAFTrackCandidateMaker"));
+  desc.add<bool>("TrajAnnealingSaving", false);
+  desc.add<std::string>("MeasurementCollector", "simpleMultiRecHitCollector");
+  desc.add<std::string>("UpdatorName", "SiTrackerMultiRecHitUpdator");
+  KfTrackProducerBase::fillPSetDescription(desc);
+  DAFTrackProducerAlgorithm::fillPSetDescription(desc);
+  descriptions.addWithDefaultLabel(desc);
+}
+
 void DAFTrackProducer::produce(edm::Event& theEvent, const edm::EventSetup& setup) {
   edm::LogInfo("DAFTrackProducer") << "Analyzing event number: " << theEvent.id() << "\n";
 

RecoTracker/TrackProducer/python/CTFFinalFitWithMaterialDAF_cfi.py

@@ -1,18 +1,19 @@
 import FWCore.ParameterSet.Config as cms
 
-TracksDAF = cms.EDProducer("DAFTrackProducer",
-    src = cms.InputTag("DAFTrackCandidateMaker"),
-    UpdatorName = cms.string('SiTrackerMultiRecHitUpdator'),
-    beamSpot = cms.InputTag("offlineBeamSpot"),
-    Fitter = cms.string('MRHFittingSmoother'),
-    MeasurementCollector = cms.string('simpleMultiRecHitCollector'),
-    NavigationSchool = cms.string(''),
-    MeasurementTrackerEvent = cms.InputTag('MeasurementTrackerEvent'),
-    TrajectoryInEvent = cms.bool(False),
-    TTRHBuilder = cms.string('WithAngleAndTemplate'),
-    Propagator = cms.string('RungeKuttaTrackerPropagator'),
-    MinHits = cms.int32(3),
-    TrajAnnealingSaving = cms.bool(False) 
+from RecoTracker.TrackProducer.dafTrackProducer_cfi import dafTrackProducer
+TracksDAF = dafTrackProducer.clone(
+    src = "DAFTrackCandidateMaker",
+    UpdatorName = 'SiTrackerMultiRecHitUpdator',
+    beamSpot = "offlineBeamSpot",
+    Fitter = 'MRHFittingSmoother',
+    MeasurementCollector = 'simpleMultiRecHitCollector',
+    NavigationSchool = '',
+    MeasurementTrackerEvent = 'MeasurementTrackerEvent',
+    TrajectoryInEvent = False,
+    TTRHBuilder = 'WithAngleAndTemplate',
+    Propagator = 'RungeKuttaTrackerPropagator',
+    MinHits = 3,
+    TrajAnnealingSaving = False 
 )
 
 

RecoTracker/TrackProducer/python/extraFromSeeds_cfi.py

@@ -1,32 +1,34 @@
 #include "DataFormats/TrackCandidate/interface/TrackCandidate.h"
-#include "DataFormats/TrackingRecHit/interface/TrackingRecHitFwd.h"
-#include "DataFormats/TrackingRecHit/interface/InvalidTrackingRecHit.h"
-#include "RecoTracker/TransientTrackingRecHit/interface/TkTransientTrackingRecHitBuilder.h"
 #include "DataFormats/TrackReco/interface/Track.h"
+#include "DataFormats/TrackerRecHit2D/interface/OmniClusterRef.h"
+#include "DataFormats/TrackerRecHit2D/interface/SiTrackerMultiRecHit.h"
+#include "DataFormats/TrackerRecHit2D/interface/TkCloner.h"
+#include "DataFormats/TrackingRecHit/interface/InvalidTrackingRecHit.h"
+#include "DataFormats/TrackingRecHit/interface/TrackingRecHitFwd.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "Geometry/CommonDetUnit/interface/TrackingGeometry.h"
 #include "MagneticField/Engine/interface/MagneticField.h"
-#include "RecoTracker/TrackProducer/interface/DAFTrackProducerAlgorithm.h"
-#include "RecoTracker/SiTrackerMRHTools/interface/SiTrackerMultiRecHitUpdator.h"
 #include "RecoTracker/SiTrackerMRHTools/interface/MultiRecHitCollector.h"
-#include "TrackingTools/TrackFitters/interface/TrajectoryFitter.h"
-#include "TrackingTools/TrajectoryState/interface/TrajectoryStateOnSurface.h"
-#include "TrackingTools/TrajectoryState/interface/TrajectoryStateTransform.h"
-#include "TrackingTools/TransientTrackingRecHit/interface/TransientTrackingRecHitBuilder.h"
+#include "RecoTracker/SiTrackerMRHTools/interface/SiTrackerMultiRecHitUpdator.h"
+#include "RecoTracker/TrackProducer/interface/DAFTrackProducerAlgorithm.h"
 #include "RecoTracker/TransientTrackingRecHit/interface/TkClonerImpl.h"
+#include "RecoTracker/TransientTrackingRecHit/interface/TkTransientTrackingRecHitBuilder.h"
 #include "TrackingTools/PatternTools/interface/TSCBLBuilderNoMaterial.h"
+#include "TrackingTools/PatternTools/interface/TrajAnnealing.h"
 #include "TrackingTools/PatternTools/interface/TransverseImpactPointExtrapolator.h"
+#include "TrackingTools/TrackFitters/interface/TrajectoryFitter.h"
+#include "TrackingTools/TrackFitters/interface/TrajectoryStateCombiner.h"
 #include "TrackingTools/TrackFitters/interface/TrajectoryStateWithArbitraryError.h"
+#include "TrackingTools/TrajectoryState/interface/TrajectoryStateOnSurface.h"
+#include "TrackingTools/TrajectoryState/interface/TrajectoryStateTransform.h"
 #include "TrackingTools/TransientTrackingRecHit/interface/TransientTrackingRecHit.h"
-#include "DataFormats/TrackerRecHit2D/interface/SiTrackerMultiRecHit.h"
-#include "DataFormats/TrackerRecHit2D/interface/OmniClusterRef.h"
-#include "DataFormats/TrackerRecHit2D/interface/TkCloner.h"
-#include "TrackingTools/PatternTools/interface/TrajAnnealing.h"
-#include "TrackingTools/TrackFitters/interface/TrajectoryStateCombiner.h"
+#include "TrackingTools/TransientTrackingRecHit/interface/TransientTrackingRecHitBuilder.h"
 
 DAFTrackProducerAlgorithm::DAFTrackProducerAlgorithm(const edm::ParameterSet& conf)
     : conf_(conf), minHits_(conf.getParameter<int>("MinHits")) {}
 
+void DAFTrackProducerAlgorithm::fillPSetDescription(edm::ParameterSetDescription& desc) { desc.add<int>("MinHits", 3); }
+
 void DAFTrackProducerAlgorithm::runWithCandidate(const TrackingGeometry* theG,
                                                  const MagneticField* theMF,
                                                  const TrajTrackAssociationCollection& TTmap,