Replacement of AliMpIntPair object with algoritmic

[u/mrichter/AliRoot.git] / MUON / mapping / AliMpMotifPositionPadIterator.cxx

diff --git a/MUON/mapping/AliMpMotifPositionPadIterator.cxx b/MUON/mapping/AliMpMotifPositionPadIterator.cxx
index dc9c97f7b3859ef77e79aca86fbe4095aaefb3b0..0b653f32d67d51fe1af62257df0f84b0d3b126b7 100755 (executable)
--- a/MUON/mapping/AliMpMotifPositionPadIterator.cxx
+++ b/MUON/mapping/AliMpMotifPositionPadIterator.cxx
@@ -29,6 +29,7 @@
 #include "AliMpMotifPosition.h"
 #include "AliMpMotifType.h"
 #include "AliMpConnection.h"
+#include "AliMpEncodePair.h"
 
 /// \cond CLASSIMP
 ClassImp(AliMpMotifPositionPadIterator)
@@ -37,7 +38,7 @@ ClassImp(AliMpMotifPositionPadIterator)
 //______________________________________________________________________________
 AliMpMotifPositionPadIterator::AliMpMotifPositionPadIterator():
     AliMpVPadIterator(),
-    fMotifPos(0),
+    fkMotifPos(0),
     fIterator()
 {
 /// Default constructor, set the current position to "invalid"
@@ -48,7 +49,7 @@ AliMpMotifPositionPadIterator::AliMpMotifPositionPadIterator():
 AliMpMotifPositionPadIterator::AliMpMotifPositionPadIterator(
                                     const AliMpMotifPosition* motifPos)
   : AliMpVPadIterator(),
-    fMotifPos(motifPos),
+    fkMotifPos(motifPos),
     fIterator(motifPos->GetMotif()->GetMotifType())
 {
 /// Standard constructor, let *this to invalid position
@@ -58,7 +59,7 @@ AliMpMotifPositionPadIterator::AliMpMotifPositionPadIterator(
 AliMpMotifPositionPadIterator::AliMpMotifPositionPadIterator(
                                     const AliMpMotifPositionPadIterator& right)
   : AliMpVPadIterator(right),
-    fMotifPos(right.fMotifPos),
+    fkMotifPos(right.fkMotifPos),
     fIterator(right.fIterator)
     
 {
@@ -88,7 +89,7 @@ AliMpMotifPositionPadIterator::operator = (const AliMpMotifPositionPadIterator&
   // base class assignment
   AliMpVPadIterator::operator=(right);
 
-  fMotifPos = right.fMotifPos;
+  fkMotifPos = right.fkMotifPos;
   fIterator = right.fIterator;
 
   return *this;
@@ -102,7 +103,7 @@ Bool_t AliMpMotifPositionPadIterator::IsValid() const
 {
 /// Is the iterator in a valid position?
 
-    return (fMotifPos!=0) && (!fIterator.IsDone());
+    return (fkMotifPos!=0) && (!fIterator.IsDone());
 } 
 
 //
@@ -115,7 +116,7 @@ void AliMpMotifPositionPadIterator::First()
 /// Reset the iterator, so that it points to the first available
 /// pad in the motif type
 
-    if (!fMotifPos) {
+    if (!fkMotifPos) {
         Invalidate();
         return ;
     }
@@ -145,17 +146,19 @@ AliMpPad AliMpMotifPositionPadIterator::CurrentItem() const
 {
 /// Return current pad.
 
-    if (!fMotifPos)
+    if (!fkMotifPos)
         return AliMpPad::Invalid();
     else {
-      AliMpIntPair ind = fIterator.CurrentItem().GetIndices();
-      AliMpMotifType* mt = fMotifPos->GetMotif()->GetMotifType();
+      MpPair_t ind = fIterator.CurrentItem().GetIndices();
+      AliMpMotifType* mt = fkMotifPos->GetMotif()->GetMotifType();
       AliMpConnection* connect = 
         mt->FindConnectionByLocalIndices(ind);
-      return AliMpPad(AliMpIntPair(fMotifPos->GetID(),connect->GetGassiNum()),
-                  fMotifPos->GlobalIndices(ind),
-                  fMotifPos->Position()+fMotifPos->GetMotif()->PadPositionLocal(ind),
-                  fMotifPos->GetMotif()->GetPadDimensions(ind));
+      return AliMpPad(
+                  fkMotifPos->GetID(),connect->GetManuChannel(), 
+                  fkMotifPos->GlobalIndices(ind),
+                  fkMotifPos->Position()+
+                  fkMotifPos->GetMotif()->PadPositionLocal(ind),
+                  fkMotifPos->GetMotif()->GetPadDimensionsByIndices(ind));
     }
 }