Move PixelThresholdClusterizer (back?) to interface+src in order to u…

…se it outside of RecoLocalTracker/SiPixelClusterizer
makortel · May 30, 2018 · 766e967 · 766e967
1 parent 558a05c
commit 766e967
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 12 deletions.
diff --git a/RecoLocalTracker/SiPixelClusterizer/BuildFile.xml b/RecoLocalTracker/SiPixelClusterizer/BuildFile.xml
@@ -0,0 +1,9 @@
+<use   name="FWCore/ParameterSet"/>
+<use   name="DataFormats/Common"/>
+<use   name="DataFormats/SiPixelDetId"/>
+<use   name="DataFormats/SiPixelCluster"/>
+<use   name="CalibTracker/SiPixelESProducers"/>
+
+<export>
+    <lib name="1"/>
+</export>
diff --git a/...lusterizer/plugins/PixelClusterizerBase.h → ...sterizer/interface/PixelClusterizerBase.h b/...lusterizer/plugins/PixelClusterizerBase.h → ...sterizer/interface/PixelClusterizerBase.h
diff --git a/...rizer/plugins/PixelThresholdClusterizer.h → ...zer/interface/PixelThresholdClusterizer.h b/...rizer/plugins/PixelThresholdClusterizer.h → ...zer/interface/PixelThresholdClusterizer.h
@@ -42,10 +42,10 @@
 // Pixel, PixelPos and Shift as inner classes.
 //
 #include "DataFormats/Common/interface/DetSetVector.h"
-#include "PixelClusterizerBase.h"
+#include "RecoLocalTracker/SiPixelClusterizer/interface/PixelClusterizerBase.h"
 
 // The private pixel buffer
-#include "SiPixelArrayBuffer.h"
+#include "RecoLocalTracker/SiPixelClusterizer/interface/SiPixelArrayBuffer.h"
 
 // Parameter Set:
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
@@ -56,7 +56,7 @@
 #include <vector>
 
 
-class dso_hidden PixelThresholdClusterizer final : public PixelClusterizerBase {
+class PixelThresholdClusterizer final : public PixelClusterizerBase {
  public:
 
   PixelThresholdClusterizer(edm::ParameterSet const& conf);

diff --git a/...lClusterizer/plugins/SiPixelArrayBuffer.h → ...lusterizer/interface/SiPixelArrayBuffer.h b/...lClusterizer/plugins/SiPixelArrayBuffer.h → ...lusterizer/interface/SiPixelArrayBuffer.h
diff --git a/RecoLocalTracker/SiPixelClusterizer/plugins/BuildFile.xml b/RecoLocalTracker/SiPixelClusterizer/plugins/BuildFile.xml
@@ -1,9 +1,5 @@
-<use   name="DataFormats/Common"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="DataFormats/SiPixelDetId"/>
-<use   name="DataFormats/SiPixelCluster"/>
 <use   name="boost_serialization"/>
-<use   name="CalibTracker/SiPixelESProducers"/>
+<use   name="RecoLocalTracker/SiPixelClusterizer"/>
 <library   file="*.cc" name="RecoLocalTrackerSiPixelClusterizerPlugins">
   <flags   EDM_PLUGIN="1"/>
 </library>
diff --git a/RecoLocalTracker/SiPixelClusterizer/plugins/SiPixelClusterProducer.cc b/RecoLocalTracker/SiPixelClusterizer/plugins/SiPixelClusterProducer.cc
@@ -13,7 +13,7 @@
 
 // Our own stuff
 #include "SiPixelClusterProducer.h"
-#include "PixelThresholdClusterizer.h"
+#include "RecoLocalTracker/SiPixelClusterizer/interface/PixelThresholdClusterizer.h"
 
 // Geometry
 #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"

diff --git a/RecoLocalTracker/SiPixelClusterizer/plugins/SiPixelClusterProducer.h b/RecoLocalTracker/SiPixelClusterizer/plugins/SiPixelClusterProducer.h
@@ -28,7 +28,7 @@
 //!
 //---------------------------------------------------------------------------
 
-#include "PixelClusterizerBase.h"
+#include "RecoLocalTracker/SiPixelClusterizer/interface/PixelClusterizerBase.h"
 
 //#include "Geometry/CommonDetUnit/interface/TrackingGeometry.h"
 

diff --git a/...izer/plugins/PixelThresholdClusterizer.cc → ...sterizer/src/PixelThresholdClusterizer.cc b/...izer/plugins/PixelThresholdClusterizer.cc → ...sterizer/src/PixelThresholdClusterizer.cc
@@ -20,8 +20,8 @@
 //----------------------------------------------------------------------------
 
 // Our own includes
-#include "PixelThresholdClusterizer.h"
-#include "SiPixelArrayBuffer.h"
+#include "RecoLocalTracker/SiPixelClusterizer/interface/PixelThresholdClusterizer.h"
+#include "RecoLocalTracker/SiPixelClusterizer/interface/SiPixelArrayBuffer.h"
 #include "CondFormats/SiPixelObjects/interface/SiPixelGainCalibrationOffline.h"
 // Geometry
 #include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h"