Fixing local structure disabled word, which had an incorrect value.

[u/mrichter/AliRoot.git] / ITS / AliITSRawStreamSDD.cxx

diff --git a/ITS/AliITSRawStreamSDD.cxx b/ITS/AliITSRawStreamSDD.cxx
index 9815b5067ff31aa78b0e18d3979761862d25c7e5..379153fadd8193dd46ca55b69e1b468e0ee965fd 100644 (file)
--- a/ITS/AliITSRawStreamSDD.cxx
+++ b/ITS/AliITSRawStreamSDD.cxx
@@ -22,6 +22,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 #include "AliITSRawStreamSDD.h"
+#include "AliITSRawStreamSDDCompressed.h"
 #include "AliRawReader.h"
 #include "AliLog.h"
 
@@ -49,7 +50,6 @@ fDecompressAmbra(kTRUE)
     fLowThresholdArray[im][1]=0;
   }
   for(Int_t i=0;i<kFifoWords;i++) fNfifo[i]=0;
-  for(Int_t i=0;i<kDDLsNumber;i++) fSkip[i]=0;
   fRawReader->Reset();
   fRawReader->Select("ITSSDD");
 
@@ -86,6 +86,39 @@ AliITSRawStreamSDD::~AliITSRawStreamSDD(){
   if(fDDLModuleMap) delete fDDLModuleMap;
 }
 //______________________________________________________________________
+UChar_t AliITSRawStreamSDD::ReadBlockAttributes(AliRawReader* rawReader){
+  // reads block attribuited from CDH
+  UChar_t *data;
+  rawReader->Reset();
+  rawReader->Select("ITSSDD");
+  do{
+    if(!rawReader->ReadNextData(data)) return 0x0;
+  }while(rawReader->GetDataSize()==0);
+  UChar_t attr=rawReader->GetBlockAttributes();
+  return attr;
+}
+//______________________________________________________________________
+AliITSRawStream* AliITSRawStreamSDD::CreateRawStreamSDD(AliRawReader* rawReader, UChar_t attributes){
+  // instantiates the proper raw stream from block attributes value
+
+  Int_t rawFormat=(attributes&0xE0)>>5;  
+  rawReader->Reset();
+  AliITSRawStream* inputSDD;
+  if(rawFormat==0){
+    inputSDD=new AliITSRawStreamSDDCompressed(rawReader);
+    inputSDD->SetADCEncoded(kTRUE);
+  }else{
+    inputSDD=new AliITSRawStreamSDD(rawReader);
+  }
+  return inputSDD;
+}
+//______________________________________________________________________
+AliITSRawStream* AliITSRawStreamSDD::CreateRawStreamSDD(AliRawReader* rawReader){
+  // reads the data format from CDH and instantiates the proper raw stream
+  UChar_t attr=ReadBlockAttributes(rawReader);
+  return CreateRawStreamSDD(rawReader,attr);
+}
+//______________________________________________________________________
 UInt_t AliITSRawStreamSDD::ReadBits()
 {
 // read bits from the given channel
@@ -103,10 +136,13 @@ Int_t AliITSRawStreamSDD::DecompAmbra(Int_t value) const
   if ((value & 0x80) == 0) {
     return value & 0x7f;
   } else if ((value & 0x40) == 0) {
+    if(value&1) return 0x080 + ((value & 0x3f) << 1);
     return 0x081 + ((value & 0x3f) << 1);
   } else if ((value & 0x20) == 0) {
+    if(value&1) return 0x103 + ((value & 0x1f) << 3);
     return 0x104 + ((value & 0x1f) << 3);
   } else {
+    if(value&1) return 0x207 + ((value & 0x1f) << 4);
     return 0x208 + ((value & 0x1f) << 4);
   }
   
@@ -117,8 +153,9 @@ Bool_t AliITSRawStreamSDD::Next()
 {
 // read the next raw digit
 // returns kFALSE if there is no digit left
-// returns kTRUE and fCompletedModule=kFALSE when a digit is found
-// returns kTRUE and fCompletedModule=kTRUE  when a module is completed (=3x3FFFFFFF footer words)
+// returns kTRUE and fCompletedModule=kFALSE and fCompletedDDL=kFALSE when a digit is found
+// returns kTRUE and fCompletedModule=kTRUE  and fCompletedDDL=kFALSE when a module is completed (=3x3FFFFFFF footer words)
+// returns kTRUE and fCompletedModule=kFALSE and fCompletedDDL=kTRUE  when a DDL is completed (=jitter word)
 
   fPrevModuleID = fModuleID;
   fCompletedModule=kFALSE;
@@ -135,9 +172,12 @@ Bool_t AliITSRawStreamSDD::Next()
 
 
       if((fData >> 16) == 0x7F00){ // jitter word
+       fJitter = fData&0x000000ff;
        fResetSkip=kTRUE;
-       continue;
-      }
+       fCompletedModule=kFALSE;
+       fCompletedDDL=kTRUE;
+       return kTRUE;
+       }
 
       UInt_t nData28= fData >> 28;
       UInt_t nData30= fData >> 30;
@@ -156,6 +196,7 @@ Bool_t AliITSRawStreamSDD::Next()
          fICountFoot[fCarlosId]++; // stop before the last word (last word=jitter)
          if(fICountFoot[fCarlosId]==3){
            fCompletedModule=kTRUE;
+           fCompletedDDL=kFALSE;
            return kTRUE;
          }
        } else if(fData==0x3F1F1F1F){ // CarlosRX footer
@@ -202,6 +243,8 @@ Bool_t AliITSRawStreamSDD::Next()
          fCoord1 = fAnode[fCarlosId][fChannel];
          fCoord2 = fTimeBin[fCarlosId][fChannel];
          fTimeBin[fCarlosId][fChannel]++;
+         fCompletedModule=kFALSE;
+         fCompletedDDL=kFALSE;
          return kTRUE;
        }
       }