Selection of ADC words updated to get correct calibration

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

diff --git a/ZDC/AliZDCRawStream.cxx b/ZDC/AliZDCRawStream.cxx
index 516bfa6e63f622cf492f29e96abf207c5f0ea916..b75a80ba0c1c28d4000a43c3c6eb9ac3c6867ffd 100644 (file)
--- a/ZDC/AliZDCRawStream.cxx
+++ b/ZDC/AliZDCRawStream.cxx
@@ -406,7 +406,7 @@ Bool_t AliZDCRawStream::Next()
     
     if(fPosition>=fDataOffset){
       if((fBuffer&0xff000001) == 0xff000001){ // ************** Mapping
-        // DARC 1st datum @ fDataOffset+1 \ ZRC 1st valid datum fDataOffset=0
+        // DARC 1st datum @ fDataOffset+1 \ ZRC 1st valid datum @ fDataOffset=0
         if((fPosition==fDataOffset+1) || (fPosition==fDataOffset)){ 
           printf("\n\n ------ AliZDCRawStream -> Reading mapping from StartOfData event ------\n");
           fCurrentCh=0; fCurrScCh=0;   
@@ -782,7 +782,7 @@ Bool_t AliZDCRawStream::Next()
     // ********************************** VME SCALER DATA **********************************
     //  Reading VME scaler data 
     if(fIsScHeaderRead && fPosition>=fScStartCounter+1){ // *** Scaler word
-      fADCModule = kScalerGeo;
+      fADCModule = kScalerGeo; fIsADCDataWord = kFALSE;        
       fScEvCounter = fBuffer;
       Int_t nWords = (Int_t) (fScNWords);
       if(fPosition == fScStartCounter+nWords) fIsScHeaderRead = kFALSE;
@@ -792,7 +792,7 @@ Bool_t AliZDCRawStream::Next()
     // ******************************** TRIGGER SCALER DATA ********************************
     //  Reading trigger scaler data 
     if(fIsTriggerScaler && fPosition>=fTrigCountStart+1){
-      fADCModule = kTrigScales;
+      fADCModule = kTrigScales; fIsADCDataWord = kFALSE;       
       if(fPosition == fTrigCountStart+1)      fMBTrigInput = fBuffer;              
       else if(fPosition == fTrigCountStart+2) fCentralTrigInput = fBuffer;                 
       else if(fPosition == fTrigCountStart+3) fSCentralTrigInput = fBuffer;
@@ -811,7 +811,7 @@ Bool_t AliZDCRawStream::Next()
     // ******************************* TRIGGER HISTORY WORDS ******************************
     //  Reading trigger history
     if(fIsTriggerHistory && fPosition>=fTrigHistStart+1){
-       fADCModule = kTrigHistory;      
+       fADCModule = kTrigHistory; fIsADCDataWord = kFALSE;     
        if(fPosition == fTrigHistStart+1){
          fPileUpBit1stWord = (fBuffer & 0x80000000) >> 31;
          fL0Bit1stWord = (fBuffer & 0x40000000) >> 30;