removed redundant check

[u/mrichter/AliRoot.git] / EVE / test-macros / tpc_sector_raw_test.C

diff --git a/EVE/test-macros/tpc_sector_raw_test.C b/EVE/test-macros/tpc_sector_raw_test.C
index 78111be231fa4b3197ea16269cb74810d4ade87f..330cafef9bec4a1a10168ca0627d2187bbff3fcd 100644 (file)
--- a/EVE/test-macros/tpc_sector_raw_test.C
+++ b/EVE/test-macros/tpc_sector_raw_test.C
@@ -1,4 +1,11 @@
-// $Header$
+// $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.                                                 *
+ **************************************************************************/
 
 // Functions to read rootified raw-data from TPC sector test.
 //
@@ -8,17 +15,13 @@
 
 class AliRawReaderRoot;
 
-namespace Alieve {
-class TPCData;
-class TPCSector2D;
-class TPCSector3D;
-}
-
-using namespace Alieve;
+class AliEveTPCData;
+class AliEveTPCSector2D;
+class AliEveTPCSector3D;
 
-TPCData*     x = 0;
-TPCSector2D* s = 0;
-TPCSector3D* t = 0;
+AliEveTPCData*     x = 0;
+AliEveTPCSector2D* s = 0;
+AliEveTPCSector3D* t = 0;
 
 AliRawReaderRoot* reader =  0;
 Int_t             event  = -1;
@@ -29,9 +32,9 @@ void tpc_sector_raw_test(const char *file = "", Int_t ievent = 0)
   gStyle->SetPalette(1, 0);
 
   reader = new AliRawReaderRoot(file);
-  reader->LoadEquipmentIdsMap
-    (gSystem->ExpandPathName("$(ALICE_ROOT)/TPC/mapping/EquipmentIdMap.data"));
-  //(gSystem->ExpandPathName("EquipmentIdMap.data"));
+  //reader->LoadEquipmentIdsMap
+  //  (gSystem->ExpandPathName("$(ALICE_ROOT)/TPC/mapping/EquipmentIdMap.data"));
+  //  (gSystem->ExpandPathName("EquipmentIdMap.data"));
 
   reader->Reset();
   for(Int_t i=0; i<ievent; ++i, ++event) {
@@ -41,27 +44,27 @@ void tpc_sector_raw_test(const char *file = "", Int_t ievent = 0)
     }
   }
 
-  x = new TPCData;
+  x = new AliEveTPCData;
   // x->SetLoadPedestal(5);
   x->SetLoadThreshold(5);
   x->SetAutoPedestal(kTRUE);
 
-  s = new TPCSector2D();
+  s = new AliEveTPCSector2D();
   s->SetSectorID(default_sector);
-  s->SetTrans(kTRUE); // place on proper 3D coordinates
+  s->SetAutoTrans(kTRUE); // place on proper 3D coordinates
   s->SetDataSource(x);
   s->SetFrameColor(36);
-  gReve->AddRenderElement(s);
-  gReve->DrawRenderElement(s);
+  gEve->AddElement(s);
+  gEve->DrawElement(s);
 
-  t = new TPCSector3D();
+  t = new AliEveTPCSector3D();
   t->SetSectorID(default_sector);
-  t->SetTrans(kTRUE);
+  t->SetAutoTrans(kTRUE);
   t->SetDataSource(x);
   t->SetMaxTime(1023);
   t->SetDriftVel(2.273);
-  gReve->AddRenderElement(t);
-  gReve->DrawRenderElement(t);
+  gEve->AddElement(t);
+  gEve->DrawElement(t);
 
   next_event();
 }
@@ -80,8 +83,7 @@ void next_event()
   printf("Now loading event %d\n", event);
   reader->Reset();
   AliTPCRawStream input(reader);
-  input.SetOldRCUFormat(kTRUE);
-  // reader->Select(0, firstRCU, lastRCU);
+  reader->Select("TPC"); // ("TPC", firstRCU, lastRCU);
 
   x->DropAllSectors();
   x->LoadRaw(input, kTRUE, kTRUE);
@@ -89,19 +91,18 @@ void next_event()
   printf("Updating scene\n");
   s->IncRTS();
   t->IncRTS();
-  gReve->Redraw3D();
+  gEve->Redraw3D();
 }
 
 void tpc_raw_pad_dump(Int_t s, Int_t r, Int_t p)
 {
-  if(r >= TPCSectorData::GetInnSeg().GetNRows()) {
-    r -=  TPCSectorData::GetInnSeg().GetNRows();
+  if(r >= AliEveTPCSectorData::GetInnSeg().GetNRows()) {
+    r -=  AliEveTPCSectorData::GetInnSeg().GetNRows();
     s += 36;
   }
 
   reader->Reset();
   AliTPCRawStream input(reader);
-  input.SetOldRCUFormat(kTRUE);
   // reader->Select(0, firstRCU, lastRCU);
 
   Int_t sector = input.GetSector();