]> git.uio.no Git - u/mrichter/AliRoot.git/commitdiff
Changes to solve bug #69394 - tested also in reco
authorcoppedis <coppedis@f7af4fe6-9843-0410-8265-dc069ae4e863>
Wed, 15 Sep 2010 13:19:04 +0000 (13:19 +0000)
committercoppedis <coppedis@f7af4fe6-9843-0410-8265-dc069ae4e863>
Wed, 15 Sep 2010 13:19:04 +0000 (13:19 +0000)
ZDC/AliZDCRawStream.cxx

index 96aab852b4c8381626b56358d76cfd4546f86b91..5974a2ef7836710a7054ff2cfae8995354928ee1 100644 (file)
@@ -52,7 +52,7 @@ AliZDCRawStream::AliZDCRawStream(AliRawReader* rawReader) :
   fIsADCEOB(kFALSE),
   fSODReading(kFALSE),
   fIsMapRead(kFALSE),
-  fReadCDH(kTRUE),
+  fReadCDH(kFALSE),
   fDeadfaceOffset(-1),
   fDeadbeefOffset(-1),
   fDataOffset(0),
@@ -388,17 +388,14 @@ Bool_t AliZDCRawStream::Next()
   for(Int_t kl=0; kl<4; kl++) fCPTInput[kl] = 0;
 
   fEvType = fRawReader->GetType();
-  if(fPosition==0 && fReadCDH){
-    //if(fEvType==7 || fEvType ==8){ //Physics or calibration event
-      ReadCDHHeader();
-    //}
+  if(fPosition==0){
+    ReadCDHHeader();
+    // Needed to read simulated raw data (temporary solution?)
+    if(!fReadCDH) fReadOutCard=1;
     fCurrentCh=0; fCurrScCh=0;  fCurrTDCCh=0;fNChannelsOn=0;
     // Ch. debug
     //printf("\n  AliZDCRawStream::Next() - ev. type %d",fEvType);
   }
-  // Needed to read simulated raw data (temporary solution?)
-  else if(fPosition==0 && !fReadCDH && fReadOutCard==-1) fReadOutCard=1;
-  
   // Ch. debug
   //printf("\n  AliZDCRawStream::Next() - fBuffer[%d] = %x\n",fPosition, fBuffer);