Consolidating method name (Laurent)
authorlaphecet <laphecet@f7af4fe6-9843-0410-8265-dc069ae4e863>
Wed, 18 Feb 2009 11:33:33 +0000 (11:33 +0000)
committerlaphecet <laphecet@f7af4fe6-9843-0410-8265-dc069ae4e863>
Wed, 18 Feb 2009 11:33:33 +0000 (11:33 +0000)
MUON/AliMUONPainterContourMaker.cxx
MUON/mapping/AliMpConnection.h
MUON/mapping/AliMpMotifPainter.cxx
MUON/mapping/AliMpMotifPositionPadIterator.cxx
MUON/mapping/AliMpMotifType.cxx
MUON/mapping/AliMpSectorSegmentation.cxx
MUON/mapping/AliMpSlatSegmentation.cxx
MUON/mapping/data/station345/flipPCB.C

index c7f9f5d..c85a307 100644 (file)
@@ -782,7 +782,7 @@ AliMUONPainterContourMaker::GenerateManuContour(const char* name,
         {
           // the pad is on the edge
           Int_t id = AliMUONVDigit::BuildUniqueID(detElemId,manuId,
-                                                  connection->GetGassiNum(),0);
+                                                  connection->GetManuChannel(),0);
           ePads.AddLast(new AliMUONNeighbour(id,position,dimensions,left,right,top,bottom));
         }
       }
index d2eaa3e..f8edeed 100755 (executable)
@@ -28,10 +28,6 @@ class AliMpConnection : public TObject
                     const AliMpIntPair& localIndices);
     virtual ~AliMpConnection();
 
-    // methods
-
-  Int_t ManuChannel() const { return fGassiNum; }
-  
     //
     // accessors
     //
@@ -39,8 +35,8 @@ class AliMpConnection : public TObject
     Int_t GetBergNum()   const {return fBergNum;}
           /// Return kapton connector number
     Int_t GetKaptonNum() const {return fKaptonNum;}
-          /// Return Gassiplex channel number
-    Int_t GetGassiNum()  const {return fGassiNum;}
+          /// Return manu channel number
+  Int_t GetManuChannel() const { return fGassiNum; }
           /// Return pad number
     Int_t GetPadNum()  const {return fPadNum;}
           /// Return the motif type which contains this connection
index 09a8c87..8a39222 100755 (executable)
@@ -191,7 +191,7 @@ void AliMpMotifPainter::Paint(Option_t *option)
               gVirtualX->SetTextSize(10);
               gVirtualX->SetTextAlign(22);
               gPad->PaintText((bl.X()+ur.X())/2.0,(bl.Y()+ur.Y())/2.0,
-                              Form("%d",connect->GetGassiNum()));
+                              Form("%d",connect->GetManuChannel()));
               
               gVirtualX->SetTextSize(textSize);
                  }
index 7b619a4..1a9778a 100755 (executable)
@@ -152,7 +152,7 @@ AliMpPad AliMpMotifPositionPadIterator::CurrentItem() const
       AliMpMotifType* mt = fkMotifPos->GetMotif()->GetMotifType();
       AliMpConnection* connect = 
         mt->FindConnectionByLocalIndices(ind);
-      return AliMpPad(AliMpIntPair(fkMotifPos->GetID(),connect->GetGassiNum()),
+      return AliMpPad(AliMpIntPair(fkMotifPos->GetID(),connect->GetManuChannel()),
                   fkMotifPos->GlobalIndices(ind),
                   fkMotifPos->Position()+fkMotifPos->GetMotif()->PadPositionLocal(ind),
                   fkMotifPos->GetMotif()->GetPadDimensions(ind));
index 0a7c7f1..659f104 100755 (executable)
@@ -189,7 +189,7 @@ AliMpMotifType::AddConnection(AliMpConnection* connection)
   Int_t ix = connection->LocalIndices().GetFirst();
   Int_t iy = connection->LocalIndices().GetSecond();
   
-  Int_t manuChannel = connection->ManuChannel();
+  Int_t manuChannel = connection->GetManuChannel();
   
   if ( ix >=0 && ix < fMaxNofPads &&
       iy >=0 && iy < fMaxNofPads && 
@@ -436,7 +436,7 @@ void AliMpMotifType::Print(Option_t *option) const
             break;
           case 'B':str=Form("%d",connexion->GetBergNum());
             break;
-          case 'G':str=Form("%d",connexion->GetGassiNum());
+          case 'G':str=Form("%d",connexion->GetManuChannel());
             break;
           default:str= Form("%d",connexion->GetPadNum());
         }
index 92e601c..5160df2 100755 (executable)
@@ -428,7 +428,7 @@ AliMpSectorSegmentation::PadByIndices(const AliMpIntPair& indices,
   TVector2 localPos = motif->PadPositionLocal(localIndices);
 
   return (*fPadBuffer) 
-    = AliMpPad(AliMpIntPair(motifPos->GetID(),connection->GetGassiNum()),
+    = AliMpPad(AliMpIntPair(motifPos->GetID(),connection->GetManuChannel()),
                indices,
                motifPos->Position()+localPos,
                motif->GetPadDimensions(localIndices)); 
@@ -467,7 +467,7 @@ AliMpSectorSegmentation::PadByPosition(const TVector2& position,
   }
   
   return (*fPadBuffer)
-    = AliMpPad(AliMpIntPair(motifPosID,connect->GetGassiNum()),
+    = AliMpPad(AliMpIntPair(motifPosID,connect->GetManuChannel()),
                motifPos->GlobalIndices(localIndices),
                motifPos->Position()+motif->PadPositionLocal(localIndices),
                motif->GetPadDimensions(localIndices));
index d21ff7d..2333ea5 100644 (file)
@@ -290,7 +290,7 @@ AliMpSlatSegmentation::PadByIndices(const AliMpIntPair& indices,
     return AliMpPad::Invalid();
        }
        
-  return AliMpPad(AliMpIntPair(motifPos->GetID(),connection->GetGassiNum()),
+  return AliMpPad(AliMpIntPair(motifPos->GetID(),connection->GetManuChannel()),
                   indices,
                   motifPos->Position()
                   + motif->PadPositionLocal(localIndices)
@@ -348,7 +348,7 @@ AliMpSlatSegmentation::PadByPosition(const TVector2& position,
                return AliMpPad::Invalid();
        }
   
-  return AliMpPad(AliMpIntPair(motifPos->GetID(),connect->GetGassiNum()),
+  return AliMpPad(AliMpIntPair(motifPos->GetID(),connect->GetManuChannel()),
                   motifPos->GlobalIndices(localIndices),
                   motifPos->Position()
                   + motif->PadPositionLocal(localIndices)
index 708e290..a55e1ac 100644 (file)
@@ -73,7 +73,7 @@ AliMpPCB* flipX(const AliMpPCB& src,
       AliMpConnection* destConnection = getConnection(*dest,dix,iy);
       if ( srcConnection && destConnection )
       {
-        destConnection->SetGassiNum(srcConnection->GetGassiNum());
+        destConnection->SetGassiNum(srcConnection->GetManuChannel());
       }
       else
       {