Test on PHOSloader existence added to destr.

[u/mrichter/AliRoot.git] / PHOS / AliPHOSClusterizer.cxx

diff --git a/PHOS/AliPHOSClusterizer.cxx b/PHOS/AliPHOSClusterizer.cxx
index 214f6a787a9ef58acaa0cc6738e1af060fd6076f..4fc4ab46d19a0b59c3c6d6cabeed72d0927c4a1b 100644 (file)
--- a/PHOS/AliPHOSClusterizer.cxx
+++ b/PHOS/AliPHOSClusterizer.cxx
@@ -22,22 +22,12 @@
 //////////////////////////////////////////////////////////////////////////////
 
 // --- ROOT system ---
-#include "TGeometry.h"
-#include "TDirectory.h"
-#include "TFile.h"
-#include "TTree.h"
 
 // --- Standard library ---
-#include <iostream.h>
-#include <stdlib.h>   
 
 // --- AliRoot header files ---
-#include "AliRun.h" 
 #include "AliPHOSClusterizer.h"
-#include "AliHeader.h" 
-#include "AliPHOSGetter.h"
-#include "AliPHOSSDigitizer.h"
-#include "AliPHOSDigitizer.h"
+#include "AliPHOSGetter.h" 
 
 ClassImp(AliPHOSClusterizer)
 
@@ -45,19 +35,22 @@ ClassImp(AliPHOSClusterizer)
   AliPHOSClusterizer::AliPHOSClusterizer():TTask("","")
 {
   // ctor
-  fSplitFile= 0 ; 
-  fToSplit  = kFALSE ;
 
+  fEventFolderName = "" ; 
+  fFirstEvent = 0 ; 
+  fLastEvent  = -1 ; 
 }
 
 //____________________________________________________________________________
-AliPHOSClusterizer::AliPHOSClusterizer(const char* headerFile, const char* name, const Bool_t toSplit):
-TTask(name, headerFile)
+AliPHOSClusterizer::AliPHOSClusterizer(const TString alirunFileName, 
+                                      const TString eventFolderName):
+  TTask("PHOS"+AliConfig::Instance()->GetReconstructionerTaskName(), 
+       alirunFileName), fEventFolderName(eventFolderName)
 {
   // ctor
-  fToSplit  = toSplit ;
-  fSplitFile= 0 ; 
-
+ 
+  fFirstEvent = 0 ; 
+  fLastEvent  = -1 ; 
 }
 
 //____________________________________________________________________________
@@ -65,7 +58,9 @@ AliPHOSClusterizer::~AliPHOSClusterizer()
 {
   // dtor
          
-  fSplitFile = 0 ; 
+ //Remove this from the parental task before destroying
+  if(AliPHOSGetter::Instance()->PhosLoader())
+    AliPHOSGetter::Instance()->PhosLoader()->CleanReconstructioner();
 }