compiles but RecoEgamma/EgammaPhotonAlgos/src/ConversionSeedFinder.cc

carolhungwt · Apr 30, 2014 · a92ab15 · a92ab15
1 parent 92ea5d8
commit a92ab15
Show file tree

Hide file tree

Showing 31 changed files with 31 additions and 506 deletions.
diff --git a/RecoEgamma/EgammaElectronAlgos/interface/ElectronSeedGenerator.h b/RecoEgamma/EgammaElectronAlgos/interface/ElectronSeedGenerator.h
@@ -17,7 +17,6 @@
 
 #include "TrackingTools/TrajectoryState/interface/TrajectoryStateTransform.h"
 #include "TrackingTools/PatternTools/interface/TrajectoryStateUpdator.h"
-#include "TrackingTools/DetLayers/interface/NavigationSetter.h"
 
 #include "RecoTracker/TransientTrackingRecHit/interface/TSiPixelRecHit.h"
 #include "RecoTracker/TkDetLayers/interface/GeometricSearchTracker.h"

diff --git a/RecoEgamma/EgammaPhotonProducers/interface/ConvertedPhotonProducer.h b/RecoEgamma/EgammaPhotonProducers/interface/ConvertedPhotonProducer.h
@@ -17,7 +17,6 @@
 #include "RecoTracker/MeasurementDet/interface/MeasurementTracker.h"
 #include "TrackingTools/TransientTrack/interface/TransientTrack.h"
 #include "TrackingTools/MeasurementDet/interface/LayerMeasurements.h"
-#include "TrackingTools/DetLayers/interface/NavigationSetter.h"
 #include "TrackingTools/DetLayers/interface/NavigationSchool.h"
 #include "TrackingTools/TransientTrack/interface/TransientTrackBuilder.h"
 #include "RecoTracker/TkNavigation/interface/SimpleNavigationSchool.h"

diff --git a/RecoEgamma/EgammaPhotonProducers/src/TrackProducerWithSCAssociation.cc b/RecoEgamma/EgammaPhotonProducers/src/TrackProducerWithSCAssociation.cc
@@ -332,7 +332,6 @@ TrackingRecHitRefProd rHits = evt.getRefBeforePut<TrackingRecHitCollection>();
       {
         edm::Handle<MeasurementTrackerEvent> mte;
         evt.getByLabel(edm::InputTag("MeasurementTrackerEvent"), mte);
-	// NavigationSetter setter( *theSchool );
 	setSecondHitPattern(theTraj,track,thePropagator,&*mte);
       }
     //==============================================================

diff --git a/RecoMuon/GlobalTrackingTools/interface/DynamicTruncation.h b/RecoMuon/GlobalTrackingTools/interface/DynamicTruncation.h
@@ -36,7 +36,6 @@
 #include "TrackingTools/PatternTools/interface/TrajectoryStateUpdator.h"
 #include "RecoMuon/DetLayers/interface/MuonDetLayerGeometry.h"
 #include "RecoTracker/Record/interface/NavigationSchoolRecord.h"
-#include "TrackingTools/DetLayers/interface/NavigationSetter.h"
 #include "RecoMuon/TrackingTools/interface/MuonServiceProxy.h"
 #include "RecoMuon/Navigation/interface/DirectMuonNavigation.h"
 #include "Alignment/MuonAlignment/interface/MuonAlignment.h"

diff --git a/RecoMuon/GlobalTrackingTools/src/DynamicTruncation.cc b/RecoMuon/GlobalTrackingTools/src/DynamicTruncation.cc
@@ -19,7 +19,6 @@
 #include "RecoMuon/DetLayers/interface/MuonDetLayerGeometry.h"
 #include "RecoMuon/Records/interface/MuonRecoGeometryRecord.h"
 #include "RecoMuon/Navigation/interface/MuonNavigationSchool.h"
-#include "TrackingTools/DetLayers/interface/NavigationSetter.h"
 #include "RecoMuon/Navigation/interface/MuonNavigationPrinter.h"
 #include "TrackingTools/TrajectoryState/interface/TrajectoryStateTransform.h"
 #include "RecoTracker/Record/interface/NavigationSchoolRecord.h"

diff --git a/RecoMuon/L3TrackFinder/src/L3MuonTrajectoryBuilder.cc b/RecoMuon/L3TrackFinder/src/L3MuonTrajectoryBuilder.cc
@@ -56,8 +56,6 @@
 #include "RecoTracker/TkTrackingRegions/interface/RectangularEtaPhiTrackingRegion.h"
 #include "TrackingTools/TrajectoryCleaning/interface/TrajectoryCleanerBySharedHits.h"
 
-#include "TrackingTools/DetLayers/interface/NavigationSetter.h"
-
 #include "DataFormats/BeamSpot/interface/BeamSpot.h"
 #include "DataFormats/VertexReco/interface/Vertex.h"
 #include "DataFormats/VertexReco/interface/VertexFwd.h"

diff --git a/RecoMuon/Navigation/test/MuonNavigationTest.cc b/RecoMuon/Navigation/test/MuonNavigationTest.cc
@@ -19,7 +19,6 @@
 #include "RecoMuon/Navigation/interface/MuonNavigationSchool.h"
 //#include "RecoMuon/Navigation/interface/MuonTkNavigationSchool.h"
 #include "RecoMuon/Records/interface/MuonRecoGeometryRecord.h"
-// #include "TrackingTools/DetLayers/interface/NavigationSetter.h"
 #include "RecoMuon/Navigation/interface/MuonNavigationPrinter.h"
 #include "RecoMuon/DetLayers/interface/MuonDetLayerGeometry.h"
 //#include "RecoTracker/TkDetLayers/interface/GeometricSearchTracker.h"
@@ -66,7 +65,6 @@ MuonNavigationTest::analyze( const edm::Event& iEvent, const edm::EventSetup& iS
 
    if ( testMuon ) {
       MuonNavigationSchool school(mm);
-      // NavigationSetter setter(school);
       MuonNavigationPrinter* printer = new MuonNavigationPrinter(mm, school );
       delete printer;
    }
@@ -82,7 +80,6 @@ MuonNavigationTest::analyze( const edm::Event& iEvent, const edm::EventSetup& iS
      const MagneticField * field(&(*theMF));
 
      MuonTkNavigationSchool school(mm,tt,field);
-     NavigationSetter setter(school);
      MuonNavigationPrinter* printer = new MuonNavigationPrinter(mm, tt);
      delete printer;
   }

diff --git a/RecoMuon/TrackingTools/src/MuonServiceProxy.cc b/RecoMuon/TrackingTools/src/MuonServiceProxy.cc
@@ -23,7 +23,6 @@
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 
-#include "TrackingTools/DetLayers/interface/NavigationSetter.h"
 
 // C++ Headers
 #include <map>

diff --git a/RecoTracker/CkfPattern/interface/CkfTrackCandidateMaker.h b/RecoTracker/CkfPattern/interface/CkfTrackCandidateMaker.h
@@ -11,7 +11,6 @@
 #include "TrackingTools/TrajectoryCleaning/interface/TrajectoryCleaner.h"
 
 #include "MagneticField/Engine/interface/MagneticField.h"
-#include "TrackingTools/DetLayers/interface/NavigationSetter.h"
 #include "TrackingTools/DetLayers/interface/NavigationSchool.h"
 #include "RecoTracker/TkNavigation/interface/SimpleNavigationSchool.h"
 #include "RecoTracker/TkDetLayers/interface/GeometricSearchTracker.h"

diff --git a/RecoTracker/CkfPattern/interface/CkfTrackCandidateMakerBase.h b/RecoTracker/CkfPattern/interface/CkfTrackCandidateMakerBase.h
@@ -14,7 +14,6 @@
 #include "TrackingTools/TrajectoryCleaning/interface/TrajectoryCleaner.h"
 
 #include "MagneticField/Engine/interface/MagneticField.h"
-#include "TrackingTools/DetLayers/interface/NavigationSetter.h"
 #include "TrackingTools/DetLayers/interface/NavigationSchool.h"
 #include "RecoTracker/TkNavigation/interface/SimpleNavigationSchool.h"
 #include "RecoTracker/TkDetLayers/interface/GeometricSearchTracker.h"

diff --git a/RecoTracker/CkfPattern/interface/CkfTrajectoryMaker.h b/RecoTracker/CkfPattern/interface/CkfTrajectoryMaker.h
@@ -11,7 +11,6 @@
 #include "TrackingTools/TrajectoryCleaning/interface/TrajectoryCleaner.h"
 
 #include "MagneticField/Engine/interface/MagneticField.h"
-#include "TrackingTools/DetLayers/interface/NavigationSetter.h"
 #include "TrackingTools/DetLayers/interface/NavigationSchool.h"
 #include "RecoTracker/TkNavigation/interface/SimpleNavigationSchool.h"
 #include "RecoTracker/TkDetLayers/interface/GeometricSearchTracker.h"

diff --git a/RecoTracker/DebugTools/interface/CkfDebugger.h b/RecoTracker/DebugTools/interface/CkfDebugger.h
@@ -36,6 +36,7 @@ class TrajectoryStateOnSurface;
 class MagneticField;
 class Chi2MeasurementEstimator;
 class Propagator;
+class NavigationSchool;
 
 typedef TransientTrackingRecHit::ConstRecHitPointer CTTRHp;
 
@@ -104,6 +105,7 @@ class CkfDebugger {
   const MeasurementTracker*        theMeasurementTracker;
   const TransientTrackingRecHitBuilder* theTTRHBuilder;
   const TrackerTopology *theTopo;
+  NavigationSchool const * theNavSchool;
 
   std::map<unsigned int, std::vector<PSimHit*> > idHitsMap;
 

diff --git a/RecoTracker/DebugTools/plugins/CkfDebugger.cc b/RecoTracker/DebugTools/plugins/CkfDebugger.cc
@@ -7,6 +7,8 @@
 #include "DataFormats/GeometryCommonDetAlgo/interface/MeasurementVector.h"
 #include "RecoTracker/MeasurementDet/interface/MeasurementTracker.h"
 #include "MagneticField/Records/interface/IdealMagneticFieldRecord.h"
+#include "TrackingTools/DetLayers/interface/NavigationSchool.h"
+#include "RecoTracker/Record/interface/NavigationSchoolRecord.h"
 #include "RecoTracker/DebugTools/interface/TSOSFromSimHitFactory.h"
 #include "TrackingTools/MeasurementDet/interface/MeasurementDet.h"
 #include "TrackingTools/MaterialEffects/interface/PropagatorWithMaterial.h"
@@ -51,6 +53,9 @@ CkfDebugger::CkfDebugger( edm::EventSetup const & es ):totSeeds(0)
   es.get<IdealGeometryRecord>().get(tTopoHand);
   theTopo=tTopoHand.product();
 
+  edm::ESHandle<NavigationSchool> nav;
+  es.get<NavigationSchoolRecord>().get("SimpleNavigationSchool", nav);
+  theNavSchool = nav.product();
 
   for (int i=0; i!=17; i++){
     dump.push_back(0);
@@ -903,7 +908,7 @@ int CkfDebugger::analyseRecHitNotFound(const Trajectory& traj, CTTRHp correctRec
   LogTrace("CkfDebugger") << "correct layer id=" << correctLayId ;
 
   TSOS currentState( traj.lastMeasurement().updatedState() );
-  std::vector<const DetLayer*> nl = traj.lastLayer()->nextLayers( *currentState.freeState(),traj.direction() );
+  std::vector<const DetLayer*> nl = theNavSchool->nextLayers(*traj.lastLayer(),*currentState.freeState(),traj.direction() );
   if (nl.empty()) {
     edm::LogVerbatim("CkfDebugger") << "no compatible layers" ;
     no_layer++;return 2;

diff --git a/RecoTracker/DebugTools/src/FixTrackHitPattern.cc b/RecoTracker/DebugTools/src/FixTrackHitPattern.cc
@@ -20,7 +20,7 @@
 
 #include "TrackingTools/DetLayers/interface/NavigationSchool.h"
 #include "RecoTracker/Record/interface/NavigationSchoolRecord.h"
-#include "TrackingTools/DetLayers/interface/NavigationSetter.h"
+
 
 #include "TrackingTools/Records/interface/TransientTrackRecord.h"
 #include "DataFormats/Math/interface/deltaPhi.h"
@@ -42,7 +42,7 @@ FixTrackHitPattern::Result FixTrackHitPattern::analyze(const edm::EventSetup& iS
   // This is also needed to extrapolate amongst the tracker layers.
   edm::ESHandle<NavigationSchool> theSchool;
   iSetup.get<NavigationSchoolRecord>().get("SimpleNavigationSchool",theSchool);
-  NavigationSetter junk(*theSchool);
+  // NavigationSetter junk(*theSchool);  FIXME FIXME (or not...)
 
   // This is needed to determine which sensors are functioning.
   edm::ESHandle<MeasurementTracker> measTk;

diff --git a/RecoTracker/DebugTools/src/GetTrackTrajInfo.cc b/RecoTracker/DebugTools/src/GetTrackTrajInfo.cc
@@ -16,7 +16,6 @@
 
 #include "TrackingTools/DetLayers/interface/NavigationSchool.h"
 #include "RecoTracker/Record/interface/NavigationSchoolRecord.h"
-#include "TrackingTools/DetLayers/interface/NavigationSetter.h"
 
 #include "TrackingTools/Records/interface/TransientTrackRecord.h"
 #include "DataFormats/Math/interface/deltaPhi.h"
@@ -38,7 +37,7 @@ std::vector< GetTrackTrajInfo::Result > GetTrackTrajInfo::analyze(const edm::Eve
   // This is also needed to extrapolate amongst the tracker layers.
   edm::ESHandle<NavigationSchool> theSchool;
   iSetup.get<NavigationSchoolRecord>().get("SimpleNavigationSchool",theSchool);
-  NavigationSetter junk(*theSchool);
+  // NavigationSetter junk(*theSchool);  // FIXME FIXME
 
   // Get the magnetic field and use it to define a propagator for extrapolating the track trajectory.
   edm::ESHandle<MagneticField> magField;

diff --git a/RecoTracker/NuclearSeedGenerator/interface/NuclearInteractionFinder.h b/RecoTracker/NuclearSeedGenerator/interface/NuclearInteractionFinder.h
@@ -36,7 +36,6 @@
 #include "RecoTracker/NuclearSeedGenerator/interface/SeedFromNuclearInteraction.h"
 #include "RecoTracker/NuclearSeedGenerator/interface/TangentHelix.h"
 
-#include "TrackingTools/DetLayers/interface/NavigationSetter.h"
 #include "TrackingTools/DetLayers/interface/NavigationSchool.h"
 #include "RecoTracker/TkNavigation/interface/SimpleNavigationSchool.h"
 

diff --git a/RecoTracker/NuclearSeedGenerator/plugins/NuclearSeedsEDProducer.cc b/RecoTracker/NuclearSeedGenerator/plugins/NuclearSeedsEDProducer.cc
@@ -53,7 +53,7 @@ NuclearSeedsEDProducer::produce(edm::Event& iEvent, const edm::EventSetup& iSetu
    edm::Handle<MeasurementTrackerEvent> data;
    iEvent.getByLabel(edm::InputTag("MeasurementTrackerEvent"), data);
 
-   NavigationSetter setter( *(theNuclearInteractionFinder->nav()) );
+//   NavigationSetter setter( *(theNuclearInteractionFinder->nav()) );   why???
 
    std::vector<std::pair<int, int> > assocPair;
    int i=0;

diff --git a/RecoTracker/NuclearSeedGenerator/src/NuclearInteractionFinder.cc b/RecoTracker/NuclearSeedGenerator/src/NuclearInteractionFinder.cc
@@ -159,7 +159,7 @@ NuclearInteractionFinder::findMeasurementsFromTSOS(const TSOS& currentState, Det
   vector<const DetLayer*> nl;
 
   if(lastLayer) {
-          nl = lastLayer->nextLayers( *currentState.freeState(), alongMomentum);
+          nl = theNavigationSchool->nextLayers(*lastLayer,*currentState.freeState(), alongMomentum);
   }
   else {
       edm::LogError("NuclearInteractionFinder") << "In findCompatibleMeasurements : lastLayer not accessible";

diff --git a/RecoTracker/TkNavigation/interface/CfgNavigationSchool.h b/RecoTracker/TkNavigation/interface/CfgNavigationSchool.h
diff --git a/RecoTracker/TkNavigation/interface/LayerCollector.h b/RecoTracker/TkNavigation/interface/LayerCollector.h
@@ -15,7 +15,7 @@
 #include "TrackingTools/DetLayers/interface/ForwardDetLayer.h"
 
 
-
+class NavigationSchool;
 
 class LayerCollector {
 
@@ -27,10 +27,12 @@ class LayerCollector {
 
 public:
 
-  LayerCollector(const Propagator* aPropagator,
+  LayerCollector(NavigationSchool const * aSchool,
+                 const Propagator* aPropagator,
 		 const StartingLayerFinder* aFinder,
 		 float dr, 
 		 float dz) : 
+    theSchool(aSchool),
     thePropagator(aPropagator),
     theStartingLayerFinder(aFinder),
     theDeltaR(dr),
@@ -48,7 +50,7 @@ class LayerCollector {
   float deltaZ() const {return theDeltaZ;}
 
 private:
-
+  NavigationSchool const * theSchool;
   const Propagator* thePropagator;
   const StartingLayerFinder* theStartingLayerFinder;
   float theDeltaR;

diff --git a/RecoTracker/TkNavigation/plugins/CfgNavigationSchoolESProducer.cc b/RecoTracker/TkNavigation/plugins/CfgNavigationSchoolESProducer.cc
diff --git a/RecoTracker/TkNavigation/plugins/CfgNavigationSchoolESProducer.h b/RecoTracker/TkNavigation/plugins/CfgNavigationSchoolESProducer.h
diff --git a/RecoTracker/TkNavigation/plugins/modules.cc b/RecoTracker/TkNavigation/plugins/modules.cc
@@ -14,7 +14,5 @@ DEFINE_EDM_PLUGIN(NavigationSchoolFactory, BeamHaloNavigationSchool, "BeamHaloNa
 
 #include "RecoTracker/TkNavigation/plugins/NavigationSchoolESProducer.h"
 #include "RecoTracker/TkNavigation/plugins/SkippingLayerCosmicNavigationSchoolESProducer.h"
-#include "RecoTracker/TkNavigation/plugins/CfgNavigationSchoolESProducer.h"
 DEFINE_FWK_EVENTSETUP_MODULE(NavigationSchoolESProducer);
 DEFINE_FWK_EVENTSETUP_MODULE(SkippingLayerCosmicNavigationSchoolESProducer);
-DEFINE_FWK_EVENTSETUP_MODULE(CfgNavigationSchoolESProducer);