fix warnings

[u/mrichter/AliRoot.git] / EVE / EveDet / AliEveTRDModuleImp.cxx

diff --git a/EVE/EveDet/AliEveTRDModuleImp.cxx b/EVE/EveDet/AliEveTRDModuleImp.cxx
index 19cfc921d85964df56ad1bfd7663370b2595bb23..443f99e041ca0db61765ff557b40823788a5acb6 100644 (file)
--- a/EVE/EveDet/AliEveTRDModuleImp.cxx
+++ b/EVE/EveDet/AliEveTRDModuleImp.cxx
@@ -48,9 +48,10 @@ void AliEveTRDNode::Paint(Option_t* option)
 {
   // Paint object.
 
+  AliEveTRDModule *module(NULL);
   List_i iter = fChildren.begin();
   while(iter != fChildren.end()){
-    (dynamic_cast<AliEveTRDModule*>(*iter))->Paint(option);
+    if((module = dynamic_cast<AliEveTRDModule*>(*iter))) module->Paint(option);
     iter++;
   }
 }
@@ -62,7 +63,7 @@ void AliEveTRDNode::Reset()
 
   List_i iter = fChildren.begin();
   while(iter != fChildren.end()){
-    (dynamic_cast<AliEveTRDModule*>(*iter))->Reset();
+    //(dynamic_cast<AliEveTRDModule*>(*iter))->Reset();
     iter++;
   }
 }
@@ -98,40 +99,40 @@ void AliEveTRDNode::Expand()
 }
 
 //______________________________________________________________________________
-void AliEveTRDNode::EnableListElements()
+void AliEveTRDNode::EnableListElements(Bool_t rnr_self, Bool_t rnr_children)
 {
   // Enable list elements.
 
-  SetRnrSelf(kTRUE);
-  AliEveTRDNode *node = 0x0;
-  AliEveTRDChamber *chmb = 0x0;
+  SetRnrSelf(rnr_self);
+  AliEveTRDNode *node(NULL);
+  AliEveTRDChamber *chmb(NULL);
   List_i iter = fChildren.begin();
   while(iter != fChildren.end()){
     if((node = dynamic_cast<AliEveTRDNode*>(*iter))){
-      node->SetRnrSelf(kTRUE);
-      node->EnableListElements();
+      node->SetRnrSelf(rnr_children);
+      node->EnableListElements(rnr_children, rnr_children);
     }
-    if((chmb = dynamic_cast<AliEveTRDChamber*>(*iter))) chmb->SetRnrSelf(kTRUE);
+    if((chmb = dynamic_cast<AliEveTRDChamber*>(*iter))) chmb->EnableListElements(rnr_children, rnr_children);
     iter++;
   }
   gEve->Redraw3D();
 }
 
 //______________________________________________________________________________
-void AliEveTRDNode::DisableListElements()
+void AliEveTRDNode::DisableListElements(Bool_t rnr_self, Bool_t rnr_children)
 {
   // Disable list elements.
 
-  SetRnrSelf(kFALSE);
-  AliEveTRDNode *node = 0x0;
-  AliEveTRDChamber *chmb = 0x0;
+  SetRnrSelf(rnr_self);
+  AliEveTRDNode *node(NULL);
+  AliEveTRDChamber *chmb(NULL);
   List_i iter = fChildren.begin();
   while(iter != fChildren.end()){
     if((node = dynamic_cast<AliEveTRDNode*>(*iter))){
-      node->SetRnrSelf(kFALSE);
-      node->DisableListElements();
+      node->SetRnrSelf(rnr_children);
+      node->DisableListElements(rnr_children, rnr_children);
     }
-    if((chmb = dynamic_cast<AliEveTRDChamber*>(*iter))) chmb->SetRnrSelf(kFALSE);
+    if((chmb = dynamic_cast<AliEveTRDChamber*>(*iter))) chmb->DisableListElements(rnr_children, rnr_children);
     iter++;
   }
   gEve->Redraw3D();
@@ -326,7 +327,7 @@ void AliEveTRDChamber::LoadDigits(AliTRDdigitsManager *digits)
 
   if(!fDigits) AddElement(fDigits = new AliEveTRDDigits(this));
 
-  fDigits->Reset();
+  //fDigits->Reset();
   fDigits->SetData(digits);
   fDigits->StampObjProps();
   fDigitsNeedRecompute = kTRUE;  
@@ -368,7 +369,7 @@ void AliEveTRDChamber::LoadTracklets(TTree *trklTree)
   //
 
   if(!fGeo){
-    Error("LoadTracklets()", Form("Geometry not set for chamber %d. Please call first AliEveTRDChamber::SetGeometry().", fDet));
+    Error("LoadTracklets()", "Geometry not set for chamber %d. Please call first AliEveTRDChamber::SetGeometry().", fDet);
     return;
   }
 
@@ -402,53 +403,6 @@ void AliEveTRDChamber::LoadTracklets(TTree *trklTree)
   fLoadTracklets = kTRUE;
 }
 
-//____________________________________________________
-void AliEveTRDChamber::Paint(Option_t* option)
-{
-  // Paint object.
-
-  if(!fRnrSelf) return;
-  if(fDigits && fRnrDigits){
-    if(fDigitsNeedRecompute){
-      fDigits->ComputeRepresentation();
-      fDigitsNeedRecompute = kFALSE;
-    }
-    fDigits->Paint(option);
-  }
-
-  if(fRecPoints && fRnrRecPoints) fRecPoints->GetObject()->Paint(option);
-
-  if(fHits && fRnrHits) fHits->GetObject()->Paint(option);
-
-  if(fTracklets && fRnrTracklets){
-//    for (Int_t iTrkl = 0; iTrkl < fTracklets->GetEntriesFast(); iTrkl++) 
-//      ((AliEveTRDTrackletOnline*) (*fTracklets)[iTrkl])->Paint();
-  }
-}
-
-//______________________________________________________________________________
-void AliEveTRDChamber::Reset()
-{
-  // Reset.
-
-  if(fHits){
-    fHits->Reset();
-    fLoadHits = kFALSE;
-  }
-  if(fDigits){
-    fDigits->Reset();
-    fLoadDigits = kFALSE;
-    fDigitsNeedRecompute = kTRUE;
-  }
-  if(fRecPoints){
-    fRecPoints->Reset();
-    fLoadRecPoints = kFALSE;
-  }
-  if(fTracklets){
-    fTracklets->Delete();
-    fLoadTracklets = kFALSE;
-  }
-}
 
 //______________________________________________________________________________
 void AliEveTRDChamber::SetGeometry(AliTRDgeometry *geo)
@@ -461,6 +415,9 @@ void AliEveTRDChamber::SetGeometry(AliTRDgeometry *geo)
   Int_t  istk = geo->GetStack(fDet);
   Int_t  ilyr = geo->GetLayer(fDet);
   Int_t  icha = istk*6+ilyr;
+  Int_t idx(1); 
+  if(ism>12&&ism<16) idx=3;
+  else if(ism==11||ism==12) idx=2;
 
   // define pad plane size in pads
   AliTRDpadPlane *pp = fGeo->GetPadPlane(ilyr, istk);
@@ -474,15 +431,17 @@ void AliEveTRDChamber::SetGeometry(AliTRDgeometry *geo)
 // * (TGeoShape**) (((char*)eg_shape) + shape_offset) = gGeoManager->GetCurrentVolume()->GetShape();
 // 
 // eg_shape->StampColorSelection();
-  if(!(gGeoManager)){ 
-    AliCDBManager *fCDBManager=AliCDBManager::Instance();
-    fCDBManager->SetDefaultStorage("local://$ALICE_ROOT/OCDB");
-    fCDBManager->SetRun(0);
+  if(!(gGeoManager)){
     AliEveEventManager::AssertGeometry();
+    if(!(gGeoManager)){
+      AliError("Geo manager not available.");
+      return;
+    }
   }
 
   // define rendarable volumes
-  gGeoManager->cd(Form("/B077_1/BSEGMO%d_1/BTRD%d_1/UTR1_1/UTS1_1/UTI1_1/UT%02d_1", ism, ism, icha));
+  if(!gGeoManager->cd(Form("/B077_1/BSEGMO%d_1/BTRD%d_1/UTR%d_1/UTS%d_1/UTI%d_1/UT%02d_1", ism, ism, idx, idx, idx, icha))) return;
+
   fShape = new TEveGeoTopNode(gGeoManager, gGeoManager->GetCurrentNode());
   fShape->RefMainTrans().SetFrom(*gGeoManager->GetCurrentMatrix());
   fShape->DisableListElements();