alieve_init.C

-------------
Just execute VizDB_scan.C on initialization - we can do better only
with a newer root.

xyzz_clusters.C
---------------
Remove code for viz-db initialization as full viz-db is now included
from alieve_init.C.

diff --git a/EVE/alice-macros/its_clusters.C b/EVE/alice-macros/its_clusters.C
index 30875ea7f2c98620f656c998442b131f8d4fdf0b..ddfc1cdb11fcbf6db1abedcfe871eeeaac81d2de 100644 (file)
--- a/EVE/alice-macros/its_clusters.C
+++ b/EVE/alice-macros/its_clusters.C
@@ -79,15 +79,7 @@ TEvePointSet* its_clusters(TEveElement* cont=0, Float_t maxR=50)
   clusters->SetTitle(tip);
 
   const TString viz_tag("ITS Clusters");
-  if (gEve->FindVizDBEntry(viz_tag) == 0)
-  {
-    TEvePointSet* m = new TEvePointSet();
-    m->SetMarkerColor(4);
-    m->SetMarkerSize(0.2);
-    m->SetMarkerStyle(2);
-    gEve->InsertVizDBEntry(viz_tag, m);
-  }
-  // The above can be removed when going to new root - then call:
+  // When going to new root call:
   // clusters->ApplyVizTag(viz_tag, "Clusters");
   clusters->ApplyVizTag(viz_tag);
 

diff --git a/EVE/alice-macros/tof_clusters.C b/EVE/alice-macros/tof_clusters.C
index 14ea38318c6d8dee353b2e0f7fae0b253b052464..fcb9e26c8eb159a8568ab3cff00a8365c8d1fd0c 100644 (file)
--- a/EVE/alice-macros/tof_clusters.C
+++ b/EVE/alice-macros/tof_clusters.C
@@ -74,14 +74,8 @@ TEvePointSet* tof_clusters(TEveElement* cont=0, Float_t maxR=390)
   clusters->SetTitle(tip);
 
   const TString viz_tag("TOF Clusters");
-  if (gEve->FindVizDBEntry(viz_tag) == 0)
-  {
-    TEvePointSet* m = new TEvePointSet();
-    m->SetMarkerColor(4);
-    m->SetMarkerSize(0.2);
-    m->SetMarkerStyle(2);
-    gEve->InsertVizDBEntry(viz_tag, m);
-  }
+  // when going to new root call:
+  // clusters->ApplyVizTag(viz_tag, "Clusters");
   clusters->ApplyVizTag(viz_tag);
 
   gEve->AddElement(clusters, cont);
@@ -155,15 +149,7 @@ TEvePointSet* tof_clusters_sec(Int_t selectedSector,
   clusters->SetTitle(tip);
 
   const TString viz_tag("TOF Clusters");
-  if (gEve->FindVizDBEntry(viz_tag) == 0)
-  {
-    TEvePointSet* m = new TEvePointSet();
-    m->SetMarkerColor(4);
-    m->SetMarkerSize(0.2);
-    m->SetMarkerStyle(2);
-    gEve->InsertVizDBEntry(viz_tag, m);
-  }
-  // The above can be removed when going to new root - then call:
+  // when going to new root call:
   // clusters->ApplyVizTag(viz_tag, "Clusters");
   clusters->ApplyVizTag(viz_tag);
 

diff --git a/EVE/alice-macros/tpc_clusters.C b/EVE/alice-macros/tpc_clusters.C
index cc486b2992314c2f490d187b14c2ff05d7aa15b0..24e9ab192ab9fb18e9cbb1a9a3eff3afd0f0f914 100644 (file)
--- a/EVE/alice-macros/tpc_clusters.C
+++ b/EVE/alice-macros/tpc_clusters.C
@@ -90,15 +90,7 @@ TEvePointSet* tpc_clusters(TEveElement* cont=0, Float_t maxR=270)
   clusters->SetTitle(tip);
 
   const TString viz_tag("TPC Clusters");
-  if (gEve->FindVizDBEntry(viz_tag) == 0)
-  {
-    TEvePointSet* m = new TEvePointSet();
-    m->SetMarkerColor(4);
-    m->SetMarkerSize(0.2);
-    m->SetMarkerStyle(2);
-    gEve->InsertVizDBEntry(viz_tag, m);
-  }
-  // The above can be removed when going to new root - then call:
+  // when going to new root call:
   // clusters->ApplyVizTag(viz_tag, "Clusters");
   clusters->ApplyVizTag(viz_tag);
 

diff --git a/EVE/alice-macros/trd_clusters.C b/EVE/alice-macros/trd_clusters.C
index fbf3076d01fc617a19b460f275eae56493574f1e..a14b6cbc79bd23ba41658cc8841b9065dc99a6e8 100644 (file)
--- a/EVE/alice-macros/trd_clusters.C
+++ b/EVE/alice-macros/trd_clusters.C
@@ -72,15 +72,7 @@ TEvePointSet* trd_clusters(TEveElement *cont = 0)
   clusters->SetTitle(tip);
 
   const TString viz_tag("TRD Clusters");
-  if (gEve->FindVizDBEntry(viz_tag) == 0)
-  {
-    TEvePointSet* m = new TEvePointSet();
-    m->SetMarkerColor(4);
-    m->SetMarkerSize(0.2);
-    m->SetMarkerStyle(2);
-    gEve->InsertVizDBEntry(viz_tag, m);
-  }
-  // The above can be removed when going to new root - then call:
+  // when going to new root call:
   // clusters->ApplyVizTag(viz_tag, "Clusters");
   clusters->ApplyVizTag(viz_tag);
 

diff --git a/EVE/macros/alieve_init.C b/EVE/macros/alieve_init.C
index 48f737b961d5a2a7f302f8a77096af96eb0ec2d3..3efea1650556bfab74b90eb3e0214ec42ed27e42 100644 (file)
--- a/EVE/macros/alieve_init.C
+++ b/EVE/macros/alieve_init.C
@@ -25,7 +25,8 @@ void alieve_init(const Text_t* path   = ".", Int_t event=0,
   alieve_init_import_macros();
   gSystem->cd(hack);
 
-  alieve_init_basic_vizdb();
+  // Temporarily assert default vizdb
+  TEveUtil::AssertMacro("VizDB_scan.C");
 
   gSystem->ProcessEvents();
 
@@ -96,84 +97,3 @@ void alieve_init_import_macros()
     }
   }
 }
-
-void alieve_init_basic_vizdb()
-{
-  // For now this is copy from the VizDB_scan ... this should be
-  // reduced when going to a newer root (remove box/ellipse).
-
-  TEveStraightLineSet *ls = 0;
-
-  //============================================================================
-  // Primary vertex
-  //============================================================================
-
-  // Combined vertex
-
-  ls = new TEveStraightLineSet;
-  ls->SetMarkerStyle(2);
-  ls->SetMarkerColor(7);
-  ls->SetLineColor(7);
-  ls->SetLineWidth(3);
-  gEve->InsertVizDBEntry("PVTX", ls);
-
-  ls = new TEveStraightLineSet;
-  ls->SetMarkerStyle(2);
-  ls->SetMarkerColor(7);
-  ls->SetLineColor(7);
-  ls->SetLineWidth(1);
-  gEve->InsertVizDBEntry("PVTX Ellipse", ls);
-
-  ls = new TEveStraightLineSet;
-  ls->SetMarkerStyle(2);
-  ls->SetMarkerColor(7);
-  ls->SetLineColor(7);
-  ls->SetLineWidth(1);
-  gEve->InsertVizDBEntry("PVTX Box", ls);
-
-  // SPD vertex
-
-  ls = new TEveStraightLineSet;
-  ls->SetMarkerStyle(2);
-  ls->SetMarkerColor(6);
-  ls->SetLineColor(6);
-  ls->SetLineWidth(3);
-  gEve->InsertVizDBEntry("PVTX SPD", ls);
-
-  ls = new TEveStraightLineSet;
-  ls->SetMarkerStyle(2);
-  ls->SetMarkerColor(6);
-  ls->SetLineColor(6);
-  ls->SetLineWidth(1);
-  gEve->InsertVizDBEntry("PVTX Ellipse SPD", ls);
-
-  ls = new TEveStraightLineSet;
-  ls->SetMarkerStyle(2);
-  ls->SetMarkerColor(6);
-  ls->SetLineColor(6);
-  ls->SetLineWidth(1);
-  gEve->InsertVizDBEntry("PVTX Box SPD", ls);
-
-  // TPC vertex
-
-  ls = new TEveStraightLineSet;
-  ls->SetMarkerStyle(2);
-  ls->SetMarkerColor(5);
-  ls->SetLineColor(5);
-  ls->SetLineWidth(3);
-  gEve->InsertVizDBEntry("PVTX TPC", ls);
-
-  ls = new TEveStraightLineSet;
-  ls->SetMarkerStyle(2);
-  ls->SetMarkerColor(5);
-  ls->SetLineColor(5);
-  ls->SetLineWidth(1);
-  gEve->InsertVizDBEntry("PVTX Ellipse TPC", ls);
-
-  ls = new TEveStraightLineSet;
-  ls->SetMarkerStyle(2);
-  ls->SetMarkerColor(5);
-  ls->SetLineColor(5);
-  ls->SetLineWidth(1);
-  gEve->InsertVizDBEntry("PVTX Box TPC", ls);
-}