X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=EVE%2Falice-macros%2Femcal_digits.C;h=836bced5b048add02253b888e75c087da787e749;hb=683601f2da12501791f83b7d748cceb33a799c15;hp=11451af7dbed860c0321571dbb68b70c62e66e94;hpb=32e219c20fb55c013ac4c3391a9874ee28f859fe;p=u%2Fmrichter%2FAliRoot.git

diff --git a/EVE/alice-macros/emcal_digits.C b/EVE/alice-macros/emcal_digits.C
index 11451af7dbe..836bced5b04 100644
--- a/EVE/alice-macros/emcal_digits.C
+++ b/EVE/alice-macros/emcal_digits.C
@@ -1,6 +1,15 @@
+// $Id$
+// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007
+
+/**************************************************************************
+ * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. *
+ * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for          *
+ * full copyright notice.                                                 *
+ **************************************************************************/
+
 void emcal_digits()
 {
-  AliRunLoader* rl =  Alieve::Event::AssertRunLoader();
+  AliRunLoader* rl =  AliEveEventManager::AssertRunLoader();
 
   rl->LoadgAlice();
   AliEMCAL         * emcal = (AliEMCAL*) rl->GetAliRun()->GetDetector("EMCAL");
@@ -9,7 +18,7 @@ void emcal_digits()
   rl->LoadDigits("EMCAL");
   TTree* dt = rl->GetTreeD("EMCAL", kFALSE);
 
-  gGeoManager = gReve->GetGeometry("$REVESYS/alice-data/alice_fullgeo.root");
+  gGeoManager = gEve->GetDefaultGeometry();
   TGeoNode* node = gGeoManager->GetTopVolume()->FindNode("XEN1_1");
 
   TGeoBBox* bbbox = (TGeoBBox*) node->GetDaughter(0) ->GetVolume()->GetShape();
@@ -17,36 +26,36 @@ void emcal_digits()
   TGeoBBox* sbbox = (TGeoBBox*) node->GetDaughter(10)->GetVolume()->GetShape();
   sbbox->Dump();
 
-  Reve::RenderElementList* l = new Reve::RenderElementList("EMCAL");
+  TEveElementList* l = new TEveElementList("EMCAL");
   l->SetTitle("Tooltip");
-  gReve->AddRenderElement(l);
+  gEve->AddElement(l);
 
-  Reve::FrameBox* frame_big = new Reve::FrameBox();
+  TEveFrameBox* frame_big = new TEveFrameBox();
   frame_big->SetAABoxCenterHalfSize(0, 0, 0, bbbox->GetDX(), bbbox->GetDY(), bbbox->GetDZ());
 
-  Reve::FrameBox* frame_sml = new Reve::FrameBox();
+  TEveFrameBox* frame_sml = new TEveFrameBox();
   frame_sml->SetAABoxCenterHalfSize(0, 0, 0, sbbox->GetDX(), sbbox->GetDY(), sbbox->GetDZ());
 
   gStyle->SetPalette(1, 0);
-  Reve::RGBAPalette* pal = new Reve::RGBAPalette(0, 512);
+  TEveRGBAPalette* pal = new TEveRGBAPalette(0, 512);
   pal->SetLimits(0, 1024);
 
-  Reve::QuadSet* smodules[12];
+  TEveQuadSet* smodules[12];
 
   for (Int_t sm=0; sm<12; ++sm)
   {
-    Reve::QuadSet* q = new Reve::QuadSet(Form("SM %d", sm+1));
+    TEveQuadSet* q = new TEveQuadSet(Form("SM %d", sm+1));
     q->SetOwnIds(kTRUE);
-    q->Reset(Reve::QuadSet::QT_RectangleYZFixedDimX, kFALSE, 32);
+    q->Reset(TEveQuadSet::kQT_RectangleYZFixedDimX, kFALSE, 32);
     q->SetDefWidth (geom->GetPhiTileSize());
     q->SetDefHeight(geom->GetEtaTileSize());
 
-    q->RefHMTrans().SetFrom(*node->GetDaughter(sm)->GetMatrix());
+    q->RefMainTrans().SetFrom(*node->GetDaughter(sm)->GetMatrix());
 
     q->SetFrame(sm < 10 ? frame_big : frame_sml);
     q->SetPalette(pal);
 
-    gReve->AddRenderElement(q, l);
+    gEve->AddElement(q, l);
     smodules[sm] = q;
   }
 
@@ -68,7 +77,7 @@ void emcal_digits()
   Int_t ieta    =  0 ;
   Double_t x, y, z;
 
-  for(Int_t idig = 0; idig<nEnt; idig++)
+  for (Int_t idig = 0; idig < nEnt; ++idig)
   {
     dig = static_cast<AliEMCALDigit *>(digits->At(idig));
 
@@ -79,8 +88,8 @@ void emcal_digits()
 
       cout<<"Cell ID "<<id<<" Amp "<<amp<<endl;//" time "<<time<<endl;
 
-      //Geometry methods  
-      geom->GetCellIndex(id,iSupMod,iTower,iIphi,iIeta); 
+      //Geometry methods
+      geom->GetCellIndex(id,iSupMod,iTower,iIphi,iIeta);
       //Gives SuperModule and Tower numbers
       geom->GetCellPhiEtaIndexInSModule(iSupMod,iTower,
 					iIphi, iIeta,iphi,ieta);
@@ -93,7 +102,7 @@ void emcal_digits()
       geom->RelPosCellInSModule(id, x, y, z);
       cout << x <<" "<< y <<" "<< z <<endl;
 
-      Reve::QuadSet* q = smodules[iSupMod];
+      TEveQuadSet* q = smodules[iSupMod];
       q->AddQuad(y, z);
       q->QuadValue(amp);
       q->QuadId(dig);
@@ -102,10 +111,10 @@ void emcal_digits()
     }
   }
 
-  for (Int_t sm=0; sm<12; ++sm)
+  for (Int_t sm = 0; sm < 12; ++sm)
   {
     smodules[iSupMod]->RefitPlex();
   }
 
-  gReve->Redraw3D();
+  gEve->Redraw3D();
 }