Index for pedestal subtraction corrected

diff --git a/ZDC/AliZDC.cxx b/ZDC/AliZDC.cxx
index 45a73f616483313d225667a241dbee917349d40b..ede5d47b9b2f991ae32d07e62d55f9b897eec6f1 100644 (file)
--- a/ZDC/AliZDC.cxx
+++ b/ZDC/AliZDC.cxx
@@ -576,10 +576,10 @@ void AliZDC::Digits2Raw()
   }
   //
   /*
-  for(Int_t i=0;i<24;i++) printf("\t ADCData1[%d] = %x\n",i,lADCData1[i]);
-  for(Int_t i=0;i<20;i++) printf("\t ADCData2[%d] = %x\n",i,lADCData2[i]);
-  for(Int_t i=0;i<24;i++) printf("\t ADCData3[%d] = %x\n",i,lADCData3[i]);
-  for(Int_t i=0;i<20;i++) printf("\t ADCData4[%d] = %x\n",i,lADCData4[i]);
+  for(Int_t i=0;i<knADCData1;i++) printf("\t ADCData1[%d] = %x\n",i,lADCData1[i]);
+  for(Int_t i=0;i<knADCData2;i++) printf("\t ADCData2[%d] = %x\n",i,lADCData2[i]);
+  for(Int_t i=0;i<knADCData1;i++) printf("\t ADCData3[%d] = %x\n",i,lADCData3[i]);
+  for(Int_t i=0;i<knADCData2;i++) printf("\t ADCData4[%d] = %x\n",i,lADCData4[i]);
   */
  
   // End of Block
@@ -710,13 +710,15 @@ Int_t AliZDC::Pedestal(Int_t Det, Int_t Quad, Int_t Res) const
   //
   Float_t pedValue;
   Float_t meanPed, pedWidth;
-  Int_t index=0;
-  if(Quad!=5){
-    if(Det==1 || Det==2)      index = 10*(Det-1)+Quad+5*Res;   // ZN1, ZP1
-    else if(Det==3)          index = 10*(Det-1)+(Quad-1)+Res; // ZEM
-    else if(Det==4 || Det==5) index = 10*(Det-2)+Quad+5*Res+4; // ZN2, ZP2
-  }
-  else index = 10*(Quad-1)+(Det-1)*1/3+2*Res+4; // Reference PMs
+    Int_t index=0;
+    if(Quad!=5){
+      if(Det==1)       index = Quad+24*Res;       // ZN1
+      else if(Det==2)  index = (Quad+5)+24*Res;           // ZP1
+      else if(Det==3)  index = (Quad+9)+24*Res; // ZEM
+      else if(Det==4)  index = (Quad+12)+24*Res; // ZN2
+      else if(Det==5)  index = (Quad+17)+24*Res; // ZP2
+    }
+    else index = (Det-1)/3+22+24*Res; // Reference PMs
   //
   //
   meanPed = calibPed->GetMeanPed(index);

diff --git a/ZDC/AliZDCDigitizer.cxx b/ZDC/AliZDCDigitizer.cxx
index 4e1237c39998b2e7aaa829ea42d9148df804db5b..bf79a55c8b06c75d1a1f19e759303e68e1b6e71b 100644 (file)
--- a/ZDC/AliZDCDigitizer.cxx
+++ b/ZDC/AliZDCDigitizer.cxx
@@ -250,7 +250,7 @@ void AliZDCDigitizer::Exec(Option_t* /*option*/)
            digi[res] = Phe2ADCch(sector[0], sector[1], pm[sector[0]-1][sector[1]], res) 
                    + Pedestal(sector[0], sector[1], res);
        }
-       /*printf("\t DIGIT added -> det = %d, quad = %d - digi[0,1] = [%d, %d]\n",
+       /*printf("\t DIGIT added -> det %d quad %d - digi[0,1] = [%d, %d]\n",
             sector[0], sector[1], digi[0], digi[1]); // Chiara debugging!
        */
        //
@@ -266,7 +266,7 @@ void AliZDCDigitizer::Exec(Option_t* /*option*/)
              digiL[res] = Phe2ADCch(sectorL[0], sectorL[1], pm[sector[0]-1][sector[1]], res) 
                    + Pedestal(sectorL[0], sectorL[1], res);
           }
-          /*printf("\t DIGIT added -> det = %d, quad = %d - digi[0,1] = [%d, %d]\n",
+          /*printf("\t DIGIT added -> det %d quad %d - digi[0,1] = [%d, %d]\n",
                 sectorL[0], sectorL[1], digiL[0], digiL[1]); // Chiara debugging!
           */
           //
@@ -457,7 +457,7 @@ Int_t AliZDCDigitizer::Phe2ADCch(Int_t Det, Int_t Quad, Float_t Light,
 {
   // Evaluation of the ADC channel corresponding to the light yield Light
   Int_t vADCch = (Int_t) (Light * fPMGain[Det-1][Quad] * fADCRes[Res]);
-  //printf("\t Phe2ADCch -> det %d quad %d - phe %.0f  ADC %d\n", Det,Quad,Light,ADCch);
+  //printf("\t Phe2ADCch -> det %d quad %d - phe %.0f  ADC %d\n", Det,Quad,Light,vADCch);
 
   return vADCch;
 }
@@ -474,17 +474,19 @@ Int_t AliZDCDigitizer::Pedestal(Int_t Det, Int_t Quad, Int_t Res) const
     Float_t meanPed, pedWidth;
     Int_t index=0;
     if(Quad!=5){
-      if(Det==1 || Det==2)     index = 10*(Det-1)+Quad+5*Res;   // ZN1, ZP1
-      else if(Det==3)          index = 10*(Det-1)+(Quad-1)+Res; // ZEM
-      else if(Det==4 || Det==5)        index = 10*(Det-2)+Quad+5*Res+4; // ZN2, ZP2
+      if(Det==1)       index = Quad+24*Res;      // ZN1
+      else if(Det==2)  index = (Quad+5)+24*Res;  // ZP1
+      else if(Det==3)  index = (Quad+9)+24*Res;  // ZEM
+      else if(Det==4)  index = (Quad+12)+24*Res; // ZN2
+      else if(Det==5)  index = (Quad+17)+24*Res; // ZP2
     }
-    else index = 10*(Quad-1)+(Det-1)*1/3+2*Res+4; // Reference PMs
+    else index = (Det-1)/3+22+24*Res; // Reference PMs
     //
     meanPed = fPedData->GetMeanPed(index);
     pedWidth = fPedData->GetMeanPedWidth(index);
     pedValue = gRandom->Gaus(meanPed,pedWidth);
     //
-    /*printf("\t Pedestal -> det = %d, quad = %d, res = %d - Ped[%d] = %d\n",
+    /*printf("\t  AliZDCDigitizer::Pedestal -> det %d quad %d res %d - Ped[%d] = %d\n",
        Det, Quad, Res, index,(Int_t) pedValue); // Chiara debugging!
     */
   }