X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=ITS%2FAliITSRawStreamSDD.cxx;h=1cf27439a1cfd07fddab35f3860c67073309b644;hb=13c9b3a4ac7dbb031cd41bef49a3ad8fcad748ee;hp=2682d00c2e70ff535f809dc452b5dcf2d72efdaf;hpb=0b4ad9b0d6cebd4360af1f6e92e074342211f495;p=u%2Fmrichter%2FAliRoot.git

diff --git a/ITS/AliITSRawStreamSDD.cxx b/ITS/AliITSRawStreamSDD.cxx
index 2682d00c2e7..1cf27439a1c 100644
--- a/ITS/AliITSRawStreamSDD.cxx
+++ b/ITS/AliITSRawStreamSDD.cxx
@@ -22,6 +22,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 #include "AliITSRawStreamSDD.h"
+#include "AliITSRawStreamSDDCompressed.h"
 #include "AliRawReader.h"
 #include "AliLog.h"
 
@@ -85,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
@@ -158,7 +192,7 @@ Bool_t AliITSRawStreamSDD::Next()
 	  fNfifo[iFifoIdx] = fCarlosId;
 	} else if (fData>=fIFifoWord[0]&&fData<=fIFifoWord[3]){ // FIFO word
 	  fCarlosId = fNfifo[fData-fIFifoWord[0]];	    
-	} else if(fData==0x3FFFFFFF){ // Carlos footer
+	} else if(fData==0x3FFFFFFF && fCarlosId>=0 && fCarlosId<kModulesPerDDL){ // Carlos footer
 	  fICountFoot[fCarlosId]++; // stop before the last word (last word=jitter)
 	  if(fICountFoot[fCarlosId]==3){
 	    fCompletedModule=kTRUE;
@@ -174,9 +208,11 @@ Bool_t AliITSRawStreamSDD::Next()
 	}
       } else if (nData30 == 0x02 || nData30 == 0x03) {
 	fChannel = nData30-2;
-	fChannelData[fCarlosId][fChannel] += 
-	  (ULong64_t(fData & 0x3FFFFFFF) << fLastBit[fCarlosId][fChannel]);
-	fLastBit[fCarlosId][fChannel] += 30;
+	if(fCarlosId>=0 && fCarlosId<kModulesPerDDL){
+	  fChannelData[fCarlosId][fChannel] += 
+	    (ULong64_t(fData & 0x3FFFFFFF) << fLastBit[fCarlosId][fChannel]);
+	  fLastBit[fCarlosId][fChannel] += 30;
+	}
       } else if (nData28== 0x04) {
 	// JTAG word -- do nothing
       } else {                               // unknown data format
@@ -187,7 +223,9 @@ Bool_t AliITSRawStreamSDD::Next()
       
       if(fCarlosId>=0 && fCarlosId <kModulesPerDDL){
 	Int_t nDDL=fRawReader->GetDDLID();
-	fModuleID = GetModuleNumber(nDDL,fCarlosId);
+	if(nDDL>=0){
+	  fModuleID = GetModuleNumber(nDDL,fCarlosId);
+	}
       }
     } else {  // decode data
       if (fReadCode[fCarlosId][fChannel]) {// read the next code word