X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=HLT%2FPHOS%2FAliHLTPHOSClusterizerComponent.cxx;h=d4254652f837ba588e29027646369cc79a8cd4eb;hb=e8e7f17efbb765725f413cebe06c46ddcaab3629;hp=47ccdf4995e3156353a6358b30fe91eca22ad77a;hpb=98baf84d7cad2eb40b8d92bf6611a8ef8a84f03e;p=u%2Fmrichter%2FAliRoot.git

diff --git a/HLT/PHOS/AliHLTPHOSClusterizerComponent.cxx b/HLT/PHOS/AliHLTPHOSClusterizerComponent.cxx
index 47ccdf4995e..d4254652f83 100644
--- a/HLT/PHOS/AliHLTPHOSClusterizerComponent.cxx
+++ b/HLT/PHOS/AliHLTPHOSClusterizerComponent.cxx
@@ -38,6 +38,8 @@
 // visit http://web.ift.uib.no/~kjeks/doc/alice-hlt
 #include "AliHLTCaloDefinitions.h"
 #include "AliHLTPHOSGeometry.h"
+#include "AliHLTPHOSRecoParamHandler.h"
+#include "AliHLTCaloClusterizer.h"
 
 AliHLTPHOSClusterizerComponent gAliHLTPHOSClusterizerComponent;
 
@@ -50,8 +52,6 @@ AliHLTPHOSClusterizerComponent::AliHLTPHOSClusterizerComponent():
 
   //AliHLTPHOSGeometry *geom = new AliHLTPHOSGeometry;
   
-  fAnalyserPtr->SetGeometry(new AliHLTPHOSGeometry);
-  
 }
 
 AliHLTPHOSClusterizerComponent::~AliHLTPHOSClusterizerComponent()
@@ -71,7 +71,7 @@ AliHLTComponentDataType
 AliHLTPHOSClusterizerComponent::GetOutputDataType()
 {
   //See headerfile for documentation
-  return AliHLTCaloDefinitions::fgkRecPointDataType|kAliHLTDataOriginPHOS;
+  return kAliHLTDataTypeCaloCluster|kAliHLTDataOriginPHOS;
 }
 
 void
@@ -83,7 +83,6 @@ AliHLTPHOSClusterizerComponent::GetOutputDataSize(unsigned long& constBase, doub
   inputMultiplier = 2.0;
 }
 
-
 const Char_t*
 AliHLTPHOSClusterizerComponent::GetComponentID()
 {
@@ -98,3 +97,32 @@ AliHLTPHOSClusterizerComponent::Spawn()
 
   return new AliHLTPHOSClusterizerComponent();
 }
+
+int AliHLTPHOSClusterizerComponent::DoInit(int argc, const char** argv)
+{
+   
+   fClusterizerPtr = new AliHLTCaloClusterizer("PHOS");
+   
+   fRecoParamsPtr = new AliHLTPHOSRecoParamHandler(); 
+    
+    return AliHLTCaloClusterizerComponent::DoInit(argc, argv);
+}
+
+int AliHLTPHOSClusterizerComponent::DoDeinit()
+{
+    if(fRecoParamsPtr) 
+    {
+       delete fRecoParamsPtr;
+       fRecoParamsPtr = 0;
+    }
+    return AliHLTCaloClusterizerComponent::DoDeinit();
+}
+
+
+Int_t AliHLTPHOSClusterizerComponent::InitialiseGeometry()
+{
+ 
+  fAnalyserPtr->SetGeometry(new AliHLTPHOSGeometry);
+ 
+  return 0;
+}