Digits and raw data updated for commissioning

[u/mrichter/AliRoot.git] / ZDC / AliZDCRawStream.cxx

diff --git a/ZDC/AliZDCRawStream.cxx b/ZDC/AliZDCRawStream.cxx
index 5527d1eae55d1403eeb012c92a3c34253f9c5a38..84b330d2136f39f6562c325a6d974131262f3b81 100644 (file)
--- a/ZDC/AliZDCRawStream.cxx
+++ b/ZDC/AliZDCRawStream.cxx
@@ -16,14 +16,14 @@
 /* $Id$ */
 
 ///////////////////////////////////////////////////////////////////////////////
-///
-/// This class provides access to ZDC digits in raw data.
-///
-/// It loops over all ZDC digits in the raw data given by the AliRawReader.
-/// The Next method goes to the next digit. If there are no digits left
-/// it returns kFALSE.
-/// Getters provide information about the current digit.
-///
+//                                                                          //
+// This class provides access to ZDC digits in raw data.                    //
+//                                                                          //
+// It loops over all ZDC digits in the raw data given by the AliRawReader.   //
+// The Next method goes to the next digit. If there are no digits left      //
+// it returns kFALSE.                                                       //
+// Getters provide information about the current digit.                     //
+//                                                                          //
 ///////////////////////////////////////////////////////////////////////////////
 
 #include "AliZDCRawStream.h"
@@ -37,7 +37,7 @@ ClassImp(AliZDCRawStream)
 AliZDCRawStream::AliZDCRawStream(AliRawReader* rawReader) :
   fRawReader(rawReader),
   fRawADC(0),   
-  fADCModule(-1),
+  fADCModule(0),        
   fADCValue(-1),        
   fADCGain(0)
 {
@@ -81,61 +81,67 @@ Bool_t AliZDCRawStream::Next()
   if(!fRawReader->ReadNextInt((UInt_t&) fRawADC)) return kFALSE;
   fIsADCDataWord = kFALSE;
   
-  //ADC Header
-  if(fRawADC & 0x2000000){
-      if(((fRawADC & 0x3f00) >> 8) == 24)      fADCModule=1; //fRawADC=2001800 -> 24 words -> 1st ADC module
-      else if(((fRawADC & 0x3f00) >> 8) == 20) fADCModule=2; //fRawADC=2001400 -> 20 words -> 2nd ADC module
-      //
-      //printf(" **** This is the ADC Header - %d data words will follow \n",((fRawADC & 0x3f00) >> 8));
-      //printf("  fRawADC = %x, fADCModule = %d\n",fRawADC, fADCModule);
+  if(fRawADC & 0x2000000){//ADC Header
+    fADCModule++;
+    //printf(" \t AliZDCRawStream -> Header ADC %d -> ADC datum contains %d data words \n",fADCModule,((fRawADC & 0x3f00) >> 8));
   }
-  else if((fRawADC & 0x4000000) || (fRawADC & 0x3000000)){
-    fSector[0] = 0;
-    //ADC EOB
-    /*if(fRawADC & 0x4000000){
-      printf(" **** This is the ADC End Of Block - event number %d\n",(fRawADC & 0xffffff));
-    }*/
+  else if((fRawADC & 0x4000000)){//ADC EOB
+    //printf(" \t AliZDCRawStream -> ADC %d End Of Block - event number %d\n\n",fADCModule, (fRawADC & 0xffffff));
+    fSector[0] = fSector[1] = 99;
   } 
-  //ADC Data Words
-  else{
-    /*printf("This is an ADC Data Word -> channel %d range %d\n",(fRawADC & 0x1e0000) >> 17, (fRawADC & 0x10000) >> 16);
-    if(fRawADC & 0x1000) printf("ZDCRawStream -> ADC overflow\n");
-    if(fRawADC & 0x2000) printf("ZDCRawStream -> ADC underflow\n");*/
-    //
-    fADCGain = (fRawADC & 0x10000) >> 16;
-    fADCValue = (fRawADC & 0xfff);   
+  else if((fRawADC & 0x6000000)){//Not valid datum
+    printf(" \t AliZDCRawStream -> Not valid datum in ADC module %d\n",fADCModule);
+  }
+  else{//ADC data word
     fIsADCDataWord = kTRUE;
-    //
-    Int_t vADCChannel = (fRawADC & 0x1e0000) >> 17;
-    if(fADCModule==1){  //1st ADC module
-      if(vADCChannel >= 0 && vADCChannel <= 4){ 
-        fSector[0] = 1;
-        fSector[1] = vADCChannel;
-      } 
-      else if(vADCChannel >= 8 && vADCChannel <= 12){
-        fSector[0] = 2;
-        fSector[1] = vADCChannel-8;
-      } 
-      else if(vADCChannel == 5 || vADCChannel == 13){
-        fSector[0] = 3;
-        fSector[1] = ((vADCChannel-5)/8)+1;
+    //printf(" \t \t ADC Data Word");
+    if(!(fRawADC & 0x1000) && !(fRawADC & 0x2000)){ // Valid ADC data
+      fADCGain = (fRawADC & 0x10000) >> 16;
+      fADCValue = (fRawADC & 0xfff);   
+      //
+      Int_t vADCChannel = (fRawADC & 0x1e0000) >> 17;
+      if(fADCModule==1 || fADCModule==3){  //1st & 3rd ADC modules
+        if(vADCChannel >= 0 && vADCChannel <= 4){ 
+          fSector[0] = 1; // ZN1
+          fSector[1] = vADCChannel;
+        } 
+        else if(vADCChannel >= 8 && vADCChannel <= 12){
+          fSector[0] = 2; // ZP1
+          fSector[1] = vADCChannel-8;
+        } 
+        else if(vADCChannel == 5 || vADCChannel == 13){
+          fSector[0] = 3; // ZEM 1,2
+          fSector[1] = ((vADCChannel-5)/8)+1;
+        }
       }
+      else if(fADCModule==2 || fADCModule==4){  //2nd & 4rth ADC modules
+        if(vADCChannel >= 0 && vADCChannel <= 4){ 
+          fSector[0] = 4; // ZN2
+          fSector[1] = vADCChannel;
+        } 
+        else if(vADCChannel >= 8 && vADCChannel <= 12){
+          fSector[0] = 5; // ZP2
+          fSector[1] = vADCChannel-8;
+        } 
+        else if(vADCChannel == 5 || vADCChannel == 13){
+          fSector[0] = (vADCChannel-5)/8+1; // PM Ref 1,2
+          fSector[1] = 5;
+        }
+      }
+      else{
+        AliWarning(" \t AliZDCRawStream -> No valid ADC module!");
+        printf(" ADCmod = %d\n", fADCModule);
+        fRawReader->AddMajorErrorLog(kInvalidADCModule);
+      }
+      /*printf(" \t \tADC %d ch %d range %d -> det %d quad %d value %x\n",
+           fADCModule, vADCChannel, fADCGain, fSector[0], fSector[1], fADCValue);//Chiara debugging
+      */
     }
-    else if(fADCModule==2){  //2nd ADC module
-      if(vADCChannel >= 0 && vADCChannel <= 4){ 
-        fSector[0] = 4;
-        fSector[1] = vADCChannel;
-      } 
-      else if(vADCChannel >= 8 && vADCChannel <= 12){
-        fSector[0] = 5;
-        fSector[1] = vADCChannel-8;
-      } 
-    }
-    else {
-      AliWarning("No valid ADC module!");
-      fRawReader->AddMajorErrorLog(kInvalidADCModule);
-    }      
-    
+    else if(fRawADC & 0x1000) 
+      printf(" \t \tADC %d ch %d range %d  overflow\n",fADCModule, (fRawADC & 0x1e0000) >> 17, fADCGain); // Overflow
+    else if(fRawADC & 0x2000) 
+      printf(" \t \tADC %d ch %d range %d  underflow\n",fADCModule, (fRawADC & 0x1e0000) >> 17, fADCGain); // Underflow
   }
+
   return kTRUE;
 }