Merge of EVE-dev branch.

[u/mrichter/AliRoot.git] / EVE / alice-macros / tpc_clusters.C

diff --git a/EVE/alice-macros/tpc_clusters.C b/EVE/alice-macros/tpc_clusters.C
index a91614ab159c062064e7a7553eaf8407960b0455..5891f1d6d953f3170845244df11571355271d7ff 100644 (file)
--- a/EVE/alice-macros/tpc_clusters.C
+++ b/EVE/alice-macros/tpc_clusters.C
@@ -6,19 +6,17 @@
  * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for          *
  * full copyright notice.                                                 *
  **************************************************************************/
+
 #ifdef __CINT__
 
-namespace TEveUtil
-{
 class TEveElement;
 class TEvePointSet;
-}
 
 #else
 
 #include <TEveManager.h>
 #include <TEvePointSet.h>
-#include <Alieve/AliEveEventManager.h>
+#include <EveBase/AliEveEventManager.h>
 
 #include <AliRunLoader.h>
 #include <AliCluster.h>
@@ -32,29 +30,34 @@ TEvePointSet* tpc_clusters(TEveElement* cont=0, Float_t maxR=270)
 
   AliEveEventManager::AssertGeometry();
 
-  TEvePointSet* clusters = new TEvePointSet(kMaxCl);
-  clusters->SetOwnIds(kTRUE);
-
   AliRunLoader* rl = AliEveEventManager::AssertRunLoader();
   rl->LoadRecPoints("TPC");
 
-  AliTPCClustersRow *clrow=new AliTPCClustersRow();
+  TTree *cTree = rl->GetTreeR("TPC", false);
+  if (cTree == 0)
+    return 0;
+
+  AliTPCClustersRow *clrow = new AliTPCClustersRow();
   clrow->SetClass("AliTPCclusterMI");
   clrow->SetArray(kMaxCl);
-
-  TTree *cTree = rl->GetTreeR("TPC", false);
   cTree->SetBranchAddress("Segment", &clrow);
 
+  TEvePointSet* clusters = new TEvePointSet(kMaxCl);
+  clusters->SetOwnIds(kTRUE);
+
+
   Float_t maxRsqr = maxR*maxR;
-  TClonesArray *cl=clrow->GetArray();
   Int_t nentr=(Int_t)cTree->GetEntries();
-  for (Int_t i=0; i<nentr; i++) {
+  for (Int_t i=0; i<nentr; i++)
+  {
     if (!cTree->GetEvent(i)) continue;
 
-    Int_t ncl=cl->GetEntriesFast();
+    TClonesArray *cl = clrow->GetArray();
+    Int_t ncl = cl->GetEntriesFast();
 
-    while (ncl--) {
-      AliCluster *c=(AliCluster*)cl->UncheckedAt(ncl);
+    while (ncl--)
+    {
+      AliCluster *c = (AliCluster*) cl->UncheckedAt(ncl);
       Float_t g[3]; //global coordinates
       c->GetGlobalXYZ(g);
       if (g[0]*g[0]+g[1]*g[1] < maxRsqr)
@@ -69,8 +72,11 @@ TEvePointSet* tpc_clusters(TEveElement* cont=0, Float_t maxR=270)
 
   delete clrow;
 
-  if(clusters->Size() == 0 && gEve->GetKeepEmptyCont() == kFALSE) {
-    Warning("tpc_clusters", "No TPC clusters");
+  rl->UnloadRecPoints("TPC");
+
+  if (clusters->Size() == 0 && gEve->GetKeepEmptyCont() == kFALSE)
+  {
+    Warning("tpc_clusters.C", "No TPC clusters");
     delete clusters;
     return 0;
   }