Replacement of AliMpIntPair object with algoritmic

[u/mrichter/AliRoot.git] / MUON / mapping / macros / timeMapping.C

diff --git a/MUON/mapping/macros/timeMapping.C b/MUON/mapping/macros/timeMapping.C
index 96a504c7672deec0ebad87624e83b6ccfaaf8a7e..c597089bd5ccbfe71e3f089dfd5f50b446ac904c 100644 (file)
--- a/MUON/mapping/macros/timeMapping.C
+++ b/MUON/mapping/macros/timeMapping.C
@@ -85,8 +85,6 @@
 // on revision before 31082 (where AliMpVSegmentation did not have the HasPadBy...
 // methods).
 
-#define HASPAD
-
 //______________________________________________________________________________
 Int_t StationId(Int_t detElemId)
 {
@@ -137,12 +135,11 @@ void ByIndices(const AliMpVSegmentation* seg, Int_t detElemId)
     {
       for ( Int_t iy = 0; iy < seg->MaxPadIndexY(); ++iy )
       {
-        seg->PadByIndices(AliMpIntPair(ix,iy),kFALSE);
+        seg->PadByIndices(ix,iy,kFALSE);
       }
     }
   }
   
-#ifdef HASPAD        
   {
     AliCodeTimerAutoGeneral(Form("HasPadByIndices-St%d",stationId));
     
@@ -150,11 +147,10 @@ void ByIndices(const AliMpVSegmentation* seg, Int_t detElemId)
     {
       for ( Int_t iy = 0; iy < seg->MaxPadIndexY(); ++iy )
       {
-        seg->HasPadByIndices(AliMpIntPair(ix,iy));
+        seg->HasPadByIndices(ix,iy);
       }
     }
   }
-#endif        
 }
 
 //______________________________________________________________________________
@@ -168,20 +164,18 @@ void ByLocation(const AliMpVSegmentation* seg, Int_t detElemId, Int_t manuId)
   
     for ( Int_t manuChannel = 0; manuChannel < AliMpConstants::ManuNofChannels(); ++manuChannel )
     {
-      seg->PadByLocation(AliMpIntPair(manuId,manuChannel),kFALSE);
+      seg->PadByLocation(manuId,manuChannel,kFALSE);
     }
   }
 
-#ifdef HASPAD
   {
     AliCodeTimerAutoGeneral(Form("HasPadByLocation-St%d",stationId));
     
     for ( Int_t manuChannel = 0; manuChannel < AliMpConstants::ManuNofChannels(); ++manuChannel )
     {
-      seg->HasPadByLocation(AliMpIntPair(manuId,manuChannel));
+      seg->HasPadByLocation(manuId,manuChannel);
     }
   }
-#endif      
   
 }