cellno is replaced by row and column

diff --git a/PMD/AliPMDClusterFinder.cxx b/PMD/AliPMDClusterFinder.cxx
index 67b5d0f0fb83a66e56580a88845ed48e76e84dda..6603d9953956200944045751a33a0c3060dd6f33 100644 (file)
--- a/PMD/AliPMDClusterFinder.cxx
+++ b/PMD/AliPMDClusterFinder.cxx
@@ -83,8 +83,6 @@ void AliPMDClusterFinder::OpengAliceFile(Char_t *file, Option_t *option)
   
   fRunLoader->LoadgAlice();
   fRunLoader->LoadHeader();
   
   fRunLoader->LoadgAlice();
   fRunLoader->LoadHeader();

-  fRunLoader->LoadKinematics();
-

   gAlice = fRunLoader->GetAliRun();
   
   if (gAlice)
   gAlice = fRunLoader->GetAliRun();
   
   if (gAlice)


@@ -119,7 +117,6 @@ void AliPMDClusterFinder::Digits2RecPoints(Int_t ievt)
   // algorithm on CPV plane and PREshower plane
   //
   Int_t    det = 0,smn = 0;
   // algorithm on CPV plane and PREshower plane
   //
   Int_t    det = 0,smn = 0;

-  Int_t    cellno;

   Int_t    xpos,ypos;
   Float_t  adc;
   Int_t    isup;
   Int_t    xpos,ypos;
   Float_t  adc;
   Int_t    isup;


@@ -167,12 +164,11 @@ void AliPMDClusterFinder::Digits2RecPoints(Int_t ievt)
          
          det    = pmddigit->GetDetector();
          smn    = pmddigit->GetSMNumber();
          
          det    = pmddigit->GetDetector();
          smn    = pmddigit->GetSMNumber();

-         cellno = pmddigit->GetCellNumber();
+         xpos   = pmddigit->GetRow();
+         ypos   = pmddigit->GetColumn();

          adc    = pmddigit->GetADC();
          //Int_t trno   = pmddigit->GetTrackNumber();
 
          adc    = pmddigit->GetADC();
          //Int_t trno   = pmddigit->GetTrackNumber();
 

-         xpos = cellno/fCol;
-         ypos = cellno - xpos*fCol;

          fCellADC[xpos][ypos] = (Double_t) adc;
        }
 
          fCellADC[xpos][ypos] = (Double_t) adc;
        }
 


@@ -238,9 +234,9 @@ void AliPMDClusterFinder::ResetCellADC()
 {
   // Reset the individual cell ADC value to zero
   //
 {
   // Reset the individual cell ADC value to zero
   //

-  for(Int_t irow = 0; irow < fRow; irow++)
+  for(Int_t irow = 0; irow < fgkRow; irow++)

     {
     {

-      for(Int_t icol = 0; icol < fCol; icol++)
+      for(Int_t icol = 0; icol < fgkCol; icol++)

        {
          fCellADC[irow][icol] = 0.;
        }
        {
          fCellADC[irow][icol] = 0.;
        }

diff --git a/PMD/AliPMDClusterFinder.h b/PMD/AliPMDClusterFinder.h
index 32cea3201b814cef57130b5e5d5d3dafa35ca222..7b3c30527a80472385182358af7b7a629bfb493f 100644 (file)
--- a/PMD/AliPMDClusterFinder.h
+++ b/PMD/AliPMDClusterFinder.h
@@ -63,9 +63,9 @@ class AliPMDClusterFinder
   Int_t   fDebug;           // Debugging switch (0:NO, 1:YES)
   Float_t fEcut;            // Energy/ADC cut per cell
 
   Int_t   fDebug;           // Debugging switch (0:NO, 1:YES)
   Float_t fEcut;            // Energy/ADC cut per cell
 

-  static const Int_t fRow = 48; // Total number of rows in one unitmodule
-  static const Int_t fCol = 96; // Total number of cols in one unitmodule
-  Double_t fCellADC[fRow][fCol]; // Array containing individual cell ADC
+  static const Int_t fgkRow = 48; // Total number of rows in one unitmodule
+  static const Int_t fgkCol = 96; // Total number of cols in one unitmodule
+  Double_t fCellADC[fgkRow][fgkCol]; // Array containing individual cell ADC

 
   ClassDef(AliPMDClusterFinder,2) // To run PMD clustering
 };
 
   ClassDef(AliPMDClusterFinder,2) // To run PMD clustering
 };

diff --git a/PMD/AliPMDdigit.cxx b/PMD/AliPMDdigit.cxx
index a8864e5c878e1dc495ad0032dcd12e808f632af3..db53b437ac18f3e7f92f1f6bab7c5df302955033 100644 (file)
--- a/PMD/AliPMDdigit.cxx
+++ b/PMD/AliPMDdigit.cxx
@@ -32,18 +32,20 @@ AliPMDdigit::AliPMDdigit()
   fTrNumber   = 0;
   fDet        = 0;
   fSMNumber   = 0;
   fTrNumber   = 0;
   fDet        = 0;
   fSMNumber   = 0;

-  fCellNumber = 0;
+  fRow        = 0;
+  fColumn     = 0;

   fADC        = 0.;
 }
 
 AliPMDdigit::AliPMDdigit(Int_t trnumber, Int_t det, Int_t smnumber, 
   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)

 {
   // Constructor
   fTrNumber   = trnumber;
   fDet        = det;
   fSMNumber   = smnumber;
 {
   // Constructor
   fTrNumber   = trnumber;
   fDet        = det;
   fSMNumber   = smnumber;

-  fCellNumber = cellnumber;
+  fRow        = irow;
+  fColumn     = icol;

   fADC        = adc;
 }
 AliPMDdigit::AliPMDdigit(const AliPMDdigit& pmddigit):TObject(pmddigit) {
   fADC        = adc;
 }
 AliPMDdigit::AliPMDdigit(const AliPMDdigit& pmddigit):TObject(pmddigit) {


@@ -52,7 +54,8 @@ AliPMDdigit::AliPMDdigit(const AliPMDdigit& pmddigit):TObject(pmddigit) {
   this->fTrNumber   = pmddigit.fTrNumber;
   this->fDet        = pmddigit.fDet;
   this->fSMNumber   = pmddigit.fSMNumber;
   this->fTrNumber   = pmddigit.fTrNumber;
   this->fDet        = pmddigit.fDet;
   this->fSMNumber   = pmddigit.fSMNumber;

-  this->fCellNumber = pmddigit.fCellNumber;
+  this->fRow        = pmddigit.fRow;
+  this->fColumn     = pmddigit.fColumn;

   this->fADC        = pmddigit.fADC;
   return;
 }
   this->fADC        = pmddigit.fADC;
   return;
 }


@@ -62,7 +65,8 @@ AliPMDdigit & AliPMDdigit::operator=(const AliPMDdigit& pmddigit) {
   this->fTrNumber   = pmddigit.fTrNumber;
   this->fDet        = pmddigit.fDet;
   this->fSMNumber   = pmddigit.fSMNumber;
   this->fTrNumber   = pmddigit.fTrNumber;
   this->fDet        = pmddigit.fDet;
   this->fSMNumber   = pmddigit.fSMNumber;

-  this->fCellNumber = pmddigit.fCellNumber;
+  this->fRow        = pmddigit.fRow;
+  this->fColumn     = pmddigit.fColumn;

   this->fADC        = pmddigit.fADC;
   return *this;
 }
   this->fADC        = pmddigit.fADC;
   return *this;
 }


@@ -82,9 +86,13 @@ Int_t AliPMDdigit::GetSMNumber() const
 {
   return fSMNumber;
 }
 {
   return fSMNumber;
 }

-Int_t AliPMDdigit::GetCellNumber() const
+Int_t AliPMDdigit::GetRow() const

 {
 {

-  return fCellNumber;
+  return fRow;
+}
+Int_t AliPMDdigit::GetColumn() const
+{
+  return fColumn;

 }
 Float_t AliPMDdigit::GetADC() const
 {
 }
 Float_t AliPMDdigit::GetADC() const
 {

diff --git a/PMD/AliPMDdigit.h b/PMD/AliPMDdigit.h
index e3d1d47bab4beed0be929beebe2ad376f62f1d16..474b4a4cd59701fadbfd4564d373f44d602b7e77 100644 (file)
--- a/PMD/AliPMDdigit.h
+++ b/PMD/AliPMDdigit.h
@@ -18,7 +18,7 @@ class AliPMDdigit : public TObject
  public:
   AliPMDdigit();
   AliPMDdigit(Int_t trnumber, Int_t det, Int_t smnumber,
  public:
   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);

   AliPMDdigit(AliPMDdigit *pmddigit) {*this = *pmddigit;}
   AliPMDdigit (const AliPMDdigit &pmddigit);  // copy constructor
   AliPMDdigit &operator=(const AliPMDdigit &pmddigit); // assignment op
   AliPMDdigit(AliPMDdigit *pmddigit) {*this = *pmddigit;}
   AliPMDdigit (const AliPMDdigit &pmddigit);  // copy constructor
   AliPMDdigit &operator=(const AliPMDdigit &pmddigit); // assignment op


@@ -28,17 +28,19 @@ class AliPMDdigit : public TObject
   Int_t   GetTrackNumber() const;
   Int_t   GetDetector() const;
   Int_t   GetSMNumber() const;
   Int_t   GetTrackNumber() const;
   Int_t   GetDetector() const;
   Int_t   GetSMNumber() const;

-  Int_t   GetCellNumber() const;
+  Int_t   GetRow() const;
+  Int_t   GetColumn() const;

   Float_t GetADC() const;
 
  protected:
   Int_t   fTrNumber;    // Parent Track number
   Int_t   fDet;         // Detecor Number (0:PRE, 1:CPV)
   Int_t   fSMNumber;    // Serial Module Number
   Float_t GetADC() const;
 
  protected:
   Int_t   fTrNumber;    // Parent Track number
   Int_t   fDet;         // Detecor Number (0:PRE, 1:CPV)
   Int_t   fSMNumber;    // Serial Module Number

-  Int_t   fCellNumber;  // Cell Number (row(0-47)*96 + col(0-95))
+  Int_t   fRow;         // Cell Row Number (0-47)
+  Int_t   fColumn;      // Cell Column Number (0-95)

   Float_t fADC;         // Energy deposition(ADC) in a hexagonal cell
   
   Float_t fADC;         // Energy deposition(ADC) in a hexagonal cell
   

-  ClassDef(AliPMDdigit,2) // Digits object for Detector set:PMD
+  ClassDef(AliPMDdigit,3) // Digits object for Detector set:PMD

 };
 
 #endif
 };
 
 #endif

diff --git a/PMD/AliPMDsdigit.cxx b/PMD/AliPMDsdigit.cxx
index e233f925cc24df36594b82e90a9b47def8b141d5..27b2de1862206e38bfe2532c613bdce926f1fa4b 100644 (file)
--- a/PMD/AliPMDsdigit.cxx
+++ b/PMD/AliPMDsdigit.cxx
@@ -31,18 +31,20 @@ AliPMDsdigit::AliPMDsdigit()
   fTrNumber   = 0;
   fDet        = 0;
   fSMN        = 0;
   fTrNumber   = 0;
   fDet        = 0;
   fSMN        = 0;

-  fCellNumber = 0;
+  fRow        = 0;
+  fColumn     = 0;

   fEdep       = 0.;
 }
 
 AliPMDsdigit::AliPMDsdigit(Int_t trnumber, Int_t det, Int_t smn,
   fEdep       = 0.;
 }
 
 AliPMDsdigit::AliPMDsdigit(Int_t trnumber, Int_t det, Int_t smn,

-                          Int_t cellnumber, Float_t edep)
+                          Int_t irow, Int_t icol, Float_t edep)

 {
   // Constructor
   fTrNumber   = trnumber;
   fDet        = det;
   fSMN        = smn;
 {
   // Constructor
   fTrNumber   = trnumber;
   fDet        = det;
   fSMN        = smn;

-  fCellNumber = cellnumber;
+  fRow        = irow;
+  fColumn     = icol;

   fEdep       = edep;
 }
 AliPMDsdigit::AliPMDsdigit(const AliPMDsdigit& pmdsdigit):TObject(pmdsdigit) {
   fEdep       = edep;
 }
 AliPMDsdigit::AliPMDsdigit(const AliPMDsdigit& pmdsdigit):TObject(pmdsdigit) {


@@ -51,7 +53,8 @@ AliPMDsdigit::AliPMDsdigit(const AliPMDsdigit& pmdsdigit):TObject(pmdsdigit) {
   this->fTrNumber   = pmdsdigit.fTrNumber;
   this->fDet        = pmdsdigit.fDet;
   this->fSMN        = pmdsdigit.fSMN;
   this->fTrNumber   = pmdsdigit.fTrNumber;
   this->fDet        = pmdsdigit.fDet;
   this->fSMN        = pmdsdigit.fSMN;

-  this->fCellNumber = pmdsdigit.fCellNumber;
+  this->fRow        = pmdsdigit.fRow;
+  this->fColumn     = pmdsdigit.fColumn;

   this->fEdep       = pmdsdigit.fEdep;
   return;
 }
   this->fEdep       = pmdsdigit.fEdep;
   return;
 }


@@ -61,7 +64,8 @@ AliPMDsdigit & AliPMDsdigit::operator=(const AliPMDsdigit& pmdsdigit) {
   this->fTrNumber   = pmdsdigit.fTrNumber;
   this->fDet        = pmdsdigit.fDet;
   this->fSMN        = pmdsdigit.fSMN;
   this->fTrNumber   = pmdsdigit.fTrNumber;
   this->fDet        = pmdsdigit.fDet;
   this->fSMN        = pmdsdigit.fSMN;

-  this->fCellNumber = pmdsdigit.fCellNumber;
+  this->fRow        = pmdsdigit.fRow;
+  this->fColumn     = pmdsdigit.fColumn;

   this->fEdep       = pmdsdigit.fEdep;
   return *this;
 }
   this->fEdep       = pmdsdigit.fEdep;
   return *this;
 }


@@ -83,11 +87,14 @@ Int_t AliPMDsdigit::GetSMNumber() const
 {
   return fSMN;
 }
 {
   return fSMN;
 }

-Int_t AliPMDsdigit::GetCellNumber() const
+Int_t AliPMDsdigit::GetRow() const

 {
 {

-  return fCellNumber;
+  return fRow;
+}
+Int_t AliPMDsdigit::GetColumn() const
+{
+  return fColumn;

 }
 }

-

 Float_t AliPMDsdigit::GetCellEdep() const
 {
   return fEdep;
 Float_t AliPMDsdigit::GetCellEdep() const
 {
   return fEdep;

diff --git a/PMD/AliPMDsdigit.h b/PMD/AliPMDsdigit.h
index dd4984296f70c9fb0b543eb5d653afd19728ebe8..77c7d8e89ffb1ff9e35203a2e6224cf4f09ab517 100644 (file)
--- a/PMD/AliPMDsdigit.h
+++ b/PMD/AliPMDsdigit.h
@@ -19,7 +19,7 @@ class AliPMDsdigit : public TObject
  public:
   AliPMDsdigit();
   AliPMDsdigit(Int_t trnumber, Int_t det, Int_t smn,
  public:
   AliPMDsdigit();
   AliPMDsdigit(Int_t trnumber, Int_t det, Int_t smn,

-              Int_t cellnumber, Float_t edep);
+              Int_t irow, Int_t icol, Float_t edep);

   AliPMDsdigit(AliPMDsdigit *pmdsdigit) {*this = *pmdsdigit;}
   AliPMDsdigit (const AliPMDsdigit &pmdsdigit);  // copy constructor
   AliPMDsdigit &operator=(const AliPMDsdigit &pmdsdigit); // assignment op
   AliPMDsdigit(AliPMDsdigit *pmdsdigit) {*this = *pmdsdigit;}
   AliPMDsdigit (const AliPMDsdigit &pmdsdigit);  // copy constructor
   AliPMDsdigit &operator=(const AliPMDsdigit &pmdsdigit); // assignment op


@@ -29,7 +29,8 @@ class AliPMDsdigit : public TObject
   Int_t   GetTrackNumber() const;
   Int_t   GetDetector() const;
   Int_t   GetSMNumber() const;
   Int_t   GetTrackNumber() const;
   Int_t   GetDetector() const;
   Int_t   GetSMNumber() const;

-  Int_t   GetCellNumber() const;
+  Int_t   GetRow() const;
+  Int_t   GetColumn() const;

   Float_t GetCellEdep() const;
 
   
   Float_t GetCellEdep() const;
 
   


@@ -37,10 +38,11 @@ class AliPMDsdigit : public TObject
   Int_t   fTrNumber;   // Parent Track Number
   Int_t   fDet;        // Detector Number (0:PRE, 1:CPV)
   Int_t   fSMN;        // Serial Module Number
   Int_t   fTrNumber;   // Parent Track Number
   Int_t   fDet;        // Detector Number (0:PRE, 1:CPV)
   Int_t   fSMN;        // Serial Module Number

-  Int_t   fCellNumber; // Cell Number (row(0-47)*96 + col(0-95))
+  Int_t   fRow;        // Cell Row Number (0-47)
+  Int_t   fColumn;     // Cell Column Number (0-95)

   Float_t fEdep;       // Energy deposition in a hexagonal cell
   
   Float_t fEdep;       // Energy deposition in a hexagonal cell
   

-  ClassDef(AliPMDsdigit,2) // SDigits object for Detector set:PMD
+  ClassDef(AliPMDsdigit,3) // SDigits object for Detector set:PMD

 };
 
 #endif
 };
 
 #endif