- AliITSInitGeometry.cxx (updated): fgkOldSSDcone changed from kTRUE to

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

diff --git a/ITS/AliITSDDLRawData.cxx b/ITS/AliITSDDLRawData.cxx
index 7a04db20ff774d0d1f2faf57e81207a753d1cc2d..11c460e906de2791884d2c3cd5224d87da3814f0 100644 (file)
--- a/ITS/AliITSDDLRawData.cxx
+++ b/ITS/AliITSDDLRawData.cxx
@@ -383,6 +383,7 @@ void AliITSDDLRawData::GetDigitsSPD(TClonesArray *ITSdigits,Int_t mod,Int_t ddl,
 
   Int_t chipLow  = AliITSRawStreamSPD::GetOnlineChipFromOffline(mod,0);
   Int_t chipHigh = AliITSRawStreamSPD::GetOnlineChipFromOffline(mod,159);
+
   if (chipLow>chipHigh) {chipLow  -= 4; chipHigh += 4;}
   UInt_t hs = AliITSRawStreamSPD::GetOnlineHSFromOffline(mod);
 
@@ -417,7 +418,7 @@ void AliITSDDLRawData::GetDigitsSPD(TClonesArray *ITSdigits,Int_t mod,Int_t ddl,
 
       //  insert digit into map...
       // (reverse order of cols and rows as in real raw data)
-      digMap->Insert(chip*256*32+(32-col)*256+(256-row),row);
+      digMap->Insert(chip*256*32+(31-col)*256+(255-row),row);
     }
   }
 
@@ -427,7 +428,7 @@ void AliITSDDLRawData::GetDigitsSPD(TClonesArray *ITSdigits,Int_t mod,Int_t ddl,
     for (UInt_t nHit=0; nHit<nrHits; nHit++) {
       Int_t key = digMap->GetKeyIndex(nHit);
       chip = key/(256*32);
-      Int_t col = 32 - (key%(256*32))/256;
+      Int_t col = 31 - (key%(256*32))/256;
       Int_t row = digMap->GetValIndex(nHit);
 
       if(previousChip==-1) { // first hit
@@ -510,7 +511,7 @@ Int_t AliITSDDLRawData::RawDataSPD(TBranch* branch){
       branch->GetEvent(moduleNumber);
       //For each Module, buf contains the array of data words in Binary format   
       //fIndex gives the number of 32 bits words in the buffer for each module
-      GetDigitsSPD(digits,mod,i,buf);
+      GetDigitsSPD(digits,moduleNumber,i,buf);
       outfile->WriteBuffer((char *)buf,((fIndex+1)*sizeof(UInt_t)));
       for(Int_t i=0;i<(fIndex+1);i++){
        buf[i]=0;