Remove deps from ClassReuse

sean-de-courcy · Sep 26, 2005 · 23bb2a5 · 23bb2a5
1 parent d7219e4
commit 23bb2a5
Show file tree

Hide file tree

Showing 17 changed files with 53 additions and 54 deletions.
diff --git a/MagneticField/GeomBuilder/BuildFile b/MagneticField/GeomBuilder/BuildFile
@@ -7,6 +7,7 @@
  <use name=MagneticField/Interpolation>
  <use name=DetectorDescription/Core>
  <use name=Geometry/Surface>
+ <use name=Utilities/BinningTools>
 </export>
 
 <use name=clhep>
@@ -15,4 +16,6 @@
 <use name=MagneticField/Interpolation>
 <use name=DetectorDescription/Core>
 <use name=Geometry/Surface>
+<use name=Utilities/BinningTools>
+
 #<Flags SEAL_PLUGIN_NAME="GeomBuilder">
diff --git a/MagneticField/GeomBuilder/interface/MagGeometry.h b/MagneticField/GeomBuilder/interface/MagGeometry.h
@@ -4,15 +4,15 @@
 /** \class MagGeometry
  *  Entry point to the geometry of magnetic volumes.
  *
- *  $Date: 2004/06/22 17:05:10 $
- *  $Revision: 1.5 $
+ *  $Date: 2005/09/06 15:48:07 $
+ *  $Revision: 1.1 $
  *  \author N. Amapane - INFN Torino
  */
 
 #include "Geometry/Surface/interface/BoundPlane.h"
 #include "MagneticField/Layers/src/MagBinFinders.h"
 /* #include "Utilities/Notification/interface/Singleton.h" */
-#include "DetectorDescription/Base/interface/Singleton.h"
+//#include "DetectorDescription/Base/interface/Singleton.h"
 #include <vector>
 
 class MagBLayer;
@@ -27,6 +27,9 @@ class MagGeometry {
   typedef Surface::GlobalVector   GlobalVector;
   typedef Surface::GlobalPoint    GlobalPoint;
 
+  /// Constructor
+  MagGeometry();
+
   /// Destructor
   ~MagGeometry();
 
@@ -41,9 +44,7 @@ class MagGeometry {
   const std::vector<MagVolume6Faces*> & endcapVolumes() {return theEVolumes;}
 
 private:
-  /// Constructor; allow construction from a Singleton only.
-  MagGeometry();
-  friend class DDI::Singleton<MagGeometry>;
+//  friend class DDI::Singleton<MagGeometry>;
 
   friend class MagGeometryExerciser; // for debug purposes
 

diff --git a/MagneticField/GeomBuilder/src/MagGeoBuilderFromDDD.cc b/MagneticField/GeomBuilder/src/MagGeoBuilderFromDDD.cc
@@ -3,8 +3,8 @@
 /*
  *  See header file for a description of this class.
  *
- *  $Date: 2005/08/03 19:28:22 $
- *  $Revision: 1.13 $
+ *  $Date: 2005/09/06 15:48:28 $
+ *  $Revision: 1.1 $
  *  \author N. Amapane - INFN Torino
  */
 
@@ -28,7 +28,7 @@
 #include "DetectorDescription/Core/interface/DDFilteredView.h"
 #include "DetectorDescription/Core/interface/DDFilter.h"
 
-#include "ClassReuse/BinningTools/interface/ClusterizingHistogram.h"
+#include "Utilities/BinningTools/interface/ClusterizingHistogram.h"
 #include "CLHEP/Units/SystemOfUnits.h"
 
 #include "MagneticField/Interpolation/interface/MagProviderInterpol.h"
@@ -48,7 +48,7 @@
 #include <iterator>
 #include <map>
 #include <set>
-#include "MagneticField/GeomBuilder/src/precomputed_value_sort.h"
+#include "Utilities/General/interface/precomputed_value_sort.h"
 
 
 using namespace std;

diff --git a/MagneticField/GeomBuilder/src/MagGeometry.cc b/MagneticField/GeomBuilder/src/MagGeometry.cc
@@ -3,8 +3,8 @@
 /*
  *  See header file for a description of this class.
  *
- *  $Date: 2004/09/09 17:27:25 $
- *  $Revision: 1.6 $
+ *  $Date: 2005/09/06 15:48:28 $
+ *  $Revision: 1.1 $
  *  \author N. Amapane - INFN Torino
  */
 
@@ -17,7 +17,7 @@
 
 // #include "Utilities/Notification/interface/TimingReport.h"
 // #include "Utilities/UI/interface/SimpleConfigurable.h"
-#include "ClassReuse/BinningTools/interface/PeriodicBinFinderInPhi.h"
+#include "Utilities/BinningTools/interface/PeriodicBinFinderInPhi.h"
 
 #include "MagneticField/Layers/interface/MagVerbosity.h"
 

diff --git a/MagneticField/GeomBuilder/src/bLayer.cc b/MagneticField/GeomBuilder/src/bLayer.cc
@@ -3,8 +3,8 @@
 /*
  *  See header file for a description of this class.
  *
- *  $Date: 2005/07/29 13:18:00 $
- *  $Revision: 1.9 $
+ *  $Date: 2005/09/06 15:48:28 $
+ *  $Revision: 1.1 $
  *  \author N. Amapane - INFN Torino
  */
 
@@ -13,7 +13,7 @@
 #include "MagneticField/Layers/interface/MagBLayer.h"
 #include "MagneticField/Layers/interface/MagVerbosity.h"
 
-#include "MagneticField/GeomBuilder/src/precomputed_value_sort.h"
+#include "Utilities/General/interface/precomputed_value_sort.h"
 
 using namespace SurfaceOrientation;
 

diff --git a/MagneticField/GeomBuilder/src/bRod.cc b/MagneticField/GeomBuilder/src/bRod.cc
@@ -3,16 +3,16 @@
 /*
  *  See header file for a description of this class.
  *
- *  $Date: 2005/04/11 17:17:05 $
- *  $Revision: 1.4 $
+ *  $Date: 2005/09/06 15:48:28 $
+ *  $Revision: 1.1 $
  *  \author N. Amapane - INFN Torino
  */
 
 #include "MagneticField/GeomBuilder/src/bRod.h"
-#include "ClassReuse/BinningTools/interface/ClusterizingHistogram.h"
+#include "Utilities/BinningTools/interface/ClusterizingHistogram.h"
 #include "MagneticField/Layers/interface/MagBRod.h"
 #include "MagneticField/Layers/interface/MagVerbosity.h"
-#include "MagneticField/GeomBuilder/src/precomputed_value_sort.h"
+#include "Utilities/General/interface/precomputed_value_sort.h"
 
 using namespace SurfaceOrientation;
 

diff --git a/MagneticField/GeomBuilder/src/bSector.cc b/MagneticField/GeomBuilder/src/bSector.cc
@@ -3,17 +3,17 @@
 /*
  *  See header file for a description of this class.
  *
- *  $Date: 2005/04/11 17:17:05 $
- *  $Revision: 1.4 $
+ *  $Date: 2005/09/06 15:48:28 $
+ *  $Revision: 1.1 $
  *  \author N. Amapane - INFN Torino
  */
 
 #include "MagneticField/GeomBuilder/src/bSector.h"
-#include "ClassReuse/BinningTools/interface/ClusterizingHistogram.h"
+#include "Utilities/BinningTools/interface/ClusterizingHistogram.h"
 #include "MagneticField/Layers/interface/MagBSector.h"
 #include "MagneticField/Layers/interface/MagVerbosity.h"
 
-#include "MagneticField/GeomBuilder/src/precomputed_value_sort.h"
+#include "Utilities/General/interface/precomputed_value_sort.h"
 
 using namespace SurfaceOrientation;
 using namespace std;

diff --git a/MagneticField/GeomBuilder/src/bSlab.cc b/MagneticField/GeomBuilder/src/bSlab.cc
@@ -3,8 +3,8 @@
 /*
  *  See header file for a description of this class.
  *
- *  $Date: 2005/07/29 13:18:00 $
- *  $Revision: 1.6 $
+ *  $Date: 2005/09/06 15:48:28 $
+ *  $Revision: 1.1 $
  *  \author N. Amapane - INFN Torino
  */
 
@@ -13,7 +13,7 @@
 #include "MagneticField/Layers/interface/MagBSlab.h"
 #include "MagneticField/Layers/interface/MagVerbosity.h"
 
-#include "MagneticField/GeomBuilder/src/precomputed_value_sort.h"
+#include "Utilities/General/interface/precomputed_value_sort.h"
 
 using namespace SurfaceOrientation;
 using namespace std;

diff --git a/MagneticField/GeomBuilder/src/eLayer.cc b/MagneticField/GeomBuilder/src/eLayer.cc
@@ -3,16 +3,16 @@
 /*
  *  See header file for a description of this class.
  *
- *  $Date: 2005/07/29 13:18:00 $
- *  $Revision: 1.7 $
+ *  $Date: 2005/09/06 15:48:28 $
+ *  $Revision: 1.1 $
  *  \author N. Amapane - INFN Torino
  */
 
 #include "MagneticField/GeomBuilder/src/eLayer.h"
 #include "MagneticField/VolumeGeometry/interface/MagVolume6Faces.h"
 #include "MagneticField/Layers/interface/MagELayer.h"
 
-#include "MagneticField/GeomBuilder/src/precomputed_value_sort.h"
+#include "Utilities/General/interface/precomputed_value_sort.h"
 
 using namespace SurfaceOrientation;
 using namespace std;

diff --git a/MagneticField/GeomBuilder/src/eSector.cc b/MagneticField/GeomBuilder/src/eSector.cc
@@ -3,21 +3,21 @@
 /*
  *  See header file for a description of this class.
  *
- *  $Date: 2005/04/11 17:17:05 $
- *  $Revision: 1.4 $
+ *  $Date: 2005/09/06 15:48:28 $
+ *  $Revision: 1.1 $
  *  \author N. Amapane - INFN Torino
  */
 
 #include "MagneticField/GeomBuilder/src/eSector.h"
-#include "ClassReuse/BinningTools/interface/ClusterizingHistogram.h"
+#include "Utilities/BinningTools/interface/ClusterizingHistogram.h"
 #include "MagneticField/Layers/interface/MagESector.h"
 #include "MagneticField/Layers/interface/MagVerbosity.h"
 
 using namespace SurfaceOrientation;
 using namespace std;
 
 #include <algorithm>
-#include "MagneticField/GeomBuilder/src/precomputed_value_sort.h"
+#include "Utilities/General/interface/precomputed_value_sort.h"
 
 // The ctor is in charge of finding layers inside the sector.
 MagGeoBuilderFromDDD::eSector::eSector(handles::const_iterator begin,

diff --git a/MagneticField/GeomBuilder/src/volumeHandle.cc b/MagneticField/GeomBuilder/src/volumeHandle.cc
@@ -3,8 +3,8 @@
 /*
  *  See header file for a description of this class.
  *
- *  $Date: 2005/07/29 13:49:20 $
- *  $Revision: 1.7 $
+ *  $Date: 2005/09/06 15:48:29 $
+ *  $Revision: 1.1 $
  *  \author N. Amapane - INFN Torino
  */
 
@@ -18,9 +18,6 @@
 #include "Geometry/Surface/interface/Plane.h"
 #include "Geometry/Surface/interface/Cylinder.h"
 #include "Geometry/Surface/interface/Cone.h"
-// #include "ClassReuse/SurfaceGeometry/interface/SimpleCylinderBounds.h"
-// #include "ClassReuse/SurfaceGeometry/interface/SimpleCylinderBounds.h"
-// #include "ClassReuse/SurfaceGeometry/interface/SimpleConeBounds.h"
 #include "Geometry/Vector/interface/CoordinateSets.h"
 
 #include "CLHEP/Units/SystemOfUnits.h"

diff --git a/MagneticField/GeomBuilder/src/volumeHandle.h b/MagneticField/GeomBuilder/src/volumeHandle.h
@@ -7,10 +7,8 @@
  * One instance is created for each DDVolume. The parameters of the 
  * boundary surfaces are calculated during construction.
  *
- *  $Date: 2005/07/29 13:49:20 $
- *  $Revision: 1.9 $
- *  $Date: 2005/07/29 13:49:20 $
- *  $Revision: 1.9 $
+ *  $Date: 2005/09/06 15:48:29 $
+ *  $Revision: 1.1 $
  *  \author N. Amapane - INFN Torino
  */
 

diff --git a/MagneticField/Interpolation/BuildFile b/MagneticField/Interpolation/BuildFile
@@ -1,10 +1,10 @@
 
 <export>
  <lib name=MagneticFieldInterpolation>
- <use name=MagneticField/VolumeGeometry>
+#<use name=MagneticField/VolumeGeometry>
  <use name=Geometry/Surface>
 </export>
 
-<use name=MagneticField/VolumeGeometry>
+#<use name=MagneticField/VolumeGeometry>
 <use name=Geometry/Surface>
 
diff --git a/MagneticField/Layers/BuildFile b/MagneticField/Layers/BuildFile
@@ -2,11 +2,11 @@
 <export>
  <lib name=MagneticFieldLayers>
  <use name=MagneticField/VolumeGeometry>
- <use name=ClassReuse/BinningTools>
+# <use name=Utilities/BinningTools>
  <use name=boost>
 </export>
 
 <use name=MagneticField/VolumeGeometry>
-<use name=ClassReuse/BinningTools>
+#<use name=Utilities/BinningTools>
 <use name=boost>
 
diff --git a/MagneticField/Layers/src/MagBLayer.cc b/MagneticField/Layers/src/MagBLayer.cc
@@ -3,15 +3,15 @@
 /*
  *  See header file for a description of this class.
  *
- *  $Date: 2005/04/14 17:35:33 $
- *  $Revision: 1.3 $
+ *  $Date: 2005/09/06 15:49:19 $
+ *  $Revision: 1.1 $
  *  \author N. Amapane - INFN Torino
  */
 
 #include "MagneticField/Layers/interface/MagBLayer.h"
 #include "MagneticField/Layers/interface/MagBSector.h"
 #include "MagneticField/VolumeGeometry/interface/MagVolume.h"
-#include "ClassReuse/BinningTools/interface/PeriodicBinFinderInPhi.h"
+#include "Utilities/BinningTools/interface/PeriodicBinFinderInPhi.h"
 #include "Geometry/Vector/interface/Phi.h"
 
 //#include "MagneticField/Layers/interface/MagVerbosity.h"

diff --git a/MagneticField/Layers/src/MagBinFinders.h b/MagneticField/Layers/src/MagBinFinders.h
@@ -15,12 +15,12 @@ namespace MagBinFinders {
 /** \class GeneralBinFinderInR
  *  A R binfinder for a non-periodic group of detectors.
  *
- *  $Date: 2004/05/26 13:56:42 $
+ *  $Date: 2005/09/06 15:49:19 $
  *  $Revision: 1.1 $
  *  \author N. Amapane - INFN Torino
  */
 
-#include "ClassReuse/BinningTools/interface/BaseBinFinder.h"
+#include "Utilities/BinningTools/interface/BaseBinFinder.h"
 //#include "CommonReco/DetLayers/interface/RBorderFinder.h"
 #include <cmath>
 #include <vector>
@@ -108,7 +108,7 @@ class MagBinFinders::GeneralBinFinderInR : public BaseBinFinder<T>{
  * It is not particularily suited for very few bins...
  */
 
-#include "ClassReuse/BinningTools/interface/BaseBinFinder.h"
+#include "Utilities/BinningTools/interface/BaseBinFinder.h"
 #include <cmath>
 
 template <class T>

diff --git a/Utilities/BinningTools/interface/PeriodicBinFinderInPhi.h b/Utilities/BinningTools/interface/PeriodicBinFinderInPhi.h
@@ -1,7 +1,7 @@
 #ifndef PeriodicBinFinderInPhi_H
 #define PeriodicBinFinderInPhi_H
 
-#include "ClassReuse/BinningTools/interface/BaseBinFinder.h"
+#include "Utilities/BinningTools/interface/BaseBinFinder.h"
 
 #include <cmath>