X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=MUON%2FAliMUONTriggerGUIboard.cxx;h=3a2dfb8532d15b961e3e94adc8575c37d80a73b9;hb=320923dcdbdfd51e2a95d4abc9930150add73341;hp=7d4bfb36383e9373c2158c132d527bd6f3510fba;hpb=2129750f8c0a1df7587cac044c69465127fcd2ea;p=u%2Fmrichter%2FAliRoot.git

diff --git a/MUON/AliMUONTriggerGUIboard.cxx b/MUON/AliMUONTriggerGUIboard.cxx
index 7d4bfb36383..3a2dfb8532d 100644
--- a/MUON/AliMUONTriggerGUIboard.cxx
+++ b/MUON/AliMUONTriggerGUIboard.cxx
@@ -44,6 +44,11 @@ AliMUONTriggerGUIboard::AliMUONTriggerGUIboard()
     fStatus(0),
     fPosition(0),
     fYOver(0),
+    fXCenter(),
+    fYCenter(),
+    fZCenter(),
+    fXWidth(),
+    fYWidth(),
     fXSix(0),
     fXSiy1(0),
     fXSiy2(0),
@@ -106,6 +111,38 @@ AliMUONTriggerGUIboard::AliMUONTriggerGUIboard()
 
 }
 
+//__________________________________________________________________________
+AliMUONTriggerGUIboard::AliMUONTriggerGUIboard(TRootIOCtor* /*ioCtor*/) 
+  : TObject(),
+    fName(0),
+    fCrateName(0),
+    fID(-1),
+    fStatus(0),
+    fPosition(0),
+    fYOver(0),
+    fXCenter(),
+    fYCenter(),
+    fZCenter(),
+    fXWidth(),
+    fYWidth(),
+    fXSix(0),
+    fXSiy1(0),
+    fXSiy2(0),
+    fYSix1(0),
+    fYSix2(0),
+    fYSiy(0),
+    fDetElemId(0),
+    fIdCircuit(-1),
+    fIsOpen(0),
+    fNPadsX(),
+    fNPadsY(),
+    fPadsX(),
+    fPadsY()
+{
+  /// board standard constructor
+
+}
+
 //__________________________________________________________________________
 AliMUONTriggerGUIboard::~AliMUONTriggerGUIboard() 
 {
@@ -183,8 +220,7 @@ void AliMUONTriggerGUIboard::MakeGeometry()
   for (Int_t ich = 0; ich < kNMT; ich++) {
     if (fNPadsX[ich]) {
       pad = (AliMpPad*)fPadsX[ich]->At(0);
-      AliMpIntPair loc = pad->GetLocation(0);
-      fIdCircuit = loc.GetFirst();
+      fIdCircuit = pad->GetLocalBoardId(0);
       break;
     }
   }
@@ -211,17 +247,15 @@ void AliMUONTriggerGUIboard::MakeGeometry()
   Int_t padyIy = -1, padyIx1 = +999, padyIx2 = -999;
   for (Int_t ip = 0; ip < fNPadsX[0]; ip++) {
     pad = (AliMpPad*)fPadsX[0]->At(ip);
-    AliMpIntPair ind = pad->GetIndices();
-    padxIx = ind.GetFirst();
-    padxIy1 = TMath::Min(padxIy1,ind.GetSecond());
-    padxIy2 = TMath::Max(padxIy2,ind.GetSecond());
+    padxIx = pad->GetIx();
+    padxIy1 = TMath::Min(padxIy1,pad->GetIy());
+    padxIy2 = TMath::Max(padxIy2,pad->GetIy());
   }
   for (Int_t ip = 0; ip < fNPadsY[0]; ip++) {
     pad = (AliMpPad*)fPadsY[0]->At(ip);
-    AliMpIntPair ind = pad->GetIndices();
-    padyIy = ind.GetSecond();
-    padyIx1 = TMath::Min(padyIx1,ind.GetFirst());
-    padyIx2 = TMath::Max(padyIx2,ind.GetFirst());
+    padyIy = pad->GetIy();
+    padyIx1 = TMath::Min(padyIx1,pad->GetIx());
+    padyIx2 = TMath::Max(padyIx2,pad->GetIx());
   }
   fXSix  = padxIx;
   fXSiy1 = padxIy1;
@@ -237,16 +271,16 @@ void AliMUONTriggerGUIboard::MakeGeometry()
 
   Float_t minX, maxX, minY, maxY;
   Float_t dx, dy;
-  Float_t xloc, yloc, xglo, yglo, zglo;
+  Float_t xloc, yloc, xglo=0., yglo=0., zglo=0.;
   for (Int_t ich = 0; ich < kNMT; ich++) {
     minX = +9999; maxX = -9999;
     minY = +9999; maxY = -9999;
     for (Int_t ix = 0; ix < fNPadsX[ich]; ix++) {
       pad = (AliMpPad*)fPadsX[ich]->At(ix);
-      xloc = pad->Position().X();
-      yloc = pad->Position().Y();
-      dx = pad->Dimensions().X();
-      dy = pad->Dimensions().Y();
+      xloc = pad->GetPositionX();
+      yloc = pad->GetPositionY();
+      dx = pad->GetDimensionX();
+      dy = pad->GetDimensionY();
       transformer.Local2Global((11+ich)*100+GetDetElemId(), xloc, yloc, 0, xglo, yglo, zglo);
       minX = TMath::Min(minX,(xglo-dx));
       maxX = TMath::Max(maxX,(xglo+dx));