compilation warnings fixed

[u/mrichter/AliRoot.git] / TPC / AliTPCDDLRawData.cxx

diff --git a/TPC/AliTPCDDLRawData.cxx b/TPC/AliTPCDDLRawData.cxx
index a248730965f7df1111289fa33dc87b2f50f74297..166f1fc41a121624e03fa0ceb4fd128d8070b907 100644 (file)
--- a/TPC/AliTPCDDLRawData.cxx
+++ b/TPC/AliTPCDDLRawData.cxx
@@ -27,10 +27,10 @@
 #include <Riostream.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include "AliAltroBuffer.h"
+//#include "AliAltroBuffer.h"
+#include "AliAltroBufferV3.h"
 #include "AliTPCAltroMapping.h"
 #include "AliTPCDDLRawData.h"
-#include "AliRawDataHeader.h"
 #include "AliDAQ.h"
 
 ClassImp(AliTPCDDLRawData)
@@ -115,7 +115,8 @@ void AliTPCDDLRawData::RawData(const char* inputFileName){
       strcpy(filename,AliDAQ::DdlFileName("TPC",ddlNumber));
       Int_t patchIndex = data.SubSec;
       if(data.Sec>=36) patchIndex += 2;
-      buffer=new AliAltroBuffer(filename,mapping[patchIndex]);
+      //buffer=new AliAltroBuffer(filename,mapping[patchIndex]);
+      buffer=new AliAltroBufferV3(filename,mapping[patchIndex]);
       //size magic word sector number sub-sector number 0 for TPC 0 for uncompressed
       buffer->WriteDataHeader(kTRUE,kFALSE);//Dummy;
       bunchLength=1;
@@ -126,20 +127,21 @@ void AliTPCDDLRawData::RawData(const char* inputFileName){
       if ( (data.Time==(pTimeBin+1)) &&
           (pPadNumber==data.Pad) &&
           (pRowNumber==data.Row) &&
-          (pSecNumber==data.Sec)){
+          (pSecNumber==data.Sec) &&
+          (pSubSector==data.SubSec)){
        bunchLength++;
       }//end if
       else{
        buffer->FillBuffer(pTimeBin);
        buffer->FillBuffer(bunchLength+2);
        nwords+=2;
-       if ((pPadNumber!=data.Pad)||(pRowNumber!=data.Row)||(pSecNumber!=data.Sec)){
+       if ((pPadNumber!=data.Pad)||(pRowNumber!=data.Row)||(pSecNumber!=data.Sec)||(pSubSector!=data.SubSec)){
          //Trailer is formatted and inserted!!
          buffer->WriteTrailer(nwords,pPadNumber,pRowNumber,pSecNumber);
          numPackets++;
          nwords=0;
 
-         if(pSubSector!=data.SubSec){
+         if(pSecNumber!=data.Sec || pSubSector!=data.SubSec){
            //size magic word sector number sub-sector number 0 for TPC 0 for uncompressed
            buffer->Flush();
            buffer->WriteDataHeader(kFALSE,kFALSE);
@@ -153,7 +155,8 @@ void AliTPCDDLRawData::RawData(const char* inputFileName){
            strcpy(filename,AliDAQ::DdlFileName("TPC",ddlNumber));
            Int_t patchIndex = data.SubSec;
            if(data.Sec>=36) patchIndex += 2;
-           buffer=new AliAltroBuffer(filename,mapping[patchIndex]);
+           // buffer=new AliAltroBuffer(filename,mapping[patchIndex]);
+            buffer=new AliAltroBufferV3(filename,mapping[patchIndex]);
            buffer->WriteDataHeader(kTRUE,kFALSE);//Dummy;
            pSubSector=data.SubSec;
          }//end if