Renamed typedef lpRE_t/i to List_t/i.

diff --git a/EVE/Alieve/TRDLoader.cxx b/EVE/Alieve/TRDLoader.cxx
index 58abb488e8f8917b0f1909b9b562e1750cc397a0..bd39fa81fbb5343d4ad870918cf754f48110396a 100644 (file)
--- a/EVE/Alieve/TRDLoader.cxx
+++ b/EVE/Alieve/TRDLoader.cxx
@@ -85,7 +85,7 @@ void  TRDLoader::AddChambers(const int sm, const int stk, const int ly)
        Int_t ily_start = (ly == -1) ?  0 : ly;
        Int_t ily_stop  = (ly == -1) ?  6 : ly+1;
 
-       lpRE_i ichmb;
+       List_i ichmb;
        ichmb = fChildren.begin();
        while(ichmb != fChildren.end()){
                (*ichmb)->SetRnrElement(kFALSE);
@@ -131,7 +131,7 @@ void        TRDLoader::AddChambers(const int sm, const int stk, const int ly)
 //________________________________________________________
 TRDChamber*    TRDLoader::GetChamber(const int d)
 {
-       lpRE_i ism, istack, ichmb;
+       List_i ism, istack, ichmb;
        
        ism = find_if(fChildren.begin(), fChildren.end(), ID<RenderElement*>(fGeo->GetSector(d)));
        if(ism == fChildren.end()) return 0x0;
@@ -308,7 +308,7 @@ Bool_t      TRDLoader::Open(const char *filename, const char *dir)
 //________________________________________________________
 void TRDLoader::Paint(Option_t *option)
 {
-       lpRE_i ichmb = fChildren.begin();
+       List_i ichmb = fChildren.begin();
        while(ichmb != fChildren.end()){
                (dynamic_cast<TRDModule*>(*ichmb))->Paint(option);
                ichmb++;
@@ -318,7 +318,7 @@ void TRDLoader::Paint(Option_t *option)
 //________________________________________________________
 void TRDLoader::Unload()
 {
-       lpRE_i ichmb = fChildren.begin();
+       List_i ichmb = fChildren.begin();
        while(ichmb != fChildren.end()){
                (dynamic_cast<TRDModule*>(*ichmb))->Reset();
                ichmb++;

diff --git a/EVE/Alieve/TRDModuleImp.cxx b/EVE/Alieve/TRDModuleImp.cxx
index f0e92eccd5f62333e08c846d9256e86d4591701d..f36f426bf7df3368fcd1816876787eea1d078e8a 100644 (file)
--- a/EVE/Alieve/TRDModuleImp.cxx
+++ b/EVE/Alieve/TRDModuleImp.cxx
@@ -37,7 +37,7 @@ TRDNode::TRDNode(const char *typ, const Int_t det) :
 //________________________________________________________
 void   TRDNode::Paint(Option_t* option)
 {
-       lpRE_i iter = fChildren.begin();
+       List_i iter = fChildren.begin();
        while(iter != fChildren.end()){
                (dynamic_cast<TRDModule*>(*iter))->Paint(option);
                iter++;
@@ -47,7 +47,7 @@ void  TRDNode::Paint(Option_t* option)
 //________________________________________________________
 void   TRDNode::Reset()
 {
-       lpRE_i iter = fChildren.begin();
+       List_i iter = fChildren.begin();
        while(iter != fChildren.end()){
                (dynamic_cast<TRDModule*>(*iter))->Reset();
                iter++;
@@ -59,7 +59,7 @@ void TRDNode::Collapse()
 {
        TGListTree *list = gReve->GetListTree();
        TRDNode *node = 0x0;
-       lpRE_i iter = fChildren.begin();
+       List_i iter = fChildren.begin();
        while(iter != fChildren.end()){
                if((node = dynamic_cast<TRDNode*>(*iter))) node->Collapse();
                list->CloseItem(FindListTreeItem(list));
@@ -72,7 +72,7 @@ void TRDNode::Expand()
 {
        TGListTree *list = gReve->GetListTree();
        TRDNode *node = 0x0;
-       lpRE_i iter = fChildren.begin();
+       List_i iter = fChildren.begin();
        while(iter != fChildren.end()){
                if((node = dynamic_cast<TRDNode*>(*iter))) node->Expand();
                list->OpenItem(FindListTreeItem(list));
@@ -86,7 +86,7 @@ void TRDNode::EnableListElements()
        SetRnrElement(kTRUE);
        TRDNode *node = 0x0;
        TRDChamber *chmb = 0x0; 
-       lpRE_i iter = fChildren.begin();
+       List_i iter = fChildren.begin();
        while(iter != fChildren.end()){
                if((node = dynamic_cast<TRDNode*>(*iter))){
                        node->SetRnrElement(kTRUE);
@@ -104,7 +104,7 @@ void TRDNode::DisableListElements()
        SetRnrElement(kFALSE);
        TRDNode *node = 0x0;
        TRDChamber *chmb = 0x0; 
-       lpRE_i iter = fChildren.begin();
+       List_i iter = fChildren.begin();
        while(iter != fChildren.end()){
                if((node = dynamic_cast<TRDNode*>(*iter))){
                        node->SetRnrElement(kFALSE);
@@ -120,7 +120,7 @@ void TRDNode::DisableListElements()
 void TRDNode::UpdateLeaves()
 {
        TRDModule *module;
-       lpRE_i iter = fChildren.begin();
+       List_i iter = fChildren.begin();
        while(iter != fChildren.end()){
                module = dynamic_cast<TRDModule*>(*iter);
                if(!module) continue;
@@ -150,7 +150,7 @@ void TRDNode::UpdateNode()
 {
 //     Info("UpdateNode()", Form("%s", GetName()));
        TRDNode *node = 0x0;
-       lpRE_i iter = fChildren.begin();
+       List_i iter = fChildren.begin();
        while(iter != fChildren.end()){
                if((node = dynamic_cast<TRDNode*>(*iter))) node->UpdateNode();
                iter++;

diff --git a/EVE/Alieve/TRDModuleImp.h b/EVE/Alieve/TRDModuleImp.h
index f23ca3c590d8ef13448e99ce0319ee7e5eb89b9e..47c0159a623f0f643b073dbeda950d7c8a7ba1b7 100644 (file)
--- a/EVE/Alieve/TRDModuleImp.h
+++ b/EVE/Alieve/TRDModuleImp.h
@@ -85,8 +85,8 @@ namespace Alieve {
                void    UpdateLeaves();
                void    UpdateNode();
                
-               lpRE_i begin(){return fChildren.begin();}
-               lpRE_i end(){return fChildren.end();}
+               List_i begin(){return fChildren.begin();}
+               List_i end(){return fChildren.end();}
        
        ClassDef(TRDNode, 1)
        };

diff --git a/EVE/Reve/Cascade.cxx b/EVE/Reve/Cascade.cxx
index 52896068fc16d51c25a6dcb73bb4ff7376f9dff9..1cc83df2374a4a37af95b55ecad0593ab80edd85 100644 (file)
--- a/EVE/Reve/Cascade.cxx
+++ b/EVE/Reve/Cascade.cxx
@@ -498,7 +498,7 @@ void CascadeList::Paint(Option_t* option) {
   if(fRnrElement) {
 
     if(fRnrBach) {
-      for(lpRE_i i=fChildren.begin(); i!=fChildren.end(); ++i) {
+      for(List_i i=fChildren.begin(); i!=fChildren.end(); ++i) {
        if((*i)->GetRnrElement()) {
          ((Cascade*)(*i))->PaintBachelor(option);
        }
@@ -506,7 +506,7 @@ void CascadeList::Paint(Option_t* option) {
     }
 
     if(fRnrV0Daughters) {
-      for(lpRE_i i=fChildren.begin(); i!=fChildren.end(); ++i) {
+      for(List_i i=fChildren.begin(); i!=fChildren.end(); ++i) {
        if((*i)->GetRnrElement()) {
          ((Cascade*)(*i))->PaintV0Daughters(option);
        }
@@ -514,7 +514,7 @@ void CascadeList::Paint(Option_t* option) {
     }
 
     if(fRnrV0path) {
-      for(lpRE_i i=fChildren.begin(); i!=fChildren.end(); ++i) {
+      for(List_i i=fChildren.begin(); i!=fChildren.end(); ++i) {
        if((*i)->GetRnrElement()) {
          ((Cascade*)(*i))->PaintV0Path(option);
        }
@@ -522,7 +522,7 @@ void CascadeList::Paint(Option_t* option) {
     }
 
     if(fRnrCasVtx) {
-      for(lpRE_i i=fChildren.begin(); i!=fChildren.end(); ++i) {
+      for(List_i i=fChildren.begin(); i!=fChildren.end(); ++i) {
        if((*i)->GetRnrElement()) {
          ((Cascade*)(*i))->Paint(option);
        }
@@ -530,7 +530,7 @@ void CascadeList::Paint(Option_t* option) {
     }
 
     if(fRnrCasPath) {
-      for(lpRE_i i=fChildren.begin(); i!=fChildren.end(); ++i) {
+      for(List_i i=fChildren.begin(); i!=fChildren.end(); ++i) {
        if((*i)->GetRnrElement()) {
          ((Cascade*)(*i))->PaintCasPath(option);
        }
@@ -595,7 +595,7 @@ void CascadeList::SetRnrBachelor(Bool_t rnr)
 
 void CascadeList::MakeCascades()
 {
-  for(lpRE_i i=fChildren.begin(); i!=fChildren.end(); ++i) {
+  for(List_i i=fChildren.begin(); i!=fChildren.end(); ++i) {
     ((Cascade*)(*i))->MakeCascade();
   }
   gReve->Redraw3D();
@@ -748,7 +748,7 @@ void CascadeList::FilterAll() {
     fHist2D[i]->Reset();
   
   Cascade* myCas;
-  for(lpRE_i i=fChildren.begin(); i!=fChildren.end(); ++i) {
+  for(List_i i=fChildren.begin(); i!=fChildren.end(); ++i) {
 
     myCas = (Cascade*)(*i);
     Filter(myCas);
@@ -761,7 +761,7 @@ void CascadeList::GetCasIndexRange(Int_t &imin, Int_t &imax) {
 
   Int_t index;
   Cascade* myCas;
-  lpRE_i i = fChildren.begin();
+  List_i i = fChildren.begin();
   myCas = (Cascade*)(*i);
   index = myCas->GetESDIndex();
   imin = index;
@@ -787,7 +787,7 @@ void CascadeList::XiMassFilter(Float_t min, Float_t max) {
   Bool_t isSelected;
   Cascade* myCas;
 
-  for(lpRE_i i=fChildren.begin(); i!=fChildren.end(); ++i) {
+  for(List_i i=fChildren.begin(); i!=fChildren.end(); ++i) {
 
     myCas = (Cascade*)(*i);
     val = myCas->GetXiMass();
@@ -816,7 +816,7 @@ void CascadeList::OmegaMassFilter(Float_t min, Float_t max) {
   Bool_t isSelected;
   Cascade* myCas;
 
-  for(lpRE_i i=fChildren.begin(); i!=fChildren.end(); ++i) {
+  for(List_i i=fChildren.begin(); i!=fChildren.end(); ++i) {
 
     myCas = (Cascade*)(*i);
     val = myCas->GetOmegaMass();
@@ -845,7 +845,7 @@ void CascadeList::IndexFilter(Float_t min, Float_t max) {
   Bool_t isSelected;
   Cascade* myCas;
 
-  for(lpRE_i i=fChildren.begin(); i!=fChildren.end(); ++i) {
+  for(List_i i=fChildren.begin(); i!=fChildren.end(); ++i) {
 
     myCas = (Cascade*)(*i);
     val = myCas->GetESDIndex();
@@ -874,7 +874,7 @@ void CascadeList::CosPointingFilter(Float_t min, Float_t max) {
   Bool_t isSelected;
   Cascade* myCas;
 
-  for(lpRE_i i=fChildren.begin(); i!=fChildren.end(); ++i) {
+  for(List_i i=fChildren.begin(); i!=fChildren.end(); ++i) {
 
     myCas = (Cascade*)(*i);
     val = myCas->GetCasCosPointingAngle();
@@ -904,7 +904,7 @@ void CascadeList::BachV0DCAFilter(Float_t min, Float_t max) {
   Bool_t isSelected;
   Cascade* myCas;
 
-  for(lpRE_i i=fChildren.begin(); i!=fChildren.end(); ++i) {
+  for(List_i i=fChildren.begin(); i!=fChildren.end(); ++i) {
 
     myCas = (Cascade*)(*i);
     val = myCas->GetDCA_v0_Bach();
@@ -934,7 +934,7 @@ void CascadeList::RadiusFilter(Float_t min, Float_t max) {
   Bool_t isSelected;
   Cascade* myCas;
 
-  for(lpRE_i i=fChildren.begin(); i!=fChildren.end(); ++i) {
+  for(List_i i=fChildren.begin(); i!=fChildren.end(); ++i) {
 
     myCas = (Cascade*)(*i);
     val = myCas->GetRadius();
@@ -964,7 +964,7 @@ void CascadeList::PtFilter(Float_t min, Float_t max) {
   Bool_t isSelected;
   Cascade* myCas;
 
-  for(lpRE_i i=fChildren.begin(); i!=fChildren.end(); ++i) {
+  for(List_i i=fChildren.begin(); i!=fChildren.end(); ++i) {
 
     myCas = (Cascade*)(*i);
     val = myCas->GetPt();
@@ -994,7 +994,7 @@ void CascadeList::PseudoRapFilter(Float_t min, Float_t max) {
   Bool_t isSelected;
   Cascade* myCas;
 
-  for(lpRE_i i=fChildren.begin(); i!=fChildren.end(); ++i) {
+  for(List_i i=fChildren.begin(); i!=fChildren.end(); ++i) {
 
     myCas = (Cascade*)(*i);
     val = myCas->GetPseudoRapidity();
@@ -1024,7 +1024,7 @@ void CascadeList::NegPtFilter(Float_t min, Float_t max) {
   Bool_t isSelected;
   Cascade* myCas;
 
-  for(lpRE_i i=fChildren.begin(); i!=fChildren.end(); ++i) {
+  for(List_i i=fChildren.begin(); i!=fChildren.end(); ++i) {
 
     myCas = (Cascade*)(*i);
     val = myCas->GetNegPt();
@@ -1054,7 +1054,7 @@ void CascadeList::NegEtaFilter(Float_t min, Float_t max) {
   Bool_t isSelected;
   Cascade* myCas;
 
-  for(lpRE_i i=fChildren.begin(); i!=fChildren.end(); ++i) {
+  for(List_i i=fChildren.begin(); i!=fChildren.end(); ++i) {
 
     myCas = (Cascade*)(*i);
     val = myCas->GetNegPseudoRapidity();
@@ -1084,7 +1084,7 @@ void CascadeList::PosPtFilter(Float_t min, Float_t max) {
   Bool_t isSelected;
   Cascade* myCas;
 
-  for(lpRE_i i=fChildren.begin(); i!=fChildren.end(); ++i) {
+  for(List_i i=fChildren.begin(); i!=fChildren.end(); ++i) {
 
     myCas = (Cascade*)(*i);
     val = myCas->GetPosPt();
@@ -1113,7 +1113,7 @@ void CascadeList::PosEtaFilter(Float_t min, Float_t max) {
   Bool_t isSelected;
   Cascade* myCas;
 
-  for(lpRE_i i=fChildren.begin(); i!=fChildren.end(); ++i) {
+  for(List_i i=fChildren.begin(); i!=fChildren.end(); ++i) {
 
     myCas = (Cascade*)(*i);
     val = myCas->GetPosPseudoRapidity();
@@ -1143,7 +1143,7 @@ void CascadeList::BachPtFilter(Float_t min, Float_t max) {
   Bool_t isSelected;
   Cascade* myCas;
 
-  for(lpRE_i i=fChildren.begin(); i!=fChildren.end(); ++i) {
+  for(List_i i=fChildren.begin(); i!=fChildren.end(); ++i) {
 
     myCas = (Cascade*)(*i);
     val = myCas->GetBachPt();
@@ -1172,7 +1172,7 @@ void CascadeList::BachEtaFilter(Float_t min, Float_t max) {
   Bool_t isSelected;
   Cascade* myCas;
 
-  for(lpRE_i i=fChildren.begin(); i!=fChildren.end(); ++i) {
+  for(List_i i=fChildren.begin(); i!=fChildren.end(); ++i) {
 
     myCas = (Cascade*)(*i);
     val = myCas->GetBachPseudoRapidity();

diff --git a/EVE/Reve/GeoNode.cxx b/EVE/Reve/GeoNode.cxx
index 96b251988f8c6d0ab2019d9529bf35ebad43b803..390b9a47dc6dd1f69b5986c10ab9a087343c5c1c 100644 (file)
--- a/EVE/Reve/GeoNode.cxx
+++ b/EVE/Reve/GeoNode.cxx
@@ -102,7 +102,7 @@ void GeoNodeRnrEl::UpdateNode(TGeoNode* node)
   if(fNode == node)
     UpdateItems();
 
-  for(lpRE_i i=fChildren.begin(); i!=fChildren.end(); ++i) {
+  for(List_i i=fChildren.begin(); i!=fChildren.end(); ++i) {
     ((GeoNodeRnrEl*)(*i))->UpdateNode(node);
   }
 
@@ -124,7 +124,7 @@ void GeoNodeRnrEl::UpdateVolume(TGeoVolume* volume)
   if(fNode->GetVolume() == volume)
     UpdateItems();
 
-  for(lpRE_i i=fChildren.begin(); i!=fChildren.end(); ++i) {
+  for(List_i i=fChildren.begin(); i!=fChildren.end(); ++i) {
     ((GeoNodeRnrEl*)(*i))->UpdateVolume(volume);
   }
 }

diff --git a/EVE/Reve/PointSet.cxx b/EVE/Reve/PointSet.cxx
index fa5d11a390a70e804cdb8d77b29d90ad18dd8f15..6726686a222748c17c18b4151c2d2efdbbe3e4f2 100644 (file)
--- a/EVE/Reve/PointSet.cxx
+++ b/EVE/Reve/PointSet.cxx
@@ -178,7 +178,7 @@ void PointSetArray::RemoveElements()
 
 void PointSetArray::SetMarkerColor(Color_t tcolor)
 {
-  for(lpRE_i i=fChildren.begin(); i!=fChildren.end(); ++i) {
+  for(List_i i=fChildren.begin(); i!=fChildren.end(); ++i) {
     TAttMarker* m = dynamic_cast<TAttMarker*>((*i)->GetObject());
     if(m && m->GetMarkerColor() == fMarkerColor)
       m->SetMarkerColor(tcolor);
@@ -188,7 +188,7 @@ void PointSetArray::SetMarkerColor(Color_t tcolor)
 
 void PointSetArray::SetMarkerStyle(Style_t mstyle)
 {
-  for(lpRE_i i=fChildren.begin(); i!=fChildren.end(); ++i) {
+  for(List_i i=fChildren.begin(); i!=fChildren.end(); ++i) {
     TAttMarker* m = dynamic_cast<TAttMarker*>((*i)->GetObject());
     if(m && m->GetMarkerStyle() == fMarkerStyle)
       m->SetMarkerStyle(mstyle);
@@ -198,7 +198,7 @@ void PointSetArray::SetMarkerStyle(Style_t mstyle)
 
 void PointSetArray::SetMarkerSize(Size_t msize)
 {
-  for(lpRE_i i=fChildren.begin(); i!=fChildren.end(); ++i) {
+  for(List_i i=fChildren.begin(); i!=fChildren.end(); ++i) {
     TAttMarker* m = dynamic_cast<TAttMarker*>((*i)->GetObject());
     if(m && m->GetMarkerSize() == fMarkerSize)
       m->SetMarkerSize(msize);

diff --git a/EVE/Reve/RenderElement.cxx b/EVE/Reve/RenderElement.cxx
index a96db7f10198dd6b3dfb8d3478a2fed07e1d5a86..3b84665850222606934582cb514b80e8a213a253 100644 (file)
--- a/EVE/Reve/RenderElement.cxx
+++ b/EVE/Reve/RenderElement.cxx
@@ -41,7 +41,7 @@ RenderElement::~RenderElement()
 {
   static const Exc_t _eh("RenderElement::RenderElement ");
 
-  for(lpRE_i p=fParents.begin(); p!=fParents.end(); ++p) {
+  for(List_i p=fParents.begin(); p!=fParents.end(); ++p) {
     RenderElementListBase* l = dynamic_cast<RenderElementListBase*>(*p);
     if(l)
       l->RemoveElementLocal(this);
@@ -350,7 +350,7 @@ void RenderElementListBase::RemoveElementLocal(RenderElement* el)
 
 void RenderElementListBase::RemoveElements()
 {
-  for(lpRE_i i=fChildren.begin(); i!=fChildren.end(); ++i) {
+  for(List_i i=fChildren.begin(); i!=fChildren.end(); ++i) {
     (*i)->RemoveParent(this);
   }
   fChildren.clear();
@@ -391,7 +391,7 @@ Int_t RenderElementListBase::ExpandIntoListTree(TGListTree* ltree,
   if(parent->GetFirstChild() != 0)
     return 0;
   Int_t n = 0;
-  for(lpRE_i i=fChildren.begin(); i!=fChildren.end(); ++i) {
+  for(List_i i=fChildren.begin(); i!=fChildren.end(); ++i) {
     (*i)->AddIntoListTree(ltree, parent);
     ++n;
   }
@@ -416,13 +416,13 @@ Int_t RenderElementListBase::DestroyListSubTree(TGListTree* ltree,
 
 void RenderElementListBase::EnableListElements()
 {
-  for(lpRE_i i=fChildren.begin(); i!=fChildren.end(); ++i)
+  for(List_i i=fChildren.begin(); i!=fChildren.end(); ++i)
     (*i)->SetRnrElement(kTRUE);
 }
 
 void RenderElementListBase::DisableListElements()
 {
-  for(lpRE_i i=fChildren.begin(); i!=fChildren.end(); ++i)
+  for(List_i i=fChildren.begin(); i!=fChildren.end(); ++i)
     (*i)->SetRnrElement(kFALSE);
 }
 
@@ -431,7 +431,7 @@ void RenderElementListBase::DisableListElements()
 void RenderElementListBase::SetMainColor(Color_t col)
 {
   Color_t oldcol = GetMainColor();
-  for(lpRE_i i=fChildren.begin(); i!=fChildren.end(); ++i) {
+  for(List_i i=fChildren.begin(); i!=fChildren.end(); ++i) {
     if((*i)->GetMainColor() == oldcol) (*i)->SetMainColor(col);
   }
   RenderElement::SetMainColor(col);
@@ -449,7 +449,7 @@ void RenderElementListBase::SetMainColor(Pixel_t pixel)
 void RenderElementListBase::PaintElements(Option_t* option)
 {
   if(fRnrElement) {
-    for(lpRE_i i=fChildren.begin(); i!=fChildren.end(); ++i) {
+    for(List_i i=fChildren.begin(); i!=fChildren.end(); ++i) {
       if((*i)->GetRnrElement())
        (*i)->GetObject()->Paint(option);
     }

diff --git a/EVE/Reve/RenderElement.h b/EVE/Reve/RenderElement.h
index 402e6926a68d359680831237c59f12e70f5cebdf..8289cd6122a23c54c6829bbfbd5df78af3f30ed8 100644 (file)
--- a/EVE/Reve/RenderElement.h
+++ b/EVE/Reve/RenderElement.h
@@ -48,8 +48,8 @@ public:
   typedef std::set<ListTreeInfo>               sLTI_t;
   typedef std::set<ListTreeInfo>::iterator     sLTI_i;
 
-  typedef std::list<RenderElement*>            lpRE_t;
-  typedef std::list<RenderElement*>::iterator  lpRE_i;
+  typedef std::list<RenderElement*>            List_t;
+  typedef std::list<RenderElement*>::iterator  List_i;
 
 protected:
   // TRef     fSource;
@@ -58,7 +58,7 @@ protected:
   Color_t* fMainColorPtr;
 
   sLTI_t fItems;
-  lpRE_t fParents;
+  List_t fParents;
 
   Bool_t fDestroyOnZeroRefCnt;
   Bool_t fDenyDestroy;
@@ -71,6 +71,11 @@ public:
   virtual void AddParent(RenderElement* re);
   virtual void RemoveParent(RenderElement* re);
 
+  List_i BeginParents() { return fParents.begin(); }
+  List_i EndParents()   { return fParents.end();   }
+  Int_t  GetNParents() const { return fParents.size(); }
+
+
   Bool_t GetDestroyOnZeroRefCnt() const   { return fDestroyOnZeroRefCnt; }
   void   SetDestroyOnZeroRefCnt(Bool_t d) { fDestroyOnZeroRefCnt = d; }
 
@@ -156,7 +161,7 @@ public:
 class RenderElementListBase : public RenderElement
 {
 protected:
-  lpRE_t fChildren;
+  List_t fChildren;
 
   void PaintElements(Option_t* option="");
 
@@ -172,6 +177,10 @@ public:
 
   virtual void DestroyElements();
 
+  List_i BeginChildren() { return fChildren.begin(); }
+  List_i EndChildren()   { return fChildren.end();   }
+  Int_t  GetNChildren() const { return fChildren.size(); }
+
   virtual Int_t ExpandIntoListTree(TGListTree* ltree, TGListTreeItem* parent);
   virtual Int_t DestroyListSubTree(TGListTree* ltree, TGListTreeItem* parent);
 

diff --git a/EVE/Reve/V0.cxx b/EVE/Reve/V0.cxx
index 42775385a5255e24ce84a17ced69465fd016c588..ca848994829e9114ba49d6dac47ca8594095f1d4 100644 (file)
--- a/EVE/Reve/V0.cxx
+++ b/EVE/Reve/V0.cxx
@@ -455,7 +455,7 @@ void V0List::Paint(Option_t* option) {
   if(fRnrElement) {
 
     if(fRnrV0vtx) {
-      for(lpRE_i i=fChildren.begin(); i!=fChildren.end(); ++i) {
+      for(List_i i=fChildren.begin(); i!=fChildren.end(); ++i) {
        if((*i)->GetRnrElement()) {
          ((V0*)(*i))->Paint(option);
        }
@@ -463,7 +463,7 @@ void V0List::Paint(Option_t* option) {
     }
 
     if(fRnrDaughters) {
-      for(lpRE_i i=fChildren.begin(); i!=fChildren.end(); ++i) {
+      for(List_i i=fChildren.begin(); i!=fChildren.end(); ++i) {
        if((*i)->GetRnrElement()) {
          ((V0*)(*i))->PaintDaughters(option);
        }
@@ -471,7 +471,7 @@ void V0List::Paint(Option_t* option) {
     }
 
     if(fRnrV0path) {
-      for(lpRE_i i=fChildren.begin(); i!=fChildren.end(); ++i) {
+      for(List_i i=fChildren.begin(); i!=fChildren.end(); ++i) {
        if((*i)->GetRnrElement()) {
          ((V0*)(*i))->PaintPath(option);
        }
@@ -512,7 +512,7 @@ void V0List::SetRnrDaughters(Bool_t rnr) {
 //______________________________________________________________________
 
 void V0List::MakeV0s() {
-  for(lpRE_i i=fChildren.begin(); i!=fChildren.end(); ++i) {
+  for(List_i i=fChildren.begin(); i!=fChildren.end(); ++i) {
     ((V0*)(*i))->MakeV0();
   }
   gReve->Redraw3D();
@@ -668,7 +668,7 @@ void V0List::FilterAll() {
     fHist2D[i]->Reset();
   
   V0* myV0;
-  for(lpRE_i i=fChildren.begin(); i!=fChildren.end(); ++i) {
+  for(List_i i=fChildren.begin(); i!=fChildren.end(); ++i) {
 
     myV0 = (V0*)(*i);
     Filter(myV0);
@@ -681,7 +681,7 @@ void V0List::GetV0IndexRange(Int_t &imin, Int_t &imax) {
 
   Int_t index;
   V0* myV0;
-  lpRE_i i=fChildren.begin();
+  List_i i=fChildren.begin();
   myV0 = (V0*)(*i);
   index = myV0->GetESDIndex();
   imin = index;
@@ -708,7 +708,7 @@ void V0List::PtFilter(Float_t min, Float_t max) {
   Bool_t isSelected;
   V0* myV0;
 
-  for(lpRE_i i=fChildren.begin(); i!=fChildren.end(); ++i) {
+  for(List_i i=fChildren.begin(); i!=fChildren.end(); ++i) {
 
     myV0 = (V0*)(*i);
     val = myV0->GetPt();
@@ -738,7 +738,7 @@ void V0List::K0sMFilter(Float_t min, Float_t max) {
   Bool_t isSelected;
   V0* myV0;
 
-  for(lpRE_i i=fChildren.begin(); i!=fChildren.end(); ++i) {
+  for(List_i i=fChildren.begin(); i!=fChildren.end(); ++i) {
 
     myV0 = (V0*)(*i);
     val = myV0->GetK0mass();
@@ -767,7 +767,7 @@ void V0List::LamMFilter(Float_t min, Float_t max) {
   Bool_t isSelected;
   V0* myV0;
 
-  for(lpRE_i i=fChildren.begin(); i!=fChildren.end(); ++i) {
+  for(List_i i=fChildren.begin(); i!=fChildren.end(); ++i) {
 
     myV0 = (V0*)(*i);
     val = myV0->GetLamMass();
@@ -798,7 +798,7 @@ void V0List::ALamMFilter(Float_t min, Float_t max) {
   Bool_t isSelected;
   V0* myV0;
 
-  for(lpRE_i i=fChildren.begin(); i!=fChildren.end(); ++i) {
+  for(List_i i=fChildren.begin(); i!=fChildren.end(); ++i) {
 
     myV0 = (V0*)(*i);
     val = myV0->GetAntiLamMass();
@@ -827,7 +827,7 @@ void V0List::CosPointingFilter(Float_t min, Float_t max) {
   Bool_t isSelected;
   V0* myV0;
 
-  for(lpRE_i i=fChildren.begin(); i!=fChildren.end(); ++i) {
+  for(List_i i=fChildren.begin(); i!=fChildren.end(); ++i) {
 
     myV0 = (V0*)(*i);
     val = myV0->GetCosPointingAngle();
@@ -856,7 +856,7 @@ void V0List::DaughterDCAFilter(Float_t min, Float_t max) {
   Bool_t isSelected;
   V0* myV0;
 
-  for(lpRE_i i=fChildren.begin(); i!=fChildren.end(); ++i) {
+  for(List_i i=fChildren.begin(); i!=fChildren.end(); ++i) {
 
     myV0 = (V0*)(*i);
     val = myV0->GetDaughterDCA();
@@ -885,7 +885,7 @@ void V0List::RadiusFilter(Float_t min, Float_t max) {
   Bool_t isSelected;
   V0* myV0;
 
-  for(lpRE_i i=fChildren.begin(); i!=fChildren.end(); ++i) {
+  for(List_i i=fChildren.begin(); i!=fChildren.end(); ++i) {
 
     myV0 = (V0*)(*i);
     val = myV0->GetRadius();
@@ -914,7 +914,7 @@ void V0List::EtaFilter(Float_t min, Float_t max) {
   Bool_t isSelected;
   V0* myV0;
 
-  for(lpRE_i i=fChildren.begin(); i!=fChildren.end(); ++i) {
+  for(List_i i=fChildren.begin(); i!=fChildren.end(); ++i) {
 
     myV0 = (V0*)(*i);
     val = myV0->GetPseudoRapidity();
@@ -943,7 +943,7 @@ void V0List::NegPtFilter(Float_t min, Float_t max) {
   Bool_t isSelected;
   V0* myV0;
 
-  for(lpRE_i i=fChildren.begin(); i!=fChildren.end(); ++i) {
+  for(List_i i=fChildren.begin(); i!=fChildren.end(); ++i) {
 
     myV0 = (V0*)(*i);
     val = myV0->GetNegPt();
@@ -972,7 +972,7 @@ void V0List::NegEtaFilter(Float_t min, Float_t max) {
   Bool_t isSelected;
   V0* myV0;
 
-  for(lpRE_i i=fChildren.begin(); i!=fChildren.end(); ++i) {
+  for(List_i i=fChildren.begin(); i!=fChildren.end(); ++i) {
 
     myV0 = (V0*)(*i);
     val = myV0->GetNegPseudoRapidity();
@@ -1001,7 +1001,7 @@ void V0List::PosPtFilter(Float_t min, Float_t max) {
   Bool_t isSelected;
   V0* myV0;
 
-  for(lpRE_i i=fChildren.begin(); i!=fChildren.end(); ++i) {
+  for(List_i i=fChildren.begin(); i!=fChildren.end(); ++i) {
 
     myV0 = (V0*)(*i);
     val = myV0->GetPosPt();
@@ -1030,7 +1030,7 @@ void V0List::PosEtaFilter(Float_t min, Float_t max) {
   Bool_t isSelected;
   V0* myV0;
 
-  for(lpRE_i i=fChildren.begin(); i!=fChildren.end(); ++i) {
+  for(List_i i=fChildren.begin(); i!=fChildren.end(); ++i) {
 
     myV0 = (V0*)(*i);
     val = myV0->GetPosPseudoRapidity();
@@ -1059,7 +1059,7 @@ void V0List::IndexFilter(Float_t min, Float_t max) {
   Bool_t isSelected;
   V0* myV0;
 
-  for(lpRE_i i=fChildren.begin(); i!=fChildren.end(); ++i) {
+  for(List_i i=fChildren.begin(); i!=fChildren.end(); ++i) {
 
     myV0 = (V0*)(*i);
     val = myV0->GetESDIndex();