delete ESInputTag (it makes crashing some workflow because of convers…

…ionTrackCandidates (SimpleNavigationSchool) and hltGetConditions (MaterialPropagatorParabolicMF) )
cms-sw · Feb 12, 2014 · 48a9518 · 48a9518
1 parent 7ad6cae
commit 48a9518
Show file tree

Hide file tree

Showing 9 changed files with 27 additions and 21 deletions.
diff --git a/RecoTracker/CkfPattern/src/CkfTrackCandidateMakerBase.cc b/RecoTracker/CkfPattern/src/CkfTrackCandidateMakerBase.cc
@@ -123,8 +123,9 @@ namespace cms{
     std::string mfName = "";
     if (conf_.exists("SimpleMagneticField"))
       mfName = conf_.getParameter<std::string>("SimpleMagneticField");
-    edm::ESInputTag mfESInputTag(mfName);
-    es.get<IdealMagneticFieldRecord>().get(mfESInputTag,theMagField );
+    es.get<IdealMagneticFieldRecord>().get(mfName,theMagField );
+    //    edm::ESInputTag mfESInputTag(mfName);
+    //    es.get<IdealMagneticFieldRecord>().get(mfESInputTag,theMagField );
 
     if (!theInitialState){
       // constructor uses the EventSetup, it must be in the setEventSetup were it has a proper value.

diff --git a/RecoTracker/TkNavigation/plugins/CfgNavigationSchoolESProducer.cc b/RecoTracker/TkNavigation/plugins/CfgNavigationSchoolESProducer.cc
@@ -10,8 +10,9 @@ NavigationSchoolESProducer::ReturnType CfgNavigationSchoolESProducer::produce(co
   std::string mfName = "";
   if (theNavigationPSet.exists("SimpleMagneticField"))
     mfName = theNavigationPSet.getParameter<std::string>("SimpleMagneticField");
-  edm::ESInputTag mfESInputTag(mfName);
-  iRecord.getRecord<IdealMagneticFieldRecord>().get(mfESInputTag,field);
+  iRecord.getRecord<IdealMagneticFieldRecord>().get(mfName,field);
+  //  edm::ESInputTag mfESInputTag(mfName);
+  //  iRecord.getRecord<IdealMagneticFieldRecord>().get(mfESInputTag,field);
 
   //get the geometricsearch tracker geometry
   edm::ESHandle<GeometricSearchTracker>         geometricSearchTracker;

diff --git a/RecoTracker/TkNavigation/plugins/NavigationSchoolESProducer.cc b/RecoTracker/TkNavigation/plugins/NavigationSchoolESProducer.cc
@@ -42,8 +42,9 @@ NavigationSchoolESProducer::produce(const NavigationSchoolRecord& iRecord)
    std::string mfName = "";
    if (theNavigationPSet.exists("SimpleMagneticField"))
      mfName = theNavigationPSet.getParameter<std::string>("SimpleMagneticField");
-   edm::ESInputTag mfESInputTag(mfName);
-   iRecord.getRecord<IdealMagneticFieldRecord>().get(mfESInputTag,field);
+   iRecord.getRecord<IdealMagneticFieldRecord>().get(mfName,field);
+   //   edm::ESInputTag mfESInputTag(mfName);
+   //   iRecord.getRecord<IdealMagneticFieldRecord>().get(mfESInputTag,field);
 
    //get the geometricsearch tracker geometry
    edm::ESHandle<GeometricSearchTracker>         geometricSearchTracker;

diff --git a/RecoTracker/TkSeedGenerator/plugins/MultiHitGeneratorFromChi2.cc b/RecoTracker/TkSeedGenerator/plugins/MultiHitGeneratorFromChi2.cc
@@ -125,9 +125,9 @@ void MultiHitGeneratorFromChi2::hitSets(const TrackingRegion& region,
   es.get<TrackerDigiGeometryRecord>().get(tracker);
   if (nomField<0 && bfield == 0) {
     edm::ESHandle<MagneticField> bfield_h;
-    edm::ESInputTag mfESInputTag(mfName_);
-    //  es.get<IdealMagneticFieldRecord>().get(mfName_, bfield_h);  
-    es.get<IdealMagneticFieldRecord>().get(mfESInputTag, bfield_h);  
+    es.get<IdealMagneticFieldRecord>().get(mfName_, bfield_h);  
+    //    edm::ESInputTag mfESInputTag(mfName_);
+    //    es.get<IdealMagneticFieldRecord>().get(mfESInputTag, bfield_h);  
     bfield = bfield_h.product();
     nomField = bfield->nominalValue();
   }

diff --git a/RecoTracker/TkSeedGenerator/plugins/SeedFromConsecutiveHitsCreator.cc b/RecoTracker/TkSeedGenerator/plugins/SeedFromConsecutiveHitsCreator.cc
@@ -33,9 +33,9 @@ void SeedFromConsecutiveHitsCreator::init(const TrackingRegion & iregion,
   // get propagator
   es.get<TrackingComponentsRecord>().get(thePropagatorLabel, propagatorHandle);
   // mag field
-  edm::ESInputTag mfESInputTag(mfName_);
-  //  es.get<IdealMagneticFieldRecord>().get(mfName_, bfield);  
-  es.get<IdealMagneticFieldRecord>().get(mfESInputTag, bfield);  
+  es.get<IdealMagneticFieldRecord>().get(mfName_, bfield);  
+  //  edm::ESInputTag mfESInputTag(mfName_);
+  //  es.get<IdealMagneticFieldRecord>().get(mfESInputTag, bfield);  
   nomField = bfield->nominalValue();
   isBOFF = (0==nomField);  
 }

diff --git a/RecoTracker/TrackProducer/interface/TrackProducerBase.icc b/RecoTracker/TrackProducer/interface/TrackProducerBase.icc
@@ -67,9 +67,9 @@ TrackProducerBase<T>::getFromES(const edm::EventSetup& setup,
   if (useSimpleMF){
      mfName = conf_.getParameter<std::string>("SimpleMagneticField"); 
   }
-  edm::ESInputTag mfESInputTag(mfName);
-  //  setup.get<IdealMagneticFieldRecord>().get(mfName, theMF);  
-  setup.get<IdealMagneticFieldRecord>().get(mfESInputTag, theMF);  
+  setup.get<IdealMagneticFieldRecord>().get(mfName, theMF);  
+  //  edm::ESInputTag mfESInputTag(mfName);
+  //  setup.get<IdealMagneticFieldRecord>().get(mfESInputTag, theMF);  
 
   //
   // get the fitter from the ES

diff --git a/TrackingTools/KalmanUpdators/plugins/TrackingRecHitPropagatorESProducer.cc b/TrackingTools/KalmanUpdators/plugins/TrackingRecHitPropagatorESProducer.cc
@@ -26,8 +26,9 @@ TrackingRecHitPropagatorESProducer::produce(const TrackingComponentsRecord& iRec
    std::string mfName = "";
    if (pset_.exists("SimpleMagneticField"))
      mfName = pset_.getParameter<std::string>("SimpleMagneticField");
-   edm::ESInputTag mfESInputTag(mfName);
-   iRecord.getRecord<IdealMagneticFieldRecord>().get(mfESInputTag,magfield);
+   iRecord.getRecord<IdealMagneticFieldRecord>().get(mfName,magfield);
+   //   edm::ESInputTag mfESInputTag(mfName);
+   //   iRecord.getRecord<IdealMagneticFieldRecord>().get(mfESInputTag,magfield);
    theHitPropagator= boost::shared_ptr<TrackingRecHitPropagator>(new TrackingRecHitPropagator(magfield.product()));
    return theHitPropagator;
 }

diff --git a/TrackingTools/MaterialEffects/plugins/PropagatorWithMaterialESProducer.cc b/TrackingTools/MaterialEffects/plugins/PropagatorWithMaterialESProducer.cc
@@ -42,8 +42,9 @@ PropagatorWithMaterialESProducer::produce(const TrackingComponentsRecord & iReco
   std::string mfName = "";
   if (pset_.exists("SimpleMagneticField"))
     mfName = pset_.getParameter<std::string>("SimpleMagneticField");
-  edm::ESInputTag mfESInputTag(mfName);
-  iRecord.getRecord<IdealMagneticFieldRecord>().get(mfESInputTag,magfield);
+  iRecord.getRecord<IdealMagneticFieldRecord>().get(mfName,magfield);
+  //  edm::ESInputTag mfESInputTag(mfName);
+  //  iRecord.getRecord<IdealMagneticFieldRecord>().get(mfESInputTag,magfield);
   //fixme check that useRK is false when using SimpleMagneticField 
 
   PropagationDirection dir = alongMomentum;

diff --git a/TrackingTools/Producers/src/AnalyticalPropagatorESProducer.cc b/TrackingTools/Producers/src/AnalyticalPropagatorESProducer.cc
@@ -32,8 +32,9 @@ AnalyticalPropagatorESProducer::produce(const TrackingComponentsRecord & iRecord
   std::string mfName = "";
   if (pset_.exists("SimpleMagneticField"))
     mfName = pset_.getParameter<std::string>("SimpleMagneticField");
-  edm::ESInputTag mfESInputTag(mfName);
-  iRecord.getRecord<IdealMagneticFieldRecord>().get(mfESInputTag,magfield);
+  iRecord.getRecord<IdealMagneticFieldRecord>().get(mfName,magfield);
+  //  edm::ESInputTag mfESInputTag(mfName);
+  //  iRecord.getRecord<IdealMagneticFieldRecord>().get(mfESInputTag,magfield);
 
   std::string pdir = pset_.getParameter<std::string>("PropagationDirection");
   double dphiCut   = pset_.getParameter<double>("MaxDPhi");