Deliver TkCloner to TransientInitialStateEstimator

Requested by @VinInn to ease resolution of future merge conflicts.
cbernet · Apr 14, 2014 · 1d19c6e · 1d19c6e
1 parent 6ddd56b
commit 1d19c6e
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 6 deletions.
diff --git a/RecoEgamma/EgammaPhotonAlgos/src/ConversionTrackFinder.cc b/RecoEgamma/EgammaPhotonAlgos/src/ConversionTrackFinder.cc
@@ -3,6 +3,7 @@
 //
 #include "RecoTracker/Record/interface/CkfComponentsRecord.h"
 #include "RecoTracker/CkfPattern/interface/TransientInitialStateEstimator.h"
+#include "RecoTracker/TransientTrackingRecHit/interface/TkTransientTrackingRecHitBuilder.h"
 //
 
 #include "TrackingTools/KalmanUpdators/interface/KFUpdator.h"
@@ -44,5 +45,5 @@ void ConversionTrackFinder::setEventSetup(const edm::EventSetup& es )   {
   es.get<TrackingComponentsRecord>().get("AnyDirectionAnalyticalPropagator",
 					thePropagator_);
 
-  theInitialState_->setEventSetup( es );
+  theInitialState_->setEventSetup( es, static_cast<TkTransientTrackingRecHitBuilder const *>(theCkfTrajectoryBuilder_->hitBuilder())->cloner() );
 }
diff --git a/RecoTracker/CkfPattern/interface/TransientInitialStateEstimator.h b/RecoTracker/CkfPattern/interface/TransientInitialStateEstimator.h
@@ -4,6 +4,7 @@
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
 #include "TrackingTools/TrajectoryState/interface/TrajectoryStateOnSurface.h"
+#include "RecoTracker/TransientTrackingRecHit/interface/TkClonerImpl.h"
 
 #include <utility>
 
@@ -23,7 +24,7 @@ class TransientInitialStateEstimator {
   typedef TrajectoryStateOnSurface TSOS;
 
   TransientInitialStateEstimator(const edm::ParameterSet& conf);
-  void setEventSetup( const edm::EventSetup& es );
+  void setEventSetup( const edm::EventSetup& es, const TkClonerImpl& hc );
 
   std::pair<TrajectoryStateOnSurface, const GeomDet*>
     innerState( const Trajectory& traj, bool doBackFit=true) const;
@@ -34,6 +35,7 @@ class TransientInitialStateEstimator {
   const std::string thePropagatorOppositeName;
   const Propagator *thePropagatorAlong;
   const Propagator *thePropagatorOpposite; // not used? can we remove it?
+  TkClonerImpl theHitCloner;
   const int theNumberMeasurementsForFit;
 };
 

diff --git a/RecoTracker/CkfPattern/src/CkfTrackCandidateMakerBase.cc b/RecoTracker/CkfPattern/src/CkfTrackCandidateMakerBase.cc
@@ -129,8 +129,6 @@ namespace cms{
     //    edm::ESInputTag mfESInputTag(mfName);
     //    es.get<IdealMagneticFieldRecord>().get(mfESInputTag,theMagField );
 
-    theInitialState->setEventSetup( es );
-
     edm::ESHandle<TrajectoryCleaner> trajectoryCleanerH;
     es.get<TrajectoryCleaner::Record>().get(theTrajectoryCleanerName, trajectoryCleanerH);
     theTrajectoryCleaner= trajectoryCleanerH.product();
@@ -174,7 +172,9 @@ namespace cms{
         //std::cout << "Trajectory builder " << conf_.getParameter<std::string>("@module_label") << " created without masks, " << std::endl;
         theTrajectoryBuilder->setEvent(e, es, &*data);
     }
-
+    // TISE ES must be set here due to dependence on theTrajectoryBuilder
+    theInitialState->setEventSetup( es, static_cast<TkTransientTrackingRecHitBuilder const *>(theTrajectoryBuilder->hitBuilder())->cloner() );
+
     // Step B: Retrieve seeds
 
     edm::Handle<View<TrajectorySeed> > collseed;

diff --git a/RecoTracker/CkfPattern/src/TransientInitialStateEstimator.cc b/RecoTracker/CkfPattern/src/TransientInitialStateEstimator.cc
@@ -26,7 +26,9 @@ TransientInitialStateEstimator::TransientInitialStateEstimator(const edm::Parame
   theNumberMeasurementsForFit(conf.getParameter<int>("numberMeasurementsForFit"))
 {}
 
-void TransientInitialStateEstimator::setEventSetup( const edm::EventSetup& es ) {
+void TransientInitialStateEstimator::setEventSetup( const edm::EventSetup& es, const TkClonerImpl& hc ) {
+  theHitCloner = hc;
+
   edm::ESHandle<Propagator> halong;
   edm::ESHandle<Propagator> hopposite;