Add more segmentation handle implementations

DDCore/include/DD4hep/CartesianGridXY.h

@@ -15,7 +15,7 @@
 #define DD4HEP_DDCORE_CARTESIANGRIDXY_H 1
 
 // Framework include files
-#include "DD4hep/Segmentations.h"
+#include "DD4hep/Objects.h"
 
 /// Namespace for the AIDA detector description toolkit
 namespace DD4hep {
@@ -26,6 +26,9 @@ namespace DD4hep {
   /// Namespace for the geometry part of the AIDA detector description toolkit
   namespace Geometry {
 
+    // Forward declarations
+    class Segmentation;
+    
     /// Implementation class for the grid XY segmentation.
     /**
      * \author  M.Frank

DDCore/src/CartesianGridXY.cpp

@@ -12,7 +12,6 @@
 //==========================================================================
 
 // Framework include files
-#include "DD4hep/Handle.inl"
 #include "DD4hep/Segmentations.h"
 #include "DD4hep/CartesianGridXY.h"
 #include "DDSegmentation/CartesianGridXY.h"
@@ -20,12 +19,8 @@
 // C/C++ include files
 
 using namespace std;
-using namespace DD4hep;
 using namespace DD4hep::Geometry;
 
-/// Instantiate handle functions
-DD4HEP_INSTANTIATE_HANDLE_UNNAMED(CartesianGridXY::Object);
-
 /// Copy Constructor from segmentation base object
 CartesianGridXY::CartesianGridXY(const Segmentation& e) : Handle<Object>()
 {
@@ -38,9 +33,9 @@ Position CartesianGridXY::position(const CellID& id) const   {
 }
 
 /// determine the cell ID based on the position
-CellID CartesianGridXY::cellID(const Position& local,
-                               const Position& global,
-                               const VolumeID& volID) const
+DD4hep::CellID CartesianGridXY::cellID(const Position& local,
+                                       const Position& global,
+                                       const VolumeID& volID) const
 {
   return access()->cellID(local, global, volID);
 }

DDCore/src/Segmentations.cpp

@@ -15,8 +15,8 @@
 // Framework include files
 #include "DD4hep/Segmentations.h"
 #include "DD4hep/InstanceCount.h"
-#include "DD4hep/Handle.inl"
 #include "DD4hep/Printout.h"
+#include "DD4hep/Handle.inl"
 
 // C/C++ include files
 #include <iostream>
@@ -172,6 +172,7 @@ namespace DD4hep {
 } /* End namespace DD4hep                */
 
 #define IMPLEMENT_SEGMENTATION_HANDLE(X)                                \
+  DD4HEP_INSTANTIATE_HANDLE_UNNAMED(DDSegmentation::X);                 \
   namespace DD4hep { namespace Geometry {                               \
       template DDSegmentation::X*                                       \
       Segmentation::get<DDSegmentation::X>(const Object* obj); }}