macro to convert raw to sdigits

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

diff --git a/PMD/AliPMDdigit.cxx b/PMD/AliPMDdigit.cxx
index a8864e5c878e1dc495ad0032dcd12e808f632af3..8dab143b531e10f06638faf583591dfb9b1d2124 100644 (file)
--- a/PMD/AliPMDdigit.cxx
+++ b/PMD/AliPMDdigit.cxx
@@ -26,44 +26,61 @@
 
 ClassImp(AliPMDdigit)
 
-AliPMDdigit::AliPMDdigit()
+AliPMDdigit::AliPMDdigit():
+  fTrNumber(0),
+  fDet(0),
+  fSMNumber(0),
+  fRow(0),
+  fColumn(0),
+  fADC(0.)
 {
   // Default Constructor
-  fTrNumber   = 0;
-  fDet        = 0;
-  fSMNumber   = 0;
-  fCellNumber = 0;
-  fADC        = 0.;
 }
 
 AliPMDdigit::AliPMDdigit(Int_t trnumber, Int_t det, Int_t smnumber, 
-                        Int_t cellnumber, Float_t adc)
+                        Int_t irow, Int_t icol, Float_t adc):
+  fTrNumber(trnumber),
+  fDet(det),
+  fSMNumber(smnumber),
+  fRow(irow),
+  fColumn(icol),
+  fADC(adc)
 {
   // Constructor
-  fTrNumber   = trnumber;
-  fDet        = det;
-  fSMNumber   = smnumber;
-  fCellNumber = cellnumber;
-  fADC        = adc;
 }
-AliPMDdigit::AliPMDdigit(const AliPMDdigit& pmddigit):TObject(pmddigit) {
+AliPMDdigit::AliPMDdigit(AliPMDdigit *pmddigit):
+  fTrNumber(0),
+  fDet(0),
+  fSMNumber(0),
+  fRow(0),
+  fColumn(0),
+  fADC(0.)
+{
+  *this = *pmddigit;
+}
+
+AliPMDdigit::AliPMDdigit(const AliPMDdigit& pmddigit):
+  TObject(pmddigit),
+  fTrNumber(pmddigit.fTrNumber),
+  fDet(pmddigit.fDet),
+  fSMNumber(pmddigit.fSMNumber),
+  fRow(pmddigit.fRow),
+  fColumn(pmddigit.fColumn),
+  fADC(pmddigit.fADC)
+{
   //Copy Constructor 
-  if(&pmddigit == this) return;
-  this->fTrNumber   = pmddigit.fTrNumber;
-  this->fDet        = pmddigit.fDet;
-  this->fSMNumber   = pmddigit.fSMNumber;
-  this->fCellNumber = pmddigit.fCellNumber;
-  this->fADC        = pmddigit.fADC;
-  return;
 }
 AliPMDdigit & AliPMDdigit::operator=(const AliPMDdigit& pmddigit) {
   //Assignment operator 
-  if(&pmddigit == this) return *this;
-  this->fTrNumber   = pmddigit.fTrNumber;
-  this->fDet        = pmddigit.fDet;
-  this->fSMNumber   = pmddigit.fSMNumber;
-  this->fCellNumber = pmddigit.fCellNumber;
-  this->fADC        = pmddigit.fADC;
+  if(this != &pmddigit)
+    {
+      fTrNumber   = pmddigit.fTrNumber;
+      fDet        = pmddigit.fDet;
+      fSMNumber   = pmddigit.fSMNumber;
+      fRow        = pmddigit.fRow;
+      fColumn     = pmddigit.fColumn;
+      fADC        = pmddigit.fADC;
+    }
   return *this;
 }
 AliPMDdigit::~AliPMDdigit()
@@ -82,9 +99,13 @@ Int_t AliPMDdigit::GetSMNumber() const
 {
   return fSMNumber;
 }
-Int_t AliPMDdigit::GetCellNumber() const
+Int_t AliPMDdigit::GetRow() const
+{
+  return fRow;
+}
+Int_t AliPMDdigit::GetColumn() const
 {
-  return fCellNumber;
+  return fColumn;
 }
 Float_t AliPMDdigit::GetADC() const
 {