X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;ds=sidebyside;f=PMD%2FAliPMDclupid.cxx;h=39627901c25c1779fb766d321dd2da612d8efb3a;hb=8aeed75c3dfa55d3048d0178ccc08cb2f8893d1c;hp=9b79aaef28bf2ced74c400803b470e35db6de288;hpb=7dcaf913fb3aadf44dae69ff7f82eea3273022c6;p=u%2Fmrichter%2FAliRoot.git

diff --git a/PMD/AliPMDclupid.cxx b/PMD/AliPMDclupid.cxx
index 9b79aaef28b..39627901c25 100644
--- a/PMD/AliPMDclupid.cxx
+++ b/PMD/AliPMDclupid.cxx
@@ -29,48 +29,73 @@ ClassImp(AliPMDclupid)
 
 AliPMDclupid::AliPMDclupid():
   fDet(0),
-  fSMN(0)
+  fSMN(0),
+  fTrNo(0),
+  fTrPid(0),
+  fMstatus(0)
 {
   // Default constructor
-  for (Int_t i = 0; i < 6; i++)
+  for (Int_t i = 0; i < 7; i++)
     {
       fClusData[i] = 0.;
     }
 }
 // ------------------------------------------------------------------ //
-AliPMDclupid::AliPMDclupid(Int_t idet, Int_t ismn, Float_t *clusdata)
+AliPMDclupid::AliPMDclupid(Int_t idet, Int_t ismn, Int_t trno, Int_t trpid,
+			   Int_t mstat, Float_t *clusdata):
+  fDet(idet),
+  fSMN(ismn),
+  fTrNo(trno),
+  fTrPid(trpid),
+  fMstatus(mstat)
 {
   // Constructor
-  fDet = idet;
-  fSMN = ismn;
-  for (Int_t i = 0; i < 6; i++)
+  for (Int_t i = 0; i < 7; i++)
     {
       fClusData[i] = clusdata[i];
     }
 }
 // ------------------------------------------------------------------ //
-AliPMDclupid::AliPMDclupid(const AliPMDclupid &pmdclupid):TObject(pmdclupid)
+AliPMDclupid::AliPMDclupid(AliPMDclupid *pmdclupid):
+  fDet(0),
+  fSMN(0),
+  fTrNo(0),
+  fTrPid(0),
+  fMstatus(0)
+{
+  *this = *pmdclupid;
+}
+
+// ------------------------------------------------------------------ //
+AliPMDclupid::AliPMDclupid(const AliPMDclupid &pmdclupid):
+  TObject(pmdclupid),
+  fDet(pmdclupid.fDet),
+  fSMN(pmdclupid.fSMN),
+  fTrNo(pmdclupid.fTrNo),
+  fTrPid(pmdclupid.fTrPid),
+  fMstatus(pmdclupid.fMstatus)
 {
   //Copy Constructor 
-  if(&pmdclupid == this) return;
-  this->fDet = pmdclupid.fDet;
-  this->fSMN = pmdclupid.fSMN;
-  for(Int_t i=0; i<6; i++)
+  for(Int_t i=0; i<7; i++)
     {
-      this->fClusData[i] = pmdclupid.fClusData[i];
+      fClusData[i] = pmdclupid.fClusData[i];
     }
-  return;
 }
 // ------------------------------------------------------------------ //
 AliPMDclupid & AliPMDclupid::operator=(const AliPMDclupid &pmdclupid)
 {
   // Assignment operator 
-  if(&pmdclupid == this) return *this;
-  this->fDet = pmdclupid.fDet;
-  this->fSMN = pmdclupid.fSMN;
-  for(Int_t i=0; i<6; i++)
+  if(this != &pmdclupid)
     {
-      this->fClusData[i] = pmdclupid.fClusData[i];
+      fDet     = pmdclupid.fDet;
+      fSMN     = pmdclupid.fSMN;
+      fTrNo    = pmdclupid.fTrNo;
+      fTrPid   = pmdclupid.fTrPid;
+      fMstatus = pmdclupid.fMstatus;
+      for(Int_t i=0; i<7; i++)
+	{
+	  fClusData[i] = pmdclupid.fClusData[i];
+	}
     }
   return *this;
 }
@@ -90,6 +115,21 @@ Int_t AliPMDclupid::GetSMN() const
   return fSMN;
 }
 // ------------------------------------------------------------------ //
+Int_t AliPMDclupid::GetClusTrackNo() const
+{
+  return fTrNo;
+}
+// ------------------------------------------------------------------ //
+Int_t AliPMDclupid::GetClusTrackPid() const
+{
+  return fTrPid;
+}
+// ------------------------------------------------------------------ //
+Int_t AliPMDclupid::GetClusMatching() const
+{
+  return fMstatus;
+}
+// ------------------------------------------------------------------ //
 Float_t AliPMDclupid::GetClusX() const
 {
   return fClusData[0];
@@ -110,14 +150,19 @@ Float_t AliPMDclupid::GetClusCells() const
   return fClusData[3];
 }
 // ------------------------------------------------------------------ //
-Float_t AliPMDclupid::GetClusRadius() const
+Float_t AliPMDclupid::GetClusSigmaX() const
 {
   return fClusData[4];
 }
 // ------------------------------------------------------------------ //
-Float_t AliPMDclupid::GetClusPID() const
+Float_t AliPMDclupid::GetClusSigmaY() const
 {
   return fClusData[5];
 }
+// ------------------------------------------------------------------ //
+Float_t AliPMDclupid::GetClusPID() const
+{
+  return fClusData[6];
+}