Merge branch 'master' into LocalDev

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

diff --git a/PHOS/AliPHOSClusterizer.cxx b/PHOS/AliPHOSClusterizer.cxx
index 381624be23ee5428dbd8dfd74627d7192cfe055a..77fce84bdece2ff7701f5663e9f6176883c4b6d1 100644 (file)
--- a/PHOS/AliPHOSClusterizer.cxx
+++ b/PHOS/AliPHOSClusterizer.cxx
@@ -28,6 +28,8 @@
 
 ClassImp(AliPHOSClusterizer)
 
+AliPHOSCalibData * AliPHOSClusterizer::fgCalibData  = 0 ; 
+
 //____________________________________________________________________________
 AliPHOSClusterizer::AliPHOSClusterizer():
   fGeom(NULL),
@@ -37,6 +39,11 @@ AliPHOSClusterizer::AliPHOSClusterizer():
   fCPVRecPoints(0)
 {
   // ctor
+  fDigitsArr    = new TClonesArray("AliPHOSDigit",100);
+  fEMCRecPoints = new TObjArray(100) ;
+  fEMCRecPoints ->SetName("EMCRECPOINTS") ;
+  fCPVRecPoints = new TObjArray(100) ;
+  fCPVRecPoints ->SetName("CPVRECPOINTS") ;
 }
 
 //____________________________________________________________________________
@@ -48,7 +55,11 @@ AliPHOSClusterizer::AliPHOSClusterizer(AliPHOSGeometry *geom):
   fCPVRecPoints(0)
 {
   // ctor
- 
+  fDigitsArr    = new TClonesArray("AliPHOSDigit",100);
+  fEMCRecPoints = new TObjArray(100) ;
+  fEMCRecPoints ->SetName("EMCRECPOINTS") ;
+  fCPVRecPoints = new TObjArray(100) ;
+  fCPVRecPoints ->SetName("CPVRECPOINTS") ;
 }
 
 //____________________________________________________________________________
@@ -79,7 +90,7 @@ void AliPHOSClusterizer::SetInput(TTree * digitsTree)
     AliError("can't get the branch with the PHOS digits !");
     return;
   }
-  fDigitsArr = new TClonesArray("AliPHOSDigit",100);
+  fDigitsArr->Clear("C");
   branch->SetAddress(&fDigitsArr);
   branch->GetEntry(0);
 }
@@ -93,14 +104,10 @@ void AliPHOSClusterizer::SetOutput(TTree * clustersTree)
   fTreeR = clustersTree;
 
   AliDebug(9, "Making array for EMC clusters");
-  fEMCRecPoints = new TObjArray(100) ;
-  fEMCRecPoints->SetName("EMCRECPOINTS") ;
   Int_t split = 0;
   Int_t bufsize = 32000;
   fTreeR->Branch("PHOSEmcRP", "TObjArray", &fEMCRecPoints, bufsize, split);
 
   AliDebug(9, "Making array for CPV clusters");
-  fCPVRecPoints = new TObjArray(100) ;
-  fCPVRecPoints->SetName("CPVRECPOINTS") ;
   fTreeR->Branch("PHOSCpvRP", "TObjArray", &fCPVRecPoints, bufsize, split);
 }