Merge pull request cms-sw#2527 from makortel/moveSeedingLayerSetsHits

ktf · ktf · commit b3c47f036261 · 2014-02-22T10:46:41.000+01:00
Reco cleanup -- Move SeedingLayerSetsHits to TrackingTools/TransientTrackingRecHit package
diff --git a/RecoPixelVertexing/PixelTriplets/BuildFile.xml b/RecoPixelVertexing/PixelTriplets/BuildFile.xml
@@ -9,7 +9,7 @@
 <use   name="MagneticField/Records"/>
 <use   name="MagneticField/Engine"/>
 <use   name="RecoTracker/TkSeedingLayers"/>
-<use   name="RecoTracker/SeedingLayerSetsHits"/>
+<use   name="TrackingTools/TransientTrackingRecHit"/>
 <use   name="RecoTracker/TkSeedGenerator"/>
 <export>
   <lib   name="1"/>
diff --git a/RecoPixelVertexing/PixelTriplets/interface/HitTripletGeneratorFromPairAndLayers.h b/RecoPixelVertexing/PixelTriplets/interface/HitTripletGeneratorFromPairAndLayers.h
@@ -10,7 +10,7 @@
 #include "RecoPixelVertexing/PixelTriplets/interface/HitTripletGenerator.h"
 #include "RecoTracker/TkHitPairs/interface/HitPairGenerator.h"
 #include <vector>
-#include "RecoTracker/SeedingLayerSetsHits/interface/SeedingLayerSetsHits.h"
+#include "TrackingTools/TransientTrackingRecHit/interface/SeedingLayerSetsHits.h"
 #include "RecoTracker/TkHitPairs/interface/LayerHitMapCache.h"
 
 
diff --git a/RecoPixelVertexing/PixelTriplets/interface/LayerTriplets.h b/RecoPixelVertexing/PixelTriplets/interface/LayerTriplets.h
@@ -8,7 +8,7 @@
  */
 
 #include <vector>
-#include "RecoTracker/SeedingLayerSetsHits/interface/SeedingLayerSetsHits.h"
+#include "TrackingTools/TransientTrackingRecHit/interface/SeedingLayerSetsHits.h"
 
 namespace LayerTriplets {
   using Layer = SeedingLayerSetsHits::SeedingLayer;
diff --git a/RecoTracker/SeedingLayerSetsHits/BuildFile.xml b/RecoTracker/SeedingLayerSetsHits/BuildFile.xml
diff --git a/RecoTracker/SeedingLayerSetsHits/src/classes.h b/RecoTracker/SeedingLayerSetsHits/src/classes.h
diff --git a/RecoTracker/TkHitPairs/BuildFile.xml b/RecoTracker/TkHitPairs/BuildFile.xml
@@ -10,7 +10,6 @@
 <use   name="TrackingTools/TransientTrackingRecHit"/>
 <use   name="RecoTracker/TkMSParametrization"/>
 <use   name="RecoTracker/TkSeedingLayers"/>
-<use   name="RecoTracker/SeedingLayerSetsHits"/>
 <export>
   <lib   name="1"/>
 </export>
diff --git a/RecoTracker/TkHitPairs/interface/HitPairGenerator.h b/RecoTracker/TkHitPairs/interface/HitPairGenerator.h
@@ -11,7 +11,7 @@
 #include "RecoTracker/TkTrackingRegions/interface/OrderedHitsGenerator.h"
 #include "RecoTracker/TkHitPairs/interface/OrderedHitPairs.h"
 #include "RecoTracker/TkHitPairs/interface/RecHitsSortedInPhi.h"
-#include "RecoTracker/SeedingLayerSetsHits/interface/SeedingLayerSetsHits.h"
+#include "TrackingTools/TransientTrackingRecHit/interface/SeedingLayerSetsHits.h"
 
 class TrackingRegion;
 namespace edm { class Event; class EventSetup; }
diff --git a/RecoTracker/TkHitPairs/interface/LayerHitMapCache.h b/RecoTracker/TkHitPairs/interface/LayerHitMapCache.h
@@ -7,7 +7,7 @@
 
 #include "RecoTracker/TkTrackingRegions/interface/TrackingRegion.h"
 #include "RecoTracker/TkHitPairs/interface/RecHitsSortedInPhi.h"
-#include "RecoTracker/SeedingLayerSetsHits/interface/SeedingLayerSetsHits.h"
+#include "TrackingTools/TransientTrackingRecHit/interface/SeedingLayerSetsHits.h"
 #include "FWCore/Framework/interface/EventSetup.h"
 
 
diff --git a/RecoTracker/TkSeedGenerator/interface/MultiHitGeneratorFromPairAndLayers.h b/RecoTracker/TkSeedGenerator/interface/MultiHitGeneratorFromPairAndLayers.h
@@ -10,7 +10,7 @@
 #include <vector>
 #include "RecoTracker/TkSeedGenerator/interface/MultiHitGenerator.h"
 #include "RecoTracker/TkHitPairs/interface/HitPairGenerator.h"
-#include "RecoTracker/SeedingLayerSetsHits/interface/SeedingLayerSetsHits.h"
+#include "TrackingTools/TransientTrackingRecHit/interface/SeedingLayerSetsHits.h"
 #include "RecoTracker/TkHitPairs/interface/LayerHitMapCache.h"
 
 class MultiHitGeneratorFromPairAndLayers : public MultiHitGenerator {
diff --git a/RecoTracker/TkSeedingLayers/plugins/BuildFile.xml b/RecoTracker/TkSeedingLayers/plugins/BuildFile.xml
@@ -1,5 +1,4 @@
 <use   name="RecoTracker/TkSeedingLayers"/>
-<use   name="RecoTracker/SeedingLayerSetsHits"/>
 <library   file="*.cc" name="RecoTrackerTkSeedingLayersPlugins">
   <flags   EDM_PLUGIN="1"/>
 </library>
diff --git a/RecoTracker/TkSeedingLayers/plugins/SeedingLayersEDProducer.cc b/RecoTracker/TkSeedingLayers/plugins/SeedingLayersEDProducer.cc
@@ -1,4 +1,4 @@
-#include "RecoTracker/SeedingLayerSetsHits/interface/SeedingLayerSetsHits.h"
+#include "TrackingTools/TransientTrackingRecHit/interface/SeedingLayerSetsHits.h"
 
 #include "FWCore/Framework/interface/EDProducer.h"
 #include "FWCore/Framework/interface/Event.h"
diff --git a/RecoTracker/TkTrackingRegions/BuildFile.xml b/RecoTracker/TkTrackingRegions/BuildFile.xml
@@ -6,7 +6,6 @@
 <use   name="Geometry/TrackerGeometryBuilder"/>
 <use   name="RecoTracker/Record"/>
 <use   name="RecoTracker/TkSeedingLayers"/>
-<use   name="RecoTracker/SeedingLayerSetsHits"/>
 <use   name="RecoTracker/TkMSParametrization"/>
 <use   name="RecoTracker/MeasurementDet"/>
 <use   name="TrackingTools/PatternTools"/>
diff --git a/RecoTracker/TkTrackingRegions/interface/TrackingRegion.h b/RecoTracker/TkTrackingRegions/interface/TrackingRegion.h
@@ -19,7 +19,7 @@
 
 #include "FWCore/Framework/interface/EventSetup.h"
 #include "RecoTracker/TkSeedingLayers/interface/SeedingLayer.h"
-#include "RecoTracker/SeedingLayerSetsHits/interface/SeedingLayerSetsHits.h"
+#include "TrackingTools/TransientTrackingRecHit/interface/SeedingLayerSetsHits.h"
 #include "TrackingTools/TransientTrackingRecHit/interface/TransientTrackingRecHit.h"
 
 #include <utility>
diff --git a/TrackingTools/TransientTrackingRecHit/BuildFile.xml b/TrackingTools/TransientTrackingRecHit/BuildFile.xml
@@ -2,6 +2,7 @@
 <use   name="clhep"/>
 <use   name="FWCore/Utilities"/>
 <use   name="FWCore/Framework"/>
+<use   name="FWCore/MessageLogger"/>
 <use   name="DataFormats/Common"/>
 <use   name="DataFormats/TrackingRecHit"/>
 <use   name="DataFormats/TrackerRecHit2D"/>
diff --git a/TrackingTools/TransientTrackingRecHit/interface/SeedingLayerSetsHits.h b/TrackingTools/TransientTrackingRecHit/interface/SeedingLayerSetsHits.h
@@ -1,5 +1,5 @@
-#ifndef RecoTracker_SeedingLayerSet_SeedingLayerSetsHits
-#define RecoTracker_SeedingLayerSet_SeedingLayerSetsHits
+#ifndef TrackingTools_TransientTrackingRecHit_SeedingLayerSetsHits
+#define TrackingTools_TransientTrackingRecHit_SeedingLayerSetsHits
 
 #include "TrackingTools/TransientTrackingRecHit/interface/TransientTrackingRecHit.h"
 
diff --git a/TrackingTools/TransientTrackingRecHit/src/SeedingLayerSetsHits.cc b/TrackingTools/TransientTrackingRecHit/src/SeedingLayerSetsHits.cc
@@ -1,4 +1,4 @@
-#include "RecoTracker/SeedingLayerSetsHits/interface/SeedingLayerSetsHits.h"
+#include "TrackingTools/TransientTrackingRecHit/interface/SeedingLayerSetsHits.h"
 #include "FWCore/Utilities/interface/Exception.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 
diff --git a/TrackingTools/TransientTrackingRecHit/src/classes.h b/TrackingTools/TransientTrackingRecHit/src/classes.h
@@ -0,0 +1,8 @@
+#include "TrackingTools/TransientTrackingRecHit/interface/SeedingLayerSetsHits.h"
+#include "DataFormats/Common/interface/Wrapper.h"
+
+namespace TrackingTools_TransientTrackingRecHit {
+  struct dictionary {
+    edm::Wrapper<SeedingLayerSetsHits> wslsn;
+  };
+}
diff --git a/TrackingTools/TransientTrackingRecHit/src/classes_def.xml b/TrackingTools/TransientTrackingRecHit/src/classes_def.xml

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#include "RecoTracker/SeedingLayerSetsHits/interface/SeedingLayerSetsHits.h"`
	`1`	`+#include "TrackingTools/TransientTrackingRecHit/interface/SeedingLayerSetsHits.h"`
`2`	`2`
`3`	`3`	`#include "FWCore/Framework/interface/EDProducer.h"`
`4`	`4`	`#include "FWCore/Framework/interface/Event.h"`