Use TList::Delete, change some output

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

diff --git a/EVE/alice-macros/acorde_hits.C b/EVE/alice-macros/acorde_hits.C
index 040fab42eef006756f4d336315b1998efece4b68..f437fbfa7c3adcf47f111fd6770b7a9c4b3ca534 100644 (file)
--- a/EVE/alice-macros/acorde_hits.C
+++ b/EVE/alice-macros/acorde_hits.C
@@ -1,43 +1,44 @@
 // $Id$
+// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007
 
-Reve::PointSet*
-acorde_hits(const char *varexp    = "ACORDE.fX:ACORDE.fY:ACORDE.fZ",
-        const char *selection = "",
-         Reve::RenderElement* cont = 0)
+/**************************************************************************
+ * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. *
+ * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for          *
+ * full copyright notice.                                                 *
+ **************************************************************************/
+
+TEvePointSet*
+acorde_hits(const char  *varexp    = "ACORDE.fX:ACORDE.fY:ACORDE.fZ",
+           const char  *selection = "",
+           TEveElement *cont      = 0)
 {
-  AliRunLoader* rl =  Alieve::Event::AssertRunLoader();
+  AliRunLoader* rl =  AliEveEventManager::AssertRunLoader();
   rl->LoadHits("ACORDE");
 
   TTree* ht = rl->GetTreeH("ACORDE", false);
-  
-  //PH The line below is replaced waiting for a fix in Root
-  //PH which permits to use variable siza arguments in CINT
-  //PH on some platforms (alphalinuxgcc, solariscc5, etc.)
-  //PH  Reve::PointSet* points = new Reve::PointSet(Form("ACORDE Hits '%s'", selection));
-  char form[1000];
-  sprintf(form,"ACORDE Hits '%s'", selection);
-  Reve::PointSet* points = new Reve::PointSet(form);
-
-  TPointSelector ps(ht, points, varexp, selection);
+
+  TEvePointSet* points = new TEvePointSet(Form("ACORDE Hits '%s'", selection));
+
+  TEvePointSelector ps(ht, points, varexp, selection);
   ps.Select();
 
-  if(points->Size() == 0 && gReve->GetKeepEmptyCont() == kFALSE) {
+  if(points->Size() == 0 && gEve->GetKeepEmptyCont() == kFALSE)
+  {
     Warning("acorde_hits", Form("No hits match '%s'", selection));
     delete points;
-   return 0;
+    return 0;
   }
 
-  //PH  points->SetTitle(Form("N=%d", points->Size()));
-  sprintf(form,"N=%d", points->Size());
-  points->SetTitle(form);
+  points->SetName(Form("ACORDE Hits"));
+  const TString viz_tag("SIM Hits ACORDE");
+  points->ApplyVizTag(viz_tag, "Hits");
+
+  points->SetTitle(Form("N=%d", points->Size()));
   points->SetMarkerSize(.5);
-  points->SetMarkerColor((Color_t)2);
+  points->SetMarkerColor(2);
 
-  if(cont)
-    gReve->AddRenderElement(cont, points);
-  else 
-    gReve->AddRenderElement(points);
-  gReve->Redraw3D();
+  gEve->AddElement(points, cont);
+  gEve->Redraw3D();
 
   return points;
 }