bug fixed

[u/mrichter/AliRoot.git] / PMD / AliPMDcluster.cxx

diff --git a/PMD/AliPMDcluster.cxx b/PMD/AliPMDcluster.cxx
index fd4ea3175da9201fe288f0465470ddc735513d99..4f9ee2751b69b2ccdffa0e30d2f3c5aad2585fa5 100644 (file)
--- a/PMD/AliPMDcluster.cxx
+++ b/PMD/AliPMDcluster.cxx
@@ -22,6 +22,7 @@
 #include "Riostream.h"
 #include "Rtypes.h"
 #include "AliPMDcluster.h"
+#include "AliLog.h"
 #include <stdio.h>
 
 ClassImp(AliPMDcluster)
@@ -31,79 +32,166 @@ AliPMDcluster::AliPMDcluster():
   fSMN(0)
 {
   // Default constructor
-  //  fDet = 0;
-  //  fSMN = 0;
-  for (Int_t i = 0; i < 5; i++)
+  for (Int_t i = 0; i < 6; i++)
     {
       fClusData[i] = 0.;
     }
+  for (Int_t i = 0; i < 19; i++)
+    {
+      fClusCellDataX[i] = 0;
+      fClusCellDataY[i] = 0;
+      fClusCellTrack[i] = -1;
+      fClusCellPid[i]   = -1;
+      fClusCellAdc[i]   = 0;
+    }
+
 }
-AliPMDcluster::AliPMDcluster(Int_t idet, Int_t ismn, Float_t *clusdata)
+// --------------------------------------------------------------------- //
+AliPMDcluster::AliPMDcluster(Int_t idet, Int_t ismn, Float_t *clusdata,
+                            Int_t *celldataX, Int_t *celldataY,
+                            Int_t *celltrack, Int_t *cellpid,
+                            Float_t *celladc):
+  fDet(idet),
+  fSMN(ismn)
 {
   // Constructor
-  fDet = idet;
-  fSMN = ismn;
-  for (Int_t i = 0; i < 5; i++)
+  for (Int_t i = 0; i < 6; i++)
     {
       fClusData[i] = clusdata[i];
     }
+
+  for (Int_t i = 0; i < 19; i++)
+    {
+      fClusCellDataX[i] = celldataX[i];
+      fClusCellDataY[i] = celldataY[i];
+      fClusCellTrack[i] = celltrack[i];
+      fClusCellPid[i]   = cellpid[i];
+      fClusCellAdc[i]   = celladc[i];
+    }
+
 }
-AliPMDcluster::AliPMDcluster(const AliPMDcluster &pmdcluster):TObject(pmdcluster)
+// --------------------------------------------------------------------- //
+AliPMDcluster::AliPMDcluster(AliPMDcluster *pmdcluster):
+  fDet(0),
+  fSMN(0)
+{
+  *this = *pmdcluster;
+}
+// --------------------------------------------------------------------- //
+
+AliPMDcluster::AliPMDcluster(const AliPMDcluster &pmdcluster):
+  TObject(pmdcluster),
+  fDet(pmdcluster.fDet),
+  fSMN(pmdcluster.fSMN)
 {
   //Copy Constructor 
-  if(&pmdcluster == this) return;
-  this->fDet = pmdcluster.fDet;
-  this->fSMN = pmdcluster.fSMN;
-  for(Int_t i=0; i<5; i++)
+  for(Int_t i=0; i<6; i++)
     {
       this->fClusData[i] = pmdcluster.fClusData[i];
     }
-  return;
+  for(Int_t i=0; i<19; i++)
+    {
+      this->fClusCellDataX[i] = pmdcluster.fClusCellDataX[i];
+      this->fClusCellDataY[i] = pmdcluster.fClusCellDataY[i];
+      this->fClusCellTrack[i] = pmdcluster.fClusCellTrack[i];
+      this->fClusCellPid[i]   = pmdcluster.fClusCellPid[i];
+      this->fClusCellAdc[i]   = pmdcluster.fClusCellAdc[i];
+    }
 }
+// --------------------------------------------------------------------- //
 
 AliPMDcluster & AliPMDcluster::operator=(const AliPMDcluster &pmdcluster)
 {
   // Assignment operator 
-  if(&pmdcluster == this) return *this;
-  this->fDet = pmdcluster.fDet;
-  this->fSMN = pmdcluster.fSMN;
-  for(Int_t i=0; i<5; i++)
+  if(this != &pmdcluster)
     {
-      this->fClusData[i] = pmdcluster.fClusData[i];
+      this->fDet = pmdcluster.fDet;
+      this->fSMN = pmdcluster.fSMN;
+      for(Int_t i=0; i<6; i++)
+       {
+         this->fClusData[i] = pmdcluster.fClusData[i];
+       }
+      for(Int_t i=0; i<19; i++)
+       {
+         this->fClusCellDataX[i] = pmdcluster.fClusCellDataX[i];
+         this->fClusCellDataY[i] = pmdcluster.fClusCellDataY[i];
+         this->fClusCellTrack[i] = pmdcluster.fClusCellTrack[i];
+         this->fClusCellPid[i]   = pmdcluster.fClusCellPid[i];
+         this->fClusCellAdc[i]   = pmdcluster.fClusCellAdc[i];
+       }
     }
   return *this;
 }
+// --------------------------------------------------------------------- //
 
 AliPMDcluster::~AliPMDcluster()
 {
   // Destructor
 }
+// --------------------------------------------------------------------- //
 
 Int_t AliPMDcluster::GetDetector() const
 {
   return fDet;
 }
+// --------------------------------------------------------------------- //
 Int_t AliPMDcluster::GetSMN() const
 {
   return fSMN;
 }
+// --------------------------------------------------------------------- //
 Float_t AliPMDcluster::GetClusX() const
 {
   return fClusData[0];
 }
+// --------------------------------------------------------------------- //
 Float_t AliPMDcluster::GetClusY() const
 {
   return fClusData[1];
 }
+// --------------------------------------------------------------------- //
 Float_t AliPMDcluster::GetClusADC() const
 {
   return fClusData[2];
 }
+// --------------------------------------------------------------------- //
 Float_t AliPMDcluster::GetClusCells() const
 {
   return fClusData[3];
 }
-Float_t AliPMDcluster::GetClusRadius() const
+// --------------------------------------------------------------------- //
+Float_t AliPMDcluster::GetClusSigmaX() const
 {
   return fClusData[4];
 }
+// --------------------------------------------------------------------- //
+Float_t AliPMDcluster::GetClusSigmaY() const
+{
+  return fClusData[5];
+}
+// --------------------------------------------------------------------- //
+Int_t AliPMDcluster::GetClusCellX(Int_t i) const
+{
+  return fClusCellDataX[i];
+}
+// --------------------------------------------------------------------- //
+Int_t AliPMDcluster::GetClusCellY(Int_t i) const
+{
+  return fClusCellDataY[i];
+}
+// --------------------------------------------------------------------- //
+Int_t AliPMDcluster::GetClusCellTrack(Int_t i) const
+{
+  return fClusCellTrack[i];
+}
+// --------------------------------------------------------------------- //
+Int_t AliPMDcluster::GetClusCellPid(Int_t i) const
+{
+  return fClusCellPid[i];
+}
+// --------------------------------------------------------------------- //
+Float_t AliPMDcluster::GetClusCellAdc(Int_t i) const
+{
+  return fClusCellAdc[i];
+}
+// --------------------------------------------------------------------- //