Fixed operator+ functions for exceptions (forgot to change them when migrated from...

[u/mrichter/AliRoot.git] / EVE / Alieve / TPCLoader.cxx

diff --git a/EVE/Alieve/TPCLoader.cxx b/EVE/Alieve/TPCLoader.cxx
index dad3a3fe0b0ad1bd76e055214fb5ebc5d2dd7e39..4283ea83503aa0b6ddc676768fce6a62ca11dda8 100644 (file)
--- a/EVE/Alieve/TPCLoader.cxx
+++ b/EVE/Alieve/TPCLoader.cxx
@@ -23,19 +23,20 @@ ClassImp(TPCLoader)
 TPCLoader::TPCLoader(const Text_t* n, const Text_t* t) :
   RenderElementList(n, t),
 
+  fFile(),
   fEvent(-1),
   fDoubleSR(kFALSE),
 
+  fTPCEquipementMap(),
   fReader(0),
   fData(0),
 
   fSec2Ds(36),
   fSec3Ds(36),
 
-  fSetInitSectorParams(kFALSE)
-{
-  SetMainColorPtr(0);
-}
+  fSetInitSectorParams(kFALSE),
+  fInitMinTime(0), fInitMaxTime(460), fInitThreshold(5)
+{}
 
 TPCLoader::~TPCLoader()
 {
@@ -45,6 +46,27 @@ TPCLoader::~TPCLoader()
 
 /**************************************************************************/
 
+void TPCLoader::RemoveElementLocal(RenderElement* el)
+{
+  for(Int_t i=0; i<36; ++i) {
+    if(fSec2Ds[i] == el) fSec2Ds[i] = 0;
+    if(fSec3Ds[i] == el) fSec3Ds[i] = 0;
+  }
+
+  RenderElementList::RemoveElementLocal(el);
+}
+
+void TPCLoader::RemoveElements()
+{
+  for(Int_t i=0; i<36; ++i) {
+    fSec2Ds[i] = 0;
+    fSec3Ds[i] = 0;
+  }
+
+  RenderElementList::RemoveElements();
+}
+
+/**************************************************************************/
 
 void TPCLoader::SetData(TPCData* d)
 {
@@ -69,8 +91,9 @@ void TPCLoader::OpenFile()
   fEvent  = -1;
 
   fReader = new AliRawReaderRoot(fFile);
-  fReader->LoadEquipmentIdsMap
-    (gSystem->ExpandPathName("$(ALICE_ROOT)/TPC/mapping/EquipmentIdMap.data"));
+  if(fTPCEquipementMap != "")
+    fReader->LoadEquipmentIdsMap
+      (gSystem->ExpandPathName(fTPCEquipementMap.Data()));
 
   NextEvent();
   LoadEvent();
@@ -88,7 +111,7 @@ void TPCLoader::LoadEvent()
   fReader->Reset();
   AliTPCRawStream input(fReader);
   input.SetOldRCUFormat(kTRUE);
-  fReader->Select(0);
+  fReader->Select("TPC");
 
   fData->DropAllSectors();
   fData->LoadRaw(input, kTRUE, kTRUE);  
@@ -166,11 +189,10 @@ void TPCLoader::UpdateSectors()
           s->SetThreshold(fInitThreshold);
         }
 
-       s->SetTrans(kTRUE);
+       s->SetAutoTrans(kTRUE);
        s->SetFrameColor(36);
 
-       gReve->AddRenderElement(s);
-       gReve->DrawRenderElement(s);
+       gReve->AddRenderElement(this, s);
       }
     }
 
@@ -197,11 +219,10 @@ void TPCLoader::CreateSectors3D()
       if(fSec2Ds[i] != 0)
        s->CopyVizParams(*fSec2Ds[i]);
 
-      s->SetTrans(kTRUE);
+      s->SetAutoTrans(kTRUE);
       s->SetFrameColor(36);
 
-      gReve->AddRenderElement(s);
-      gReve->DrawRenderElement(s);
+      gReve->AddRenderElement(this, s);
     }
   }
   gReve->EnableRedraw();
@@ -213,8 +234,8 @@ void TPCLoader::DeleteSectors3D()
   for(Int_t i=0; i<=35; ++i) {
     RenderElement* re = fSec3Ds[i];
     if(re != 0) {
-      gReve->UndrawRenderElement(re);
-      delete re;
+      gReve->RemoveRenderElement(this, re);
+      // delete re; // Done automatically.
       fSec3Ds[i] = 0;
     }
   }