X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=ITS%2FAliITSRawStreamSDD.cxx;h=379153fadd8193dd46ca55b69e1b468e0ee965fd;hb=8c6eca17220c0c79fcbc9e9671467dcae55db898;hp=75f2e8136bade331cc11a95a916611a7762be626;hpb=720d923af2952a15e0ee79e8b6d62ea8d6442999;p=u%2Fmrichter%2FAliRoot.git

diff --git a/ITS/AliITSRawStreamSDD.cxx b/ITS/AliITSRawStreamSDD.cxx
index 75f2e8136ba..379153fadd8 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"
 
@@ -34,6 +35,7 @@ AliITSRawStreamSDD::AliITSRawStreamSDD(AliRawReader* rawReader) :
   AliITSRawStream(rawReader),
 fDDLModuleMap(0),
 fData(0),
+fResetSkip(kTRUE),
 fEventId(0),
 fCarlosId(-1),
 fChannel(0),
@@ -48,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");
 
@@ -61,6 +62,7 @@ AliITSRawStreamSDD::AliITSRawStreamSDD(const AliITSRawStreamSDD& rs) :
 AliITSRawStream(rs.fRawReader),
 fDDLModuleMap(rs.fDDLModuleMap),
 fData(0),
+fResetSkip(kTRUE),
 fEventId(0),
 fCarlosId(-1),
 fChannel(0),
@@ -84,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
@@ -101,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);
   }
   
@@ -115,24 +153,31 @@ 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;
 
   while (kTRUE) {
-  
+    if(fResetSkip){
+      Reset();
+      Bool_t kSkip = SkipHeaderWord();
+      if(!kSkip) return kSkip;	
+      fResetSkip=kFALSE;
+    }
     if ((fChannel < 0) || (fCarlosId < 0) || (fChannel >= 2) || (fCarlosId >= kModulesPerDDL) || (fLastBit[fCarlosId][fChannel] < fReadBits[fCarlosId][fChannel]) ) {
       if (!fRawReader->ReadNextInt(fData)) return kFALSE;  // read next word
 
 
       if((fData >> 16) == 0x7F00){ // jitter word
-	Reset();
-	Bool_t kSkip = SkipHeaderWord();
-	if(!kSkip) return kSkip;	
-	continue;
-      }
+	fJitter = fData&0x000000ff;
+	fResetSkip=kTRUE;
+	fCompletedModule=kFALSE;
+	fCompletedDDL=kTRUE;
+	return kTRUE;
+       }
 
       UInt_t nData28= fData >> 28;
       UInt_t nData30= fData >> 30;
@@ -151,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
@@ -197,6 +243,8 @@ Bool_t AliITSRawStreamSDD::Next()
 	  fCoord1 = fAnode[fCarlosId][fChannel];
 	  fCoord2 = fTimeBin[fCarlosId][fChannel];
 	  fTimeBin[fCarlosId][fChannel]++;
+	  fCompletedModule=kFALSE;
+	  fCompletedDDL=kFALSE;
 	  return kTRUE;
 	}
       }