Reducing verbosity

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

diff --git a/EVE/alice-macros/its_hits.C b/EVE/alice-macros/its_hits.C
index a19f677378eb9b22b4122cfb170ca1a4ed091167..f643276e104865ec3c90351e8abfeb32a18d0cc9 100644 (file)
--- a/EVE/alice-macros/its_hits.C
+++ b/EVE/alice-macros/its_hits.C
@@ -1,23 +1,42 @@
 // $Id$
+// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007
 
-Reve::PointSet*
+/**************************************************************************
+ * 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*
 its_hits(const char *varexp    = "fX:fY:fZ",
         const char *selection = "",
-        Option_t *option      = "goff")
+         TEveElement* cont = 0)
 {
-  AliRunLoader* rl =  Alieve::Event::AssertRunLoader();
+  AliRunLoader* rl =  AliEveEventManager::AssertRunLoader();
   rl->LoadHits("ITS");
 
   TTree* ht = rl->GetTreeH("ITS", false);
-  ht->Draw(varexp, selection, option);
-  
-  Reve::PointSet* points =
-    new Reve::PointSet(Form("ITS Hits '%s'", selection), ht);
-  points->SetTitle(Form("N=%d", points->GetN()));
-  points->SetMarkerColor((Color_t)2);
-
-  gReve->AddRenderElement(points);
-  gReve->DrawRenderElement(points);
+
+  TEvePointSet* points = new TEvePointSet(Form("SIM Hits ITS '%s'", selection));
+
+  TEvePointSelector ps(ht, points, varexp, selection);
+  // ps.SetSubIdExp("fTrack:fStatus");
+  ps.Select();
+
+  if(points->Size() == 0 && gEve->GetKeepEmptyCont() == kFALSE) {
+    Warning("its_hits", Form("No hits match '%s'", selection));
+    delete points;
+    return 0;
+  }
+
+  points->SetTitle(Form("N=%d", points->Size()));
+
+  points->SetName("ITS Hits"));
+  const TString viz_tag("SIM Hits ITS");
+  points->ApplyVizTag(viz_tag, "Hits");
+
+  gEve->AddElement(points, cont);
+  gEve->Redraw3D();
 
   return points;
 }