reading and writing raw with recent LookUpTable

diff --git a/T0/AliT0RawData.cxx b/T0/AliT0RawData.cxx
index 3a796df51763fe45165ffb29ae1360a74b933a08..7bee16567ea4b0fbdb053b0b89acf94064be0d02 100644 (file)
--- a/T0/AliT0RawData.cxx
+++ b/T0/AliT0RawData.cxx
@@ -207,7 +207,7 @@ void AliT0RawData::GetDigits(AliT0digit *fDigits)
   allData->AddAt(mult0,55);
   allData->AddAt(mult1,56);
 
-  //   cout.setf( ios_base::hex, ios_base::basefield );
+    cout.setf( ios_base::hex, ios_base::basefield );
   //space for DRM header
   fIndex += 6;
 
@@ -218,13 +218,16 @@ void AliT0RawData::GetDigits(AliT0digit *fDigits)
   positionOfTRMHeader= fIndex;
   //space for chain  header
   fIndex ++;
-  WriteChainDataHeader(0, 0); // 
+  WriteChainDataHeader(1, 1); // 
+
+  //  fIndex++;
   // Loop through all PMT
   Int_t chain=0; 
   Int_t iTDC = 0;
   Int_t channel=0;
   Int_t trm1words=0;
-  Int_t itrm=0, oldtrm=0;
+  Int_t itrm=7;
+  Int_t inside =0;
   AliT0LookUpKey * lookkey  = new AliT0LookUpKey();
   AliT0LookUpValue * lookvalue ;//= new AliT0LookUpValue(trm,tdc,chain,channel);
   for (Int_t det = 0; det < 105; det++) {
@@ -235,13 +238,16 @@ void AliT0RawData::GetDigits(AliT0digit *fDigits)
       if (lookvalue ) 
        {
          itrm= lookvalue->GetTRM();
-         if (itrm != oldtrm ) {
+//       cout<<" TRM "<<itrm<<endl;
+         if (itrm ==7 && det >56 &&inside ==0) {
            WriteChainDataTrailer(1); // 1st chain trailer
            fIndex++;
-           WriteChainDataHeader(2, 1); // 
-           WriteChainDataTrailer(3); // 2st chain trailer
-           WriteTrailer(15,0,fEventNumber,5); // 1st TRM trailer
-           
+           WriteChainDataHeader(2, 1);
+           //      fIndex++;
+           inside++;
+           //      WriteChainDataTrailer(3); // 2st chain trailer
+           //      WriteTrailer(15,0,fEventNumber,5); // 1st TRM trailer
+           /*      
            
            trm1words = fIndex - startTRM;
            WriteTRMDataHeader(oldtrm, trm1words , positionOfTRMHeader);
@@ -250,11 +256,13 @@ void AliT0RawData::GetDigits(AliT0digit *fDigits)
            fIndex ++;
            positionOfTRMHeader= fIndex;
            fIndex ++;
-           oldtrm=itrm;
+           //      oldtrm=itrm;
+           */
          }         
          chain = lookvalue->GetChain();
          iTDC = lookvalue->GetTDC();
          channel = lookvalue->GetChannel();
+       //  cout<<" chain "<< chain<<"  iTDC "<<iTDC<<" channel "<<channel<<endl;
          FillTime(channel,  iTDC,  time);
        }
       else
@@ -266,9 +274,7 @@ void AliT0RawData::GetDigits(AliT0digit *fDigits)
     
   }
     
-  WriteChainDataTrailer(1); // 1st chain trailer
-  fIndex++;
-  WriteChainDataHeader(2, 1); // 
+    //  WriteChainDataHeader(2, 1); // 
   WriteChainDataTrailer(3); // 2st chain trailer
   WriteTrailer(15,0,fEventNumber,5); // 1st TRM trailer
   
@@ -276,10 +282,10 @@ void AliT0RawData::GetDigits(AliT0digit *fDigits)
   trm1words = fIndex - startTRM;
   //space for 2st TRM header
   
-  WriteTRMDataHeader(1, trm1words , positionOfTRMHeader);
+  WriteTRMDataHeader(itrm, trm1words , positionOfTRMHeader);
   
   //DRM trailer
-  WriteTrailer(1,0,fEventNumber,5); // 1st TRM trailer
+  WriteTrailer(1,0,fEventNumber,5);
     
     WriteDRMDataHeader();
     
@@ -407,7 +413,7 @@ void  AliT0RawData::WriteTRMDataHeader(UInt_t slotID, Int_t nWordsInTRM,
   word=4;
   PackWord(baseWord,word,28,31); // 0100 marks header
   fBuffer[positionOfTRMHeader] =  baseWord;
-
+//  cout<<" TRM header "<<baseWord<<endl;
   word=0; 
   baseWord=0;
      
@@ -437,7 +443,7 @@ void  AliT0RawData::WriteChainDataHeader(UInt_t chainNumber,UInt_t slotID)
   word=chainNumber;
   PackWord(baseWord,word,28,31); // 0100 marks header
   fBuffer[fIndex] =  baseWord;
-
+  //cout<<" chain header "<<baseWord<<" number "<<chainNumber<<endl;
   word=0;
   baseWord=0;     
   
@@ -461,7 +467,7 @@ void  AliT0RawData::WriteChainDataTrailer(UInt_t chainNumber )
   PackWord(baseWord,word,28,31); // chain number
   fIndex++;
   fBuffer[fIndex] =  baseWord;
-
+ // cout<<" chain trailer "<<baseWord<<endl;
   word=0;
   baseWord=0;     
   
@@ -509,6 +515,7 @@ void  AliT0RawData::WriteTrailer(UInt_t slot, Int_t word1, UInt_t word2, UInt_t
   PackWord(baseWord,word,28,31); //  marks trailer
   fIndex++;
   fBuffer[fIndex] =  baseWord;
+ // cout<<" trailer "<<baseWord<<endl;
   word=0;
   baseWord=0;
 
@@ -537,7 +544,7 @@ void  AliT0RawData::FillTime(Int_t ch, Int_t iTDC, Int_t time)
   PackWord(baseWord,word, 31, 31); // 1
   fIndex++;
   fBuffer[fIndex]=baseWord;
-  word=0;
+ // cout<<" data  "<<baseWord<<endl;  word=0;
   baseWord=0;
 }
 //---------------------------------------------------------------------------------------

diff --git a/T0/AliT0RawReader.cxx b/T0/AliT0RawReader.cxx
index 9a53bf1c4e90cdddd5c50718dda0f7c2d8217d59..dbdff015dda6df3d63faaeac8cc6db577633aafd 100644 (file)
--- a/T0/AliT0RawReader.cxx
+++ b/T0/AliT0RawReader.cxx
@@ -119,6 +119,7 @@ Bool_t  AliT0RawReader::Next()
        //TRMheader  
        word = GetNextWord();
        header = AliBitPacking::UnpackWord(word,28,31);
+//     cout<<" TRM header "<<word<<endl;
        if ( header != 4 )
          {
            AliWarning(Form(" !!!! wrong TRM header  %x!!!!", word));
@@ -126,11 +127,13 @@ Bool_t  AliT0RawReader::Next()
            break;
          }
        numberOfWordsInTRM=AliBitPacking::UnpackWord(word,4,16);
+//     cout<<" numberOfWordsInTRM "<<numberOfWordsInTRM<<endl;
        iTRM=AliBitPacking::UnpackWord(word,0,3);
        for( Int_t ichain=0; ichain<2; ichain++)
          {
            //chain header
            word = GetNextWord();
+//         cout<<" chain header "<<word<<endl;
            uu = word & TRM_CHAIN_0_HEADER;
            if(uu != TRM_CHAIN_0_HEADER) 
              {
@@ -139,19 +142,21 @@ Bool_t  AliT0RawReader::Next()
                break;
              }
            word = GetNextWord();
+//         cout<<" next "<<word<<endl;
            tdcTime =  AliBitPacking::UnpackWord(word,31,31);   
-           for (; tdcTime==1; tdcTime) 
+//         for (; tdcTime==1; tdcTime) 
+       while(tdcTime==1)
              {
-               //      cout<<" packed "<<word<<endl;
+//                     cout<<" packed "<<word<<endl;
                itdc=AliBitPacking::UnpackWord(word,24,27);
                ichannel=AliBitPacking::UnpackWord(word,21,23);
                time=AliBitPacking::UnpackWord(word,0,20);
                
                koef = fParam->GetChannel(iTRM,itdc,ichain,ichannel);
-               /*      if (koef != 0 ) 
-                 cout<<"RawReader>> "<<"koef "<<koef<<" trm "<<iTRM<<
-                   " tdc "<<itdc<<" chain "<<ichain<<
-                   " channel "<<ichannel<<" time "<<time<<endl;*/
+                       if (koef != 0 ) 
+//               cout<<"RawReader>> "<<"koef "<<koef<<" trm "<<iTRM<<
+//                 " tdc "<<itdc<<" chain "<<ichain<<
+//                 " channel "<<ichannel<<" time "<<time<<endl;
                if (koef ==-1 ){
                  AliWarning(Form("Incorrect lookup table ! "));
                  fRawReader->AddMajorErrorLog(kIncorrectLUT);
@@ -167,11 +172,12 @@ Bool_t  AliT0RawReader::Next()
                  koefhits[koef]++;
                }
                  word = GetNextWord();
+//               cout<<" next word in cycle "<<word<<endl;
                  tdcTime =  AliBitPacking::UnpackWord(word,31,31);   
                
            }
            
-
+//         cout<<" chain trailer "<<word<<endl;
            uu = word&TRM_CHAIN_0_TRAILER;
            if(uu != TRM_CHAIN_0_TRAILER )
              {
@@ -182,6 +188,7 @@ Bool_t  AliT0RawReader::Next()
          }
             
        word = GetNextWord(); //TRM trailer
+//     cout<<" TRM trailer "<<word<<endl;
        header = AliBitPacking::UnpackWord(word,28,31);
        if( header !=5 )
          {