cellx and celly methods added

diff --git a/PMD/AliPMDcluster.cxx b/PMD/AliPMDcluster.cxx
index fd4ea3175da9201fe288f0465470ddc735513d99..9fe697f01a31e02b7bd9c58d914a702c3942bf0b 100644 (file)
--- a/PMD/AliPMDcluster.cxx
+++ b/PMD/AliPMDcluster.cxx
@@ -31,22 +31,33 @@ 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 < 15; i++)
+    {
+      fClusCellDataX[i] = 0;
+      fClusCellDataY[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)
 {
   // 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 < 15; i++)
+    {
+      fClusCellDataX[i] = celldataX[i];
+      fClusCellDataY[i] = celldataY[i];
+    }
+
 }
 AliPMDcluster::AliPMDcluster(const AliPMDcluster &pmdcluster):TObject(pmdcluster)
 {
@@ -54,10 +65,15 @@ AliPMDcluster::AliPMDcluster(const AliPMDcluster &pmdcluster):TObject(pmdcluster
   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];
     }
+  for(Int_t i=0; i<15; i++)
+    {
+      this->fClusCellDataX[i] = pmdcluster.fClusCellDataX[i];
+      this->fClusCellDataY[i] = pmdcluster.fClusCellDataY[i];
+    }
   return;
 }
 
@@ -67,10 +83,15 @@ AliPMDcluster & AliPMDcluster::operator=(const AliPMDcluster &pmdcluster)
   if(&pmdcluster == this) return *this;
   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];
     }
+  for(Int_t i=0; i<15; i++)
+    {
+      this->fClusCellDataX[i] = pmdcluster.fClusCellDataX[i];
+      this->fClusCellDataY[i] = pmdcluster.fClusCellDataY[i];
+    }
   return *this;
 }
 
@@ -103,7 +124,19 @@ 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];
+}

diff --git a/PMD/AliPMDcluster.h b/PMD/AliPMDcluster.h
index 8fe9d5de0fccff96f9195f89a8f2d758d6b9cc1a..e27e98cc396d387c9bd111f7b860f154bdfaf03e 100644 (file)
--- a/PMD/AliPMDcluster.h
+++ b/PMD/AliPMDcluster.h
@@ -18,7 +18,8 @@ class AliPMDcluster : public TObject
 {
  public:
   AliPMDcluster();
-  AliPMDcluster(Int_t idet, Int_t ismn, Float_t *clusdata);
+  AliPMDcluster(Int_t idet, Int_t ismn, Float_t *clusdata,
+               Int_t *celldataX, Int_t *celldataY);
   AliPMDcluster(AliPMDcluster *pmdcluster) {*this = *pmdcluster;}
   AliPMDcluster (const AliPMDcluster &pmdcluster);  // copy constructor
   AliPMDcluster &operator=(const AliPMDcluster &pmdcluster); // assignment op
@@ -31,21 +32,26 @@ class AliPMDcluster : public TObject
   Float_t GetClusY() const;
   Float_t GetClusADC() const;
   Float_t GetClusCells() const;
-  Float_t GetClusRadius() const;
+  Float_t GetClusSigmaX() const;
+  Float_t GetClusSigmaY() const;
+  Int_t   GetClusCellX(Int_t i) const;
+  Int_t   GetClusCellY(Int_t i) const;
 
  protected:
 
-  Int_t   fDet;          // Detector No (0:PRE, 1:CPV)
-  Int_t   fSMN;          // Serial Module No.
-  Float_t fClusData[5];  // Array containing cluster information
+  Int_t   fDet;               // Detector No (0:PRE, 1:CPV)
+  Int_t   fSMN;               // Serial Module No.
+  Int_t   fClusCellDataX[15]; // Array containing cell X
+  Int_t   fClusCellDataY[15]; // Array containing cell Y
+  Float_t fClusData[6];       // Array containing cluster information
   /*
     fDet         : Det (0:PRE, 1:CPV), fSMN         : SerialModuleNo
     fClusData[0] : Cluster x         , fClusData[1] : Cluster y
     fClusData[2] : Cluster adc       , fClusData[3] : Cluster Cells
-    fClusData[4] : Cluster radius
+    fClusData[4] : Cluster SigmaX    , fClusData[5] : Cluster SigmaY
   */
   
-  ClassDef(AliPMDcluster,2) // Keep Cluster information
+  ClassDef(AliPMDcluster,3) // Keep Cluster information
 };
 
 #endif