Convert segmentations to DD4hep handles

DDCore/include/DD4hep/Segmentations.h

@@ -110,16 +110,24 @@ namespace DD4hep {
       /// Standard constructor
       SegmentationImplementation(DDSegmentation::BitField64* decoder);
       /// Default destructor
-      virtual ~SegmentationImplementation() {}
+      virtual ~SegmentationImplementation();
     };
 
+    /// Standard constructor
     template <typename IMP> inline
-    SegmentationImplementation<IMP>::SegmentationImplementation(DDSegmentation::BitField64* decoder)
-      :  SegmentationObject(0), implementation(decoder)
+    SegmentationImplementation<IMP>::SegmentationImplementation(DDSegmentation::BitField64* decode)
+      :  SegmentationObject(0), implementation(decode)
     {
       this->segmentation = &implementation;
     }
     
+    /// Default destructor
+    template <typename IMP> inline
+    SegmentationImplementation<IMP>::~SegmentationImplementation()
+    {
+      this->segmentation = 0; // Prevent deletion! We have the object aggregated!
+    }
+    
     /// Handle class supporting generic Segmentation of sensitive detectors
     /**
      *

DDCore/src/Segmentations.cpp

@@ -122,24 +122,24 @@ void SegmentationObject::neighbours(const CellID& cell, std::set<CellID>& nb) co
 }
 
 /// Constructor to used when creating a new object
-Segmentation::Segmentation(const string& typ, const string& nam, BitField64* decoder) : Handle<Implementation>()
+Segmentation::Segmentation(const string& typ, const string& nam, BitField64* dec) : Handle<Implementation>()
 {
   string type = "segmentation_constructor__"+typ;
-  SegmentationObject* obj = PluginService::Create<SegmentationObject*>(type, decoder);
+  SegmentationObject* obj = PluginService::Create<SegmentationObject*>(type, dec);
   if ( obj != 0 )  {
     assign(obj, nam, typ);
     if ( !nam.empty() ) obj->setName(nam);
+    return;
   }
 #if 0
   BaseSegmentation* s = DDSegmentation::SegmentationFactory::instance()->create(typ);
   if (s != 0) {
     assign(new Object(s), nam, "");
     if ( !nam.empty() ) s->setName(nam);
+    return;
   }
 #endif
-  else {
-    throw runtime_error("FAILED to create segmentation: " + typ + ". Missing factory method for: " + typ + "!");
-  }
+  except("Segmentation","FAILED to create segmentation: %s. [Missing factory]",typ.c_str());
 }
 
 /// Accessor: Segmentation type