#include "AliMpLocalBoard.h"
#include "AliMpConstants.h"
#include "AliMpPad.h"
+#include "AliMpEncodePair.h"
#include "AliRun.h"
#include "AliLog.h"
Int_t zeroDown = localBoard->GetSwitch(AliMpLocalBoard::kZeroDown);
Int_t zeroUp = localBoard->GetSwitch(AliMpLocalBoard::kZeroUp);
- Int_t iline = localBoard->GetPosition().GetFirst();
- Int_t icol = localBoard->GetPosition().GetSecond();
+ Int_t iline = AliMp::PairFirst(localBoard->GetPosition());
+ Int_t icol = AliMp::PairSecond(localBoard->GetPosition());
if ( iline == 5 ) --icol;
//--- first plane
Int_t icolUp = icol;
// check if we need to move to another detElemId
- AliMpPad pad = fkCurrentSeg->PadByIndices(AliMpIntPair(icol-1,iLastStripMiddle+1),kFALSE);
+ AliMpPad pad = fkCurrentSeg->PadByIndices(icol-1,iLastStripMiddle+1,kFALSE);
if (pad.IsValid()) { // upper strips within same detElemId
iFirstStripUp = iLastStripMiddle;
Int_t icolDo = icol;
// check if we need to move to another detElemId
- AliMpPad pad = fkCurrentSeg->PadByIndices(AliMpIntPair(icol-1,iFirstStripMiddle-1),kFALSE);
+ AliMpPad pad = fkCurrentSeg->PadByIndices(icol-1,iFirstStripMiddle-1,kFALSE);
if (pad.IsValid()) { // lower strips within same detElemId
iFirstStripDo = iFirstStripMiddle - 8;
iLastStripDo = iFirstStripDo + 8;
Double_t xyGlobal[2] = {0.};
for (Int_t istrip = iFirstStrip; istrip < iLastStrip; ++istrip) {
- AliMpPad pad = fkCurrentSeg->PadByIndices(AliMpIntPair(icol-1,istrip),kTRUE);
+ AliMpPad pad = fkCurrentSeg->PadByIndices(icol-1,istrip,kTRUE);
if ( !pad.IsValid() ) {
StdoutToAliError(cout << "Pad not found in seg " << endl;
fkCurrentSeg->Print();
cout << " ix,iy=" << icol-1 << "," << istrip << endl;
);
}
- Float_t yDim = pad.Dimensions().Y(); // half size!
+ Float_t yDim = pad.GetDimensionY(); // half size!
XYGlobal(pad,xyGlobal);
Int_t iLastStrip = 0;
Bool_t doubling = kFALSE;
- Int_t iline = localBoard->GetPosition().GetFirst();
- Int_t icol = localBoard->GetPosition().GetSecond();
+ Int_t iline = AliMp::PairFirst(localBoard->GetPosition());
+ Int_t icol = AliMp::PairSecond(localBoard->GetPosition());
if ( iline == 5 ) --icol;
fCurrentDetElem = AliMpDDLStore::Instance()->GetDEfromLocalBoard(fCurrentLocalBoard, ichamber);
for (Int_t istrip = iFirstStrip; istrip < iLastStrip; ++istrip) {
- AliMpPad pad = fkCurrentSeg->PadByIndices(AliMpIntPair(istrip,0),kTRUE);
+ AliMpPad pad = fkCurrentSeg->PadByIndices(istrip,0,kTRUE);
if ( !pad.IsValid() )
{
cout << " ix,iy=" << istrip << "," << 0 << endl;
);
}
- Float_t xDim = pad.Dimensions().X(); // half size!
+ Float_t xDim = pad.GetDimensionX(); // half size!
XYGlobal(pad,xyGlobal);
/// note: no need for transformation for pad dimensions
// get the pad position and dimensions
- Double_t xl1 = pad.Position().X();
- Double_t yl1 = pad.Position().Y();
+ Double_t xl1 = pad.GetPositionX();
+ Double_t yl1 = pad.GetPositionY();
Double_t zg1 = 0;
// positions from local to global
Int_t iFirstStrip = -1;
Int_t boardNumber = atoi(localBoard->GetName()+6);
- Int_t iline = localBoard->GetPosition().GetFirst();
- Int_t icol = localBoard->GetPosition().GetSecond();
+ Int_t iline = AliMp::PairFirst(localBoard->GetPosition());
+ Int_t icol = AliMp::PairSecond(localBoard->GetPosition());
if ( iline == 5 ) --icol;
switch (boardNumber)