Modified plots and made jet finder use SDigits

[u/mrichter/AliRoot.git] / TRD / AliTRDclusterizer.cxx

diff --git a/TRD/AliTRDclusterizer.cxx b/TRD/AliTRDclusterizer.cxx
index 58fcab22928da107e9319d728d21da2e87d009cf..d04fb07aede739ffa45a70e8d22f9dc5a3707b1e 100644 (file)
--- a/TRD/AliTRDclusterizer.cxx
+++ b/TRD/AliTRDclusterizer.cxx
@@ -69,7 +69,7 @@ AliTRDclusterizer::AliTRDclusterizer(const Text_t* name, const Text_t* title)
 }
 
 //_____________________________________________________________________________
-AliTRDclusterizer::AliTRDclusterizer(const AliTRDclusterizer &c)
+AliTRDclusterizer::AliTRDclusterizer(const AliTRDclusterizer &c):TNamed(c)
 {
   //
   // AliTRDclusterizer copy constructor
@@ -120,7 +120,10 @@ Bool_t AliTRDclusterizer::Open(const Char_t *name, Int_t nEvent)
   //
   // Opens the AliROOT file. Output and input are in the same file
   //
-  fRunLoader = AliRunLoader::Open(name);
+  TString evfoldname = AliConfig::GetDefaultEventFolderName();
+  fRunLoader = AliRunLoader::GetRunLoader(evfoldname);
+  if (!fRunLoader)
+    fRunLoader = AliRunLoader::Open(name);
   if (!fRunLoader)
    {
      Error("Open","Can not open session for file %s.",name);
@@ -160,7 +163,7 @@ Bool_t AliTRDclusterizer::OpenInput(Int_t nEvent)
   //
 
   // Connect the AliRoot file containing Geometry, Kine, and Hits
-  fRunLoader->LoadgAlice();
+  if (fRunLoader->GetAliRun() == 0x0) fRunLoader->LoadgAlice();
   gAlice = fRunLoader->GetAliRun();
 
   if (!(gAlice)) {
@@ -230,15 +233,16 @@ Bool_t AliTRDclusterizer::WriteClusters(Int_t det)
     branch->SetAddress(&detRecPoints);
     fClusterTree->Fill();
 
+    delete detRecPoints;
+
     return kTRUE;
 
   }
 
   if (det == -1) {
 
-    printf("AliTRDclusterizer::WriteClusters -- ");
-    printf("Writing the cluster tree %-18s for event %d.\n"
-         ,fClusterTree->GetName(),fEvent);
+    Info("WriteClusters","Writing the cluster tree %s for event %d."
+        ,fClusterTree->GetName(),fEvent);
     /*
     fClusterTree->Write();
     AliTRDgeometry *geo = fTRD->GetGeometry();