Obsolete.

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

diff --git a/ITS/AliITSRawStreamSDD.cxx b/ITS/AliITSRawStreamSDD.cxx
index fefd3a21c69c980846d74fdcd67b4207558b658f..f8b202a185bb0412525139137a975d0b35b792ef 100644 (file)
--- a/ITS/AliITSRawStreamSDD.cxx
+++ b/ITS/AliITSRawStreamSDD.cxx
@@ -34,23 +34,21 @@ AliITSRawStreamSDD::AliITSRawStreamSDD(AliRawReader* rawReader) :
   AliITSRawStream(rawReader),
 fDDLModuleMap(0),
 fData(0),
+fResetSkip(kTRUE),
 fEventId(0),
 fCarlosId(-1),
 fChannel(0),
 fJitter(0),
-fDDL(0),
-fResetSkip(0)
+fEightBitSignal(0),
+fDecompressAmbra(kTRUE)
 {
 // create an object to read ITS SDD raw digits
-  fDDLModuleMap=new AliITSDDLModuleMapSDD();
-  fDDLModuleMap->SetDefaultMap();
   Reset();
   for(Int_t im=0;im<kSDDModules;im++){
     fLowThresholdArray[im][0]=0;
     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");
 
@@ -63,12 +61,13 @@ AliITSRawStreamSDD::AliITSRawStreamSDD(const AliITSRawStreamSDD& rs) :
 AliITSRawStream(rs.fRawReader),
 fDDLModuleMap(rs.fDDLModuleMap),
 fData(0),
+fResetSkip(kTRUE),
 fEventId(0),
 fCarlosId(-1),
 fChannel(0),
 fJitter(0),
-fDDL(0),
-fResetSkip(0)
+fEightBitSignal(0),
+fDecompressAmbra(kTRUE)
 {
   // copy constructor
   AliError("Copy constructor should not be used.");
@@ -117,34 +116,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;
-  fDDL=fRawReader->GetDDLID();
   fCompletedModule=kFALSE;
 
   while (kTRUE) {
-    if(fResetSkip==0){
+    if(fResetSkip){
+      Reset();
       Bool_t kSkip = SkipHeaderWord();
-      fResetSkip=1;
-      if(!kSkip) return kSkip;
+      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
 
-      Int_t ddln = fRawReader->GetDDLID();
-      if(ddln!=fDDL) {
-       Reset();
-       fDDL=fRawReader->GetDDLID();
-      }
 
-      fChannel = -1;
       if((fData >> 16) == 0x7F00){ // jitter word
-       fResetSkip=0;
-       continue;
-      }
+       fJitter = fData&0x000000ff;
+       fResetSkip=kTRUE;
+       fCompletedModule=kFALSE;
+       fCompletedDDL=kTRUE;
+       return kTRUE;
+       }
 
       UInt_t nData28= fData >> 28;
       UInt_t nData30= fData >> 30;
@@ -163,7 +159,7 @@ Bool_t AliITSRawStreamSDD::Next()
          fICountFoot[fCarlosId]++; // stop before the last word (last word=jitter)
          if(fICountFoot[fCarlosId]==3){
            fCompletedModule=kTRUE;
-           //        printf("Completed module %d DDL %d\n",fCarlosId,fDDL);
+           fCompletedDDL=kFALSE;
            return kTRUE;
          }
        } else if(fData==0x3F1F1F1F){ // CarlosRX footer
@@ -182,12 +178,13 @@ Bool_t AliITSRawStreamSDD::Next()
        // JTAG word -- do nothing
       } else {                               // unknown data format
        fRawReader->AddMajorErrorLog(kDataFormatErr,Form("Invalid data %8.8x",fData));
-       AliWarning(Form("Invalid data: %8.8x\n", fData));
+       AliWarning(Form("Invalid data: %08X\n", fData));
        return kFALSE;
       }
       
       if(fCarlosId>=0 && fCarlosId <kModulesPerDDL){
-        fModuleID = GetModuleNumber(fDDL,fCarlosId);
+       Int_t nDDL=fRawReader->GetDDLID();
+       fModuleID = GetModuleNumber(nDDL,fCarlosId);
       }
     } else {  // decode data
       if (fReadCode[fCarlosId][fChannel]) {// read the next code word
@@ -204,11 +201,13 @@ Bool_t AliITSRawStreamSDD::Next()
          fTimeBin[fCarlosId][fChannel] = 0;
          fAnode[fCarlosId][fChannel]++;
        } else {                                   // ADC signal data
-         fSignal = DecompAmbra(data + (1 << fChannelCode[fCarlosId][fChannel]) + fLowThresholdArray[fModuleID-kSPDModules][fChannel]);
+         fEightBitSignal=data + (1 << fChannelCode[fCarlosId][fChannel]);
+         if(fDecompressAmbra) fSignal = DecompAmbra(fEightBitSignal + fLowThresholdArray[fModuleID-kSPDModules][fChannel]);
          fCoord1 = fAnode[fCarlosId][fChannel];
          fCoord2 = fTimeBin[fCarlosId][fChannel];
          fTimeBin[fCarlosId][fChannel]++;
-         //printf("Data read, Module=%d , Anode=%d , Time=%d , Charge=%d\n",fModuleID,fCoord1,fCoord2,fSignal);
+         fCompletedModule=kFALSE;
+         fCompletedDDL=kFALSE;
          return kTRUE;
        }
       }
@@ -230,9 +229,9 @@ void AliITSRawStreamSDD::Reset(){
       fReadBits[ic][i]=3;
       fTimeBin[ic][i]=0;
       fAnode[ic][i]=0;     
+      fICountFoot[ic]=0;
     }
   }
-  for(Int_t i=0;i<kModulesPerDDL;i++) fICountFoot[i]=0;
 }
 
 //______________________________________________________________________