Adding the cascade performance task (Antonin Maire)

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

diff --git a/MUON/AliMUONTriggerGUIbdmap.cxx b/MUON/AliMUONTriggerGUIbdmap.cxx
index 26e9b222159ebed7f1e7385e49746d2eeb73219f..c94de217425dcb6df65ae3c42f8bde6a3f685da2 100644 (file)
--- a/MUON/AliMUONTriggerGUIbdmap.cxx
+++ b/MUON/AliMUONTriggerGUIbdmap.cxx
@@ -37,27 +37,29 @@
 
 #include "AliRunLoader.h"
 #include "AliMUONVDigit.h"
-#include "AliMpVSegmentation.h"
-#include "AliMpSegmentation.h"
 #include "AliMUONGeometryTransformer.h"
-#include "AliMpDEIterator.h"
 #include "AliMUONLocalTrigger.h"
 #include "AliMUONLocalTriggerBoard.h"
 #include "AliMUONTriggerCrateStore.h"
 #include "AliMUONMCDataInterface.h"
 #include "AliMUONTriggerStoreV1.h"
 #include "AliMUONDigitStoreV1.h"
-#include "AliMpDEManager.h"
-
 #include "AliMUONTriggerGUIboard.h"
 #include "AliMUONTriggerGUIbdmap.h"
 
+#include "AliMpDEManager.h"
+#include "AliMpDEIterator.h"
+#include "AliMpEncodePair.h"
+#include "AliMpVSegmentation.h"
+#include "AliMpSegmentation.h"
+
+
 /// \cond CLASSIMP
 ClassImp(AliMUONTriggerGUIbdmap)
 /// \endcond
 
 //__________________________________________________________________________
-AliMUONTriggerGUIbdmap::AliMUONTriggerGUIbdmap(const TGWindow *p, const TGWindow *main, UInt_t w, UInt_t h)
+AliMUONTriggerGUIbdmap::AliMUONTriggerGUIbdmap(const TGWindow *p, const TGWindow *mainWindow, UInt_t w, UInt_t h)
   : TGFrame(0),
     fMain(0),
     fLocTrigE(0),
@@ -88,7 +90,7 @@ AliMUONTriggerGUIbdmap::AliMUONTriggerGUIbdmap(const TGWindow *p, const TGWindow
   gStyle->SetPadTopMargin(0.05);
   gStyle->SetPadBottomMargin(0.05);
 
-  fMain = new TGTransientFrame(p, main, w, h, kVerticalFrame);
+  fMain = new TGTransientFrame(p, mainWindow, w, h, kVerticalFrame);
   fMain->Connect("CloseWindow()", "AliMUONTriggerGUIbdmap", this, "CloseWindow()");
   fMain->DontCallClose(); // to avoid double deletions.
   
@@ -883,8 +885,8 @@ void AliMUONTriggerGUIbdmap::DrawDigits(Bool_t bx, Bool_t by)
 
     chamber = 11+i;
     
-    AliMpIntPair deRange = AliMpDEManager::GetDetElemIdRange(chamber-1);
-    TIter next(digitStore->CreateIterator(deRange.GetFirst(),deRange.GetSecond()));
+    MpPair_t deRange = AliMpDEManager::GetDetElemIdRange(chamber-1);
+    TIter next(digitStore->CreateIterator(AliMp::PairFirst(deRange),AliMp::PairSecond(deRange)));
     AliMUONVDigit *mdig;
     
     while ( ( mdig = static_cast<AliMUONVDigit*>(next())) )
@@ -910,16 +912,16 @@ void AliMUONTriggerGUIbdmap::DrawDigits(Bool_t bx, Bool_t by)
        
        seg = AliMpSegmentation::Instance()->GetMpSegmentation(detElemId, AliMp::GetCathodType(cathode));  
        
-       pad = seg->PadByIndices(AliMpIntPair(ix,iy),kTRUE);
+       pad = seg->PadByIndices(ix,iy,kTRUE);
        
        //if (cathode == 0) printf("GUI x:  ix %d iy %d \n",ix,iy);
        //if (cathode == 1) printf("GUI y:  ix %d iy %d \n",ix,iy);
        
        // get the pad position and dimensions
-       Float_t xlocal1 = pad.Position().X();
-       Float_t ylocal1 = pad.Position().Y();
-       Float_t xlocal2 = pad.Dimensions().X();
-       Float_t ylocal2 = pad.Dimensions().Y();
+       Float_t xlocal1 = pad.GetPositionX();
+       Float_t ylocal1 = pad.GetPositionY();
+       Float_t xlocal2 = pad.GetDimensionX();
+       Float_t ylocal2 = pad.GetDimensionY();
        
        transformer.Local2Global(detElemId, xlocal1, ylocal1, 0, xg1, yg1, zg1);
        // (no transformation for pad dimensions)
@@ -1225,15 +1227,15 @@ void AliMUONTriggerGUIbdmap::DrawStrips(Bool_t bx, Bool_t by)
       for (Int_t ix = 0; ix <= maxX; ix++) {
        for (Int_t iy = 0; iy <= maxY; iy++) {
          
-         pad = seg->PadByIndices(AliMpIntPair(ix,iy),kFALSE);
+         pad = seg->PadByIndices(ix,iy,kFALSE);
          
          if (!pad.IsValid()) continue;
          
          // get the pad position and dimensions
-         xlocal1 = pad.Position().X();
-         ylocal1 = pad.Position().Y();
-         xlocal2 = pad.Dimensions().X();
-         ylocal2 = pad.Dimensions().Y();
+         xlocal1 = pad.GetPositionX();
+         ylocal1 = pad.GetPositionY();
+         xlocal2 = pad.GetDimensionX();
+         ylocal2 = pad.GetDimensionY();
          
          transformer.Local2Global(detElemId, xlocal1, ylocal1, 0, xg1, yg1, zg1);
          // (no transformation for pad dimensions)
@@ -1320,15 +1322,15 @@ void AliMUONTriggerGUIbdmap::DrawStrips(Bool_t bx, Bool_t by)
       for (Int_t ix = 0; ix <= maxX; ix++) {
        for (Int_t iy = 0; iy <= maxY; iy++) {
          
-         pad = seg->PadByIndices(AliMpIntPair(ix,iy),kFALSE);
+         pad = seg->PadByIndices(ix,iy,kFALSE);
          
          if (!pad.IsValid()) continue;
          
          // get the pad position and dimensions
-         xlocal1 = pad.Position().X();
-         ylocal1 = pad.Position().Y();
-         xlocal2 = pad.Dimensions().X();
-         ylocal2 = pad.Dimensions().Y();
+         xlocal1 = pad.GetPositionX();
+         ylocal1 = pad.GetPositionY();
+         xlocal2 = pad.GetDimensionX();
+         ylocal2 = pad.GetDimensionY();
          
          transformer.Local2Global(detElemId, xlocal1, ylocal1, 0, xg1, yg1, zg1);
          // (no transformation for pad dimensions)