Update of the TPC-ITS alignment code (Mikolaj)

[u/mrichter/AliRoot.git] / MUON / AliMUONPreClusterFinderV2.cxx

diff --git a/MUON/AliMUONPreClusterFinderV2.cxx b/MUON/AliMUONPreClusterFinderV2.cxx
index c0fc9ea1be4546ba7637d435b0daaff762031d65..143373c46b15f46c44b528b949b16b7a720f5500 100644 (file)
--- a/MUON/AliMUONPreClusterFinderV2.cxx
+++ b/MUON/AliMUONPreClusterFinderV2.cxx
@@ -20,6 +20,7 @@
 #include "AliLog.h"
 #include "AliMUONCluster.h"
 #include "AliMpVSegmentation.h"
+#include "AliMpPad.h"
 #include "TClonesArray.h"
 #include "TVector2.h"
 #include "AliMUONPad.h"
@@ -42,7 +43,7 @@ ClassImp(AliMUONPreClusterFinderV2)
 AliMUONPreClusterFinderV2::AliMUONPreClusterFinderV2()
 : AliMUONVClusterFinder(),
   fClusters(0x0),
-  fSegmentations(0x0),
+  fkSegmentations(0x0),
   fPads(0x0),
   fDetElemId(0)
 {
@@ -91,7 +92,7 @@ AliMUONPreClusterFinderV2::Prepare(Int_t detElemId,
   fClusters = new TClonesArray("AliMUONCluster");
 
   fPads = pads;
-  fSegmentations = seg;
+  fkSegmentations = seg;
   
   fDetElemId = detElemId;
   
@@ -120,8 +121,8 @@ AliMUONPreClusterFinderV2::AddPad(AliMUONCluster& cluster, AliMUONPad* pad)
   
   // Check neighbours
   TObjArray neighbours;
-  AliMpPad p = fSegmentations[pad->Cathode()]->PadByIndices(AliMpIntPair(pad->Ix(),pad->Iy()),kTRUE);
-  Int_t nn = fSegmentations[pad->Cathode()]->GetNeighbours(p,neighbours);
+  AliMpPad p = fkSegmentations[pad->Cathode()]->PadByIndices(pad->Ix(),pad->Iy(),kTRUE);
+  Int_t nn = fkSegmentations[pad->Cathode()]->GetNeighbours(p,neighbours);
   for (Int_t in = 0; in < nn; ++in) 
   {
     AliMpPad* p1 = static_cast<AliMpPad*>(neighbours.At(in));
@@ -131,8 +132,8 @@ AliMUONPreClusterFinderV2::AddPad(AliMUONCluster& cluster, AliMUONPad* pad)
     
     while ( ( p2 = static_cast<AliMUONPad*>(next2()) ) )
     {
-        if ( !p2->IsUsed() && p2->Ix()==p1->GetIndices().GetFirst() 
-             && p2->Iy() == p1->GetIndices().GetSecond() &&
+        if ( !p2->IsUsed() && p2->Ix()==p1->GetIx() 
+             && p2->Iy() == p1->GetIy() &&
              p2->Cathode() == pad->Cathode() )
         {
           AddPad(cluster,p2);