Changes for Pb-Pb reco at 2.76 A TeV + some code simplification

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

diff --git a/ZDC/AliZDCRawStream.cxx b/ZDC/AliZDCRawStream.cxx
index 02344cdc4efd9b5b1c14608b0ec44c1a08fb2d65..c0d2a87c36d00abb7ef68280e49238889698ca6e 100644 (file)
--- a/ZDC/AliZDCRawStream.cxx
+++ b/ZDC/AliZDCRawStream.cxx
@@ -375,7 +375,7 @@ Bool_t AliZDCRawStream::Next()
   //
   fIsHeaderMapping = kFALSE; fIsChMapping = kFALSE; 
   fIsADCHeader = kFALSE; fIsADCDataWord = kFALSE; fIsADCEOB = kFALSE;
-  fIsADDChannel = kFALSE; fIsADDTDCHeader= kFALSE; fIsADDTDCdatum=kFALSE;
+  fIsZDCTDCdatum = kFALSE; fIsADDChannel = kFALSE; fIsADDTDCdatum=kFALSE;
   fIsUnderflow = kFALSE; fIsOverflow = kFALSE; fIsScalerWord = kFALSE;
   fSector[0] = fSector[1] = -1;
   for(Int_t kl=0; kl<4; kl++) fCPTInput[kl] = 0;
@@ -861,6 +861,7 @@ Bool_t AliZDCRawStream::Next()
       fIsADCDataWord=kFALSE; fIsScalerWord=kFALSE;
       if(((fBuffer & 0xf0000000)==0x00000000) && (((fBuffer & 0x08000000) >> 27) == 0)){ // TDC datum
         fADCChannel = (Int_t) ((fBuffer & 0x3e00000) >> 21);
+       fIsZDCTDCdatum = kTRUE;
        fZDCTDCdatum = (Int_t) (fBuffer & 0x1fffff);
         // Ch. debug
         //printf("  AliZDCRawStream -> ZDC TDC mod. %d ch. %d datum %d\n",fADCModule,fADCChannel,fZDCTDCdatum);
@@ -878,6 +879,7 @@ Bool_t AliZDCRawStream::Next()
       fIsADCDataWord=kFALSE; fIsScalerWord=kFALSE;
       if(((fBuffer & 0xf0000000)==0x00000000) && (((fBuffer & 0x08000000) >> 27) == 0)){ // TDC datum
         fADCChannel = (Int_t) ((fBuffer & 0x3e00000) >> 21);
+       fIsADDTDCdatum = kTRUE;
        fADDTDCdatum = (Int_t) (fBuffer & 0x1fffff);
         // Ch. debug
         //printf("  AliZDCRawStream -> ADD TDC mod. %d ch. %d datum %d\n",fADCModule,fADCChannel,fADDTDCdatum);