X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=MUON%2FAliMUONTriggerGUIdimap.cxx;h=ed3602fe0e0ef142a5e50f9d05519feaf7769091;hb=257f0eee1768a2fce3261c00d1abba5bec687da0;hp=e87595ac760b4ae964701b3e476b79c0763bf5a7;hpb=8b067dfec5d61db40c3a07deccbd9c25e9456a8a;p=u%2Fmrichter%2FAliRoot.git

diff --git a/MUON/AliMUONTriggerGUIdimap.cxx b/MUON/AliMUONTriggerGUIdimap.cxx
index e87595ac760..ed3602fe0e0 100644
--- a/MUON/AliMUONTriggerGUIdimap.cxx
+++ b/MUON/AliMUONTriggerGUIdimap.cxx
@@ -33,6 +33,7 @@
 #include <TStyle.h>
 #include <TObjArray.h>
 
+#include "AliLoader.h"
 #include "AliRunLoader.h"
 
 #include "AliMUONVDigit.h"
@@ -46,6 +47,8 @@
 
 #include "AliMUONDigitStoreV1.h"
 
+#include <cstdio>
+
 /// \cond CLASSIMP
 ClassImp(AliMUONTriggerGUIdimap)
 /// \endcond
@@ -255,7 +258,7 @@ void AliMUONTriggerGUIdimap::DrawMaps(Int_t chamber)
   TPaveText *label;
   TBox *boxd;
 
-  Char_t cln[2];
+  Char_t cln[4]; // must be 4 long - room for terminating '\0'
   Int_t detElemId, cathode, ix, iy, charge, color;
   Int_t holdS, holdL, holdC;
   Float_t xCenter, yCenter, xWidth, yWidth, holdXC, holdYC;
@@ -324,7 +327,7 @@ void AliMUONTriggerGUIdimap::DrawMaps(Int_t chamber)
 
     if (holdL == 9) {
 
-      sprintf(cln,"C%1d",holdC);
+      snprintf(cln,4,"C%1d",holdC);
 
       ptx1 = holdXC - lWidth;
       ptx2 = holdXC + lWidth;
@@ -339,7 +342,7 @@ void AliMUONTriggerGUIdimap::DrawMaps(Int_t chamber)
     }
     if (holdL == 1) {
 
-      sprintf(cln,"C%1d",holdC);
+      snprintf(cln,4,"C%1d",holdC);
 
       ptx1 = holdXC - lWidth;
       ptx2 = holdXC + lWidth;
@@ -354,7 +357,7 @@ void AliMUONTriggerGUIdimap::DrawMaps(Int_t chamber)
     }
     if (holdS == 0 && holdC == 7) {
 
-      sprintf(cln,"L%1d",holdL);
+      snprintf(cln,4,"L%1d",holdL);
 
       ptx1 = -1.07*frameXmax - lWidth;
       ptx2 = -1.07*frameXmax + lWidth;
@@ -369,7 +372,7 @@ void AliMUONTriggerGUIdimap::DrawMaps(Int_t chamber)
     }
     if (holdS == 1 && holdC == 7) {
 
-      sprintf(cln,"L%1d",holdL);
+      snprintf(cln,4,"L%1d",holdL);
 
       ptx1 = +1.07*frameXmax - lWidth;
       ptx2 = +1.07*frameXmax + lWidth;
@@ -456,7 +459,7 @@ void AliMUONTriggerGUIdimap::DrawMaps(Int_t chamber)
       digitStore = fMCDataInterface->DigitStore(runLoader->GetEventNumber());
     }
     if (drawDigitsRaw) {
-      digitStore = static_cast<AliMUONVDigitStore*>(fRawDigitStore);
+      digitStore = fRawDigitStore;
     }
     
     TIter next(digitStore->CreateIterator());
@@ -477,13 +480,13 @@ void AliMUONTriggerGUIdimap::DrawMaps(Int_t chamber)
       
       const AliMpVSegmentation* seg2 = AliMpSegmentation::Instance()->GetMpSegmentation(detElemId,AliMp::GetCathodType(cathode-1));
       
-      AliMpPad mpad = seg2->PadByIndices(AliMpIntPair(ix,iy),kTRUE);
+      AliMpPad mpad = seg2->PadByIndices(ix,iy,kTRUE);
       
       // get the pad position and dimensions
-      Float_t xlocal1 = mpad.Position().X();
-      Float_t ylocal1 = mpad.Position().Y();
-      Float_t xlocal2 = mpad.Dimensions().X();
-      Float_t ylocal2 = mpad.Dimensions().Y();
+      Float_t xlocal1 = mpad.GetPositionX();
+      Float_t ylocal1 = mpad.GetPositionY();
+      Float_t xlocal2 = mpad.GetDimensionX();
+      Float_t ylocal2 = mpad.GetDimensionY();
       
       transformer.Local2Global(detElemId, xlocal1, ylocal1, 0, xg1, yg1, zg1);
       // (no transformation for pad dimensions)