bug fixed in decoding pedestal mean and rms

diff --git a/PMD/AliPMDCalibrator.cxx b/PMD/AliPMDCalibrator.cxx
index b78e630652c73a93ae422dce754c4982715d5aa5..0bfb1e3b118be099a5e61a1a31dbbf6b900068be 100644 (file)
--- a/PMD/AliPMDCalibrator.cxx
+++ b/PMD/AliPMDCalibrator.cxx
@@ -256,7 +256,7 @@ void AliPMDCalibrator::CalculateIsoCell()
              // Pedestal Subtraction
              Int_t   pedmeanrms = 
                fCalibPed->GetPedMeanRms(idet,ismn,irow,icol);
-             Int_t   pedrms1    = (Int_t) pedmeanrms%1000;
+             Int_t   pedrms1    = (Int_t) pedmeanrms%100;
              Float_t pedrms     = (Float_t)pedrms1/10.;
              Float_t pedmean    = (Float_t) (pedmeanrms - pedrms1)/1000.0;
              Float_t isig = isig1 - (pedmean + 3.0*pedrms);

diff --git a/PMD/AliPMDClusterFinder.cxx b/PMD/AliPMDClusterFinder.cxx
index 23f555e67a40dd76607ee9ddcb23182e55b64c05..a1cff399591d3804132f98b01e3870b7521aeaeb 100644 (file)
--- a/PMD/AliPMDClusterFinder.cxx
+++ b/PMD/AliPMDClusterFinder.cxx
@@ -323,7 +323,7 @@ void AliPMDClusterFinder::Digits2RecPoints(TTree *digitsTree,
          
          // Pedestal Subtraction
          Int_t   pedmeanrms = fCalibPed->GetPedMeanRms(det,smn,xpos,ypos);
-         Int_t   pedrms1    = (Int_t) pedmeanrms%1000;
+         Int_t   pedrms1    = (Int_t) pedmeanrms%100;
          Float_t pedrms     = (Float_t)pedrms1/10.;
          Float_t pedmean    = (Float_t) (pedmeanrms - pedrms1)/1000.0;
          //printf("%f %f\n",pedmean, pedrms);
@@ -489,7 +489,7 @@ void AliPMDClusterFinder::Digits2RecPoints(AliRawReader *rawReader,
 
          // Pedestal Subtraction
          Int_t   pedmeanrms = fCalibPed->GetPedMeanRms(det,smn,row,col);
-         Int_t   pedrms1    = (Int_t) pedmeanrms%1000;
+         Int_t   pedrms1    = (Int_t) pedmeanrms%100;
          Float_t pedrms     = (Float_t)pedrms1/10.;
          Float_t pedmean    = (Float_t) (pedmeanrms - pedrms1)/1000.0;
 
@@ -735,7 +735,7 @@ void AliPMDClusterFinder::Digits2RecPoints(Int_t ievt, AliRawReader *rawReader)
            }
          // Pedestal Subtraction
          Int_t   pedmeanrms = fCalibPed->GetPedMeanRms(det,smn,row,col);
-         Int_t   pedrms1    = (Int_t) pedmeanrms%1000;
+         Int_t   pedrms1    = (Int_t) pedmeanrms%100;
          Float_t pedrms     = (Float_t)pedrms1/10.;
          Float_t pedmean    = (Float_t) (pedmeanrms - pedrms1)/1000.0;
 

diff --git a/PMD/AliPMDClusteringV1.cxx b/PMD/AliPMDClusteringV1.cxx
index e03a864924aec4ca0edae5f140267755e0a2c68b..a081946f37646e8154b872fbc073464bfa4f6fb3 100644 (file)
--- a/PMD/AliPMDClusteringV1.cxx
+++ b/PMD/AliPMDClusteringV1.cxx
@@ -849,13 +849,7 @@ void AliPMDClusteringV1::RefClust(Int_t incr, Double_t edepcell[])
              Int_t Ncell=1;
              for (Int_t ii = 0; ii < cellCount[kcl]; ii++)
                {
-                 Float_t xx = x[cellXY[ii][kcl]];
-                 Float_t yy = y[cellXY[ii][kcl]];
-
-                 rr=Distance(xclust[kcl],yclust[kcl],xx,yy);
-                 // Natasha
-                 // We store only the nearest and nest-nearest neighbours
-                 if(rr<2.2) 
+                 if(ii<18) 
                    {   
                      clxy[Ncell] = t[cellXY[ii][kcl]];
                      Ncell++;

diff --git a/PMD/AliPMDDigitizer.cxx b/PMD/AliPMDDigitizer.cxx
index bdd4b76eec108d916a4a71be31e60c1ad6ed0753..2c5eb066c5f32af966a7f585ad3cabc3ff945793 100644 (file)
--- a/PMD/AliPMDDigitizer.cxx
+++ b/PMD/AliPMDDigitizer.cxx
@@ -700,11 +700,10 @@ void AliPMDDigitizer::Hits2Digits(Int_t ievt)
                      // Pedestal Decalibration
                      Int_t   pedmeanrms = 
                          fCalibPed->GetPedMeanRms(idet,ism,jrow,kcol);
-                     Int_t   pedrms1    = (Int_t) pedmeanrms%1000;
+                     Int_t   pedrms1    = (Int_t) pedmeanrms%100;
                      Float_t pedrms     = (Float_t)pedrms1/10.;
                      Float_t pedmean    = 
                          (Float_t) (pedmeanrms - pedrms1)/1000.0;
-                     //printf("%f %f\n",pedmean, pedrms);
                      if (adc > 0.)
                      {
                          adc += (pedmean + 3.0*pedrms);
@@ -792,11 +791,9 @@ void AliPMDDigitizer::SDigits2Digits(Int_t ievt)
          }
          // Pedestal Decalibration
          Int_t   pedmeanrms = fCalibPed->GetPedMeanRms(det,smn,irow,icol);
-         Int_t   pedrms1    = (Int_t) pedmeanrms%1000;
+         Int_t   pedrms1    = (Int_t) pedmeanrms%100;
          Float_t pedrms     = (Float_t)pedrms1/10.;
          Float_t pedmean    = (Float_t) (pedmeanrms - pedrms1)/1000.0;
-         //printf("%f %f\n",pedmean, pedrms);
-         
          if(adc > 0.)
          {
              adc += (pedmean + 3.0*pedrms);
@@ -894,11 +891,10 @@ void AliPMDDigitizer::Exec(Option_t *option)
                      // Pedestal Decalibration
                      Int_t   pedmeanrms = 
                          fCalibPed->GetPedMeanRms(idet,ism,jrow,kcol);
-                     Int_t   pedrms1    = (Int_t) pedmeanrms%1000;
+                     Int_t   pedrms1    = (Int_t) pedmeanrms%100;
                      Float_t pedrms     = (Float_t)pedrms1/10.;
                      Float_t pedmean    = 
                          (Float_t) (pedmeanrms - pedrms1)/1000.0;
-                     //printf("%f %f\n",pedmean, pedrms);
                      if (adc > 0.)
                      {
                          adc += (pedmean + 3.0*pedrms);

diff --git a/PMD/AliPMDcluster.cxx b/PMD/AliPMDcluster.cxx
index 865fd36224d4764d2a1222b9fced1bfa3af78191..90fc096dbf2a248b1c130d6055fb116f12209f68 100644 (file)
--- a/PMD/AliPMDcluster.cxx
+++ b/PMD/AliPMDcluster.cxx
@@ -35,7 +35,7 @@ AliPMDcluster::AliPMDcluster():
     {
       fClusData[i] = 0.;
     }
-  for (Int_t i = 0; i < 15; i++)
+  for (Int_t i = 0; i < 19; i++)
     {
       fClusCellDataX[i] = 0;
       fClusCellDataY[i] = 0;
@@ -53,7 +53,7 @@ AliPMDcluster::AliPMDcluster(Int_t idet, Int_t ismn, Float_t *clusdata,
     {
       fClusData[i] = clusdata[i];
     }
-  for (Int_t i = 0; i < 15; i++)
+  for (Int_t i = 0; i < 19; i++)
     {
       fClusCellDataX[i] = celldataX[i];
       fClusCellDataY[i] = celldataY[i];
@@ -79,7 +79,7 @@ AliPMDcluster::AliPMDcluster(const AliPMDcluster &pmdcluster):
     {
       this->fClusData[i] = pmdcluster.fClusData[i];
     }
-  for(Int_t i=0; i<15; i++)
+  for(Int_t i=0; i<19; i++)
     {
       this->fClusCellDataX[i] = pmdcluster.fClusCellDataX[i];
       this->fClusCellDataY[i] = pmdcluster.fClusCellDataY[i];
@@ -98,7 +98,7 @@ AliPMDcluster & AliPMDcluster::operator=(const AliPMDcluster &pmdcluster)
        {
          this->fClusData[i] = pmdcluster.fClusData[i];
        }
-      for(Int_t i=0; i<15; i++)
+      for(Int_t i=0; i<19; i++)
        {
          this->fClusCellDataX[i] = pmdcluster.fClusCellDataX[i];
          this->fClusCellDataY[i] = pmdcluster.fClusCellDataY[i];

diff --git a/PMD/AliPMDcluster.h b/PMD/AliPMDcluster.h
index b2f56b2ba794ed45a49dd9645ff7f45e0706c592..59a5da6c0280e863df00d9993cbfee864535a6fc 100644 (file)
--- a/PMD/AliPMDcluster.h
+++ b/PMD/AliPMDcluster.h
@@ -42,8 +42,8 @@ class AliPMDcluster : public TObject
 
   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
+  Int_t   fClusCellDataX[19]; // Array containing cell X
+  Int_t   fClusCellDataY[19]; // Array containing cell Y
   Float_t fClusData[6];       // Array containing cluster information
   /*
     fDet         : Det (0:PRE, 1:CPV), fSMN         : SerialModuleNo