Removing a comma that gcc 3.4 does not like ;-)

[u/mrichter/AliRoot.git] / MUON / mapping / AliMpConnection.cxx

diff --git a/MUON/mapping/AliMpConnection.cxx b/MUON/mapping/AliMpConnection.cxx
index 9fc679c69c15c68d29872fd216ba44c3174a53ba..38135542baf26592146cdf8e1e4283bdfcf8fdc5 100755 (executable)
--- a/MUON/mapping/AliMpConnection.cxx
+++ b/MUON/mapping/AliMpConnection.cxx
@@ -16,45 +16,92 @@
 // $Id$
 // $MpId: AliMpConnection.cxx,v 1.7 2006/05/24 13:58:41 ivana Exp $
 // Category: motif
-//
+
+//-----------------------------------------------------------------------------
 // Class AliMpConnection
 // ----------------
 // Class that defines a connexion properties.
 // Included in AliRoot: 2003/05/02
 // Authors: David Guez, Ivana Hrivnacova; IPN Orsay
+//-----------------------------------------------------------------------------
 
 #include "AliMpConnection.h"
+#include "AliMpEncodePair.h"
+
+#include "AliLog.h"
 
 /// \cond CLASSIMP
 ClassImp(AliMpConnection)
 /// \endcond
 
 //_____________________________________________________________________________
-AliMpConnection::AliMpConnection(Int_t padNum, Int_t bergNum,Int_t kaptonNum,
-                                Int_t gassiNum) 
+AliMpConnection::AliMpConnection(Int_t padNum, 
+                                 Int_t bergNum,
+                                 Int_t kaptonNum,
+                                Int_t gassiNum, 
+                                 MpPair_t localIndices) 
   : TObject(),
-    fPadNum(padNum),
     fBergNum(bergNum),
     fKaptonNum(kaptonNum),
     fGassiNum(gassiNum),
+    fLocalIndices(localIndices),
     fOwner(0)
 {
 /// Standard constructor
+
+  AliDebug(1,Form("this=%p padNum=%d bergNum=%d kaptonNum=%d gassiNum=%d",
+                   this,padNum,bergNum,kaptonNum,gassiNum));
+  SetUniqueID(padNum);
 }
 
+//_____________________________________________________________________________
+AliMpConnection::AliMpConnection(TRootIOCtor* /*ioCtor*/) 
+  : TObject(),
+    fBergNum(),
+    fKaptonNum(),
+    fGassiNum(),
+    fLocalIndices(),
+    fOwner()
+{
+/// Root IO constructor
+
+  AliDebug(1,Form("this=%p",this));
+}
+/*
 //_____________________________________________________________________________
 AliMpConnection::AliMpConnection() 
   : TObject(),
-    fPadNum(-1),
     fBergNum(-1),
     fKaptonNum(-1),
     fGassiNum(-1),
+    fLocalIndices(-1)
     fOwner(0)
 {
 /// Default constructor
-}
 
+  AliDebug(1,Form("this=%p",this));
+}
+*/
 //_____________________________________________________________________________
-AliMpConnection::~AliMpConnection() {
-//  
+AliMpConnection::~AliMpConnection() 
+{
+/// Destructor  
+
+  AliDebug(1,Form("this=%p"));
 }
+
+//_____________________________________________________________________________
+Int_t  AliMpConnection::GetLocalIx() const
+{
+/// Return local ix
+
+  return AliMp::PairFirst(fLocalIndices);
+}  
+
+Int_t  AliMpConnection::GetLocalIy() const
+{
+/// Return local iy
+
+  return AliMp::PairSecond(fLocalIndices);
+}  
+