]> git.uio.no Git - u/mrichter/AliRoot.git/blobdiff - PMD/AliPMDDDLRawData.cxx
AliTPCclustererKr.h -
[u/mrichter/AliRoot.git] / PMD / AliPMDDDLRawData.cxx
index 2ff1de970b15c322c695e3f7b7028870f3bc786b..6b037d5d141b1e3ac0ae08cb2fafb3366eff1a59 100644 (file)
 #include <TSystem.h>
 
 #include "AliLog.h"
-#include "AliRawDataHeader.h"
+#include "AliRawDataHeaderSim.h"
 #include "AliBitPacking.h"
 #include "AliPMDdigit.h"
+#include "AliPMDBlockHeader.h"
+#include "AliPMDDspHeader.h"
+#include "AliPMDPatchBusHeader.h"
 #include "AliPMDRawStream.h"
 #include "AliPMDDDLRawData.h"
 #include "AliDAQ.h"
+#include "AliFstream.h"
 
 ClassImp(AliPMDDDLRawData)
 
@@ -55,7 +59,6 @@ AliPMDDDLRawData & AliPMDDDLRawData::operator=(const AliPMDDDLRawData& ddlraw)
     }
   return *this;
 }
-
 //____________________________________________________________________________
 
 AliPMDDDLRawData::~AliPMDDDLRawData()
@@ -70,7 +73,7 @@ void AliPMDDDLRawData::WritePMDRawData(TTree *treeD)
 {
   // write digits into raw data format
 
-  ofstream outfile;
+  AliFstream *outfile;
 
   TBranch *branch = treeD->GetBranch("PMDDigit");
   if (!branch)
@@ -87,15 +90,16 @@ void AliPMDDDLRawData::WritePMDRawData(TTree *treeD)
   Int_t modulePerDDL        = 0;
 
 
-  AliRawDataHeader header;
+  AliRawDataHeaderSim header;
   UInt_t sizeRawData = 0;
   
+  const Int_t kbusSize = 51;
   const Int_t kSize = 1536;
   UInt_t buffer[kSize];
 
-  UInt_t busPatch[50][1536];
+  UInt_t busPatch[kbusSize][1536];
 
-  Int_t contentsBus[50];
+  Int_t contentsBus[kbusSize];
 
   Char_t filename[80];
 
@@ -104,11 +108,8 @@ void AliPMDDDLRawData::WritePMDRawData(TTree *treeD)
   for(Int_t iddl = 0; iddl < kDDL; iddl++)
     {
       strcpy(filename,AliDAQ::DdlFileName("PMD",iddl));
-#ifndef __DECCXX
-      outfile.open(filename,ios::binary);
-#else
-      outfile.open(filename);
-#endif
+      
+      outfile = new AliFstream(filename);
       
       if (iddl < 4)
        {
@@ -129,13 +130,13 @@ void AliPMDDDLRawData::WritePMDRawData(TTree *treeD)
 
 
       // Write the Dummy Data Header into the file
-      Int_t bHPosition = outfile.tellp();
-      outfile.write((char*)(&header),sizeof(header));
+      Int_t bHPosition = outfile->Tellp();
+      outfile->WriteBuffer((char*)(&header),sizeof(header));
 
-      for (Int_t ibus = 0; ibus < 50; ibus++)
+      for (Int_t ibus = 0; ibus < kbusSize; ibus++)
        {
          contentsBus[ibus] = 0;
-         for (Int_t ich = 0; ich < 1536; ich++)
+         for (Int_t ich = 0; ich < kSize; ich++)
            {
              busPatch[ibus][ich] = 0;
            }
@@ -164,20 +165,21 @@ void AliPMDDDLRawData::WritePMDRawData(TTree *treeD)
          dspBus[i] = 0;
          for (Int_t ibus=0; ibus < 5; ibus++)
            {
+             ij++;
              if (contentsBus[ij] > 0)
                {
                  dsp[i] += contentsBus[ij];
                  dspBus[i]++;
                }
-             ij++;
+             //ij++;
            }
          // Add the patch Bus header to the DSP contents
          dsp[i] += 4*dspBus[i];
        }
 
-      Int_t dspBlockARDL = 0;
-      Int_t dspBlockBRDL = 0;
-      
+      Int_t dspBlockARDL    = 0;
+      Int_t dspBlockBRDL    = 0;
+
       for (Int_t i = 0; i < 5; i++)
        {
          Int_t ieven = 2*i;
@@ -185,43 +187,60 @@ void AliPMDDDLRawData::WritePMDRawData(TTree *treeD)
          if (dsp[ieven] > 0)
            {
              dspBlockARDL += dsp[ieven];
-             dspBlockARDL += 8;
+             Int_t remainder = dsp[ieven]%2;
+             if (remainder == 1)
+               {
+                 dspBlockARDL++;
+               }
            }
          if (dsp[iodd] > 0)
            {
              dspBlockBRDL += dsp[iodd];
-             dspBlockBRDL += 8;
+             Int_t remainder = dsp[ieven]%2;
+             if (remainder == 1)
+               {
+                 dspBlockARDL++;
+               }
            }
        }
       
       // Start writing the DDL file
+
+      AliPMDBlockHeader blHeader;
+      AliPMDDspHeader   dspHeader;
+      AliPMDPatchBusHeader pbusHeader;
+
+      const Int_t kblHLen   = blHeader.GetHeaderLength();
+      const Int_t kdspHLen  = dspHeader.GetHeaderLength();
+      const Int_t kpbusHLen = pbusHeader.GetHeaderLength();
+
       UInt_t dspRDL = 0;
-      UInt_t dspBlockHeader[8];
-      UInt_t dspHeader[8];
-      UInt_t patchBusHeader[4];
-      Int_t iskip[5];
+      UInt_t dspBlockHeaderWord[8];
+      UInt_t dspHeaderWord[10];
+      UInt_t patchBusHeaderWord[4];
+      Int_t  iskip[5];
+
 
       for (Int_t iblock = 0; iblock < 2; iblock++)
        {
          // DSP Block Header
          
-         for (Int_t i=0; i<8; i++)
+         for (Int_t i=0; i<kblHLen; i++)
            {
-             dspBlockHeader[i] = 0;
-             if (i == 1)
-               {
-                 if (iblock == 0)
-                   {
-                     dspBlockHeader[1] = (UInt_t) dspBlockARDL;
-                   }
-                 else if (iblock == 1)
-                   {
-                     dspBlockHeader[1] = (UInt_t) dspBlockBRDL;
-                   }
-               }
+             dspBlockHeaderWord[i] = 0;
+           }
+         if (iblock == 0)
+           {
+             dspBlockHeaderWord[1] = (UInt_t) (dspBlockARDL + kblHLen);
+             dspBlockHeaderWord[2] = (UInt_t) dspBlockARDL;
+           }
+         else if (iblock == 1)
+           {
+             dspBlockHeaderWord[1] = (UInt_t) (dspBlockBRDL + kblHLen);
+             dspBlockHeaderWord[2] = (UInt_t) dspBlockBRDL;
            }
 
-         outfile.write((char*)(&dspBlockHeader),8*sizeof(UInt_t));
+         outfile->WriteBuffer((char*)dspBlockHeaderWord,kblHLen*sizeof(UInt_t));
 
          if (iblock == 0)
            {
@@ -255,55 +274,78 @@ void AliPMDDDLRawData::WritePMDRawData(TTree *treeD)
                  dspRDL = (UInt_t) dsp[dspno];
                }
 
-             for (Int_t i=0; i<8; i++)
+             for (Int_t i=0; i<kdspHLen; i++)
                {
-                 dspHeader[i] = 0;
+                 dspHeaderWord[i] = 0;
                }
-             dspHeader[1] = dspRDL;
-             dspHeader[6] = dspno;
-             outfile.write((char*)(&dspHeader),8*sizeof(UInt_t));
-             
+             Int_t remainder = dspRDL%2;
+             if (remainder == 1) dspRDL++;
+
+             dspHeaderWord[1] = dspRDL + kdspHLen;
+             dspHeaderWord[2] = dspRDL;
+             dspHeaderWord[3] = dspno;
+             if (remainder == 1) dspHeaderWord[8] = 1; // setting the padding word
+             outfile->WriteBuffer((char*)dspHeaderWord,kdspHLen*sizeof(UInt_t));
+
              for (Int_t ibus = 0; ibus < 5; ibus++)
                {
                  // Patch Bus Header
-                 Int_t busno = iskip[idsp] + ibus;
+                 // BKN - just added 1
+                 Int_t busno = iskip[idsp] + ibus + 1;
                  Int_t patchbusRDL = contentsBus[busno];
-                 
-                 for (Int_t i=0; i<4; i++)
+
+                 if (patchbusRDL > 0)
                    {
-                     patchBusHeader[i] = 0;
+                     patchBusHeaderWord[0] = 0;
+                     patchBusHeaderWord[1] = (UInt_t) (patchbusRDL + kpbusHLen);
+                     patchBusHeaderWord[2] = (UInt_t) patchbusRDL;
+                     patchBusHeaderWord[3] = (UInt_t) busno;
                    }
-                 patchBusHeader[1] = (UInt_t) patchbusRDL;
-                 patchBusHeader[2] = (UInt_t) busno;
+                 else if (patchbusRDL == 0)
+                   {
+                     patchBusHeaderWord[0] = 0;
+                     patchBusHeaderWord[1] = (UInt_t) kpbusHLen;
+                     patchBusHeaderWord[2] = (UInt_t) 0;
+                     patchBusHeaderWord[3] = (UInt_t) busno;
+                   }
+
+
+                 outfile->WriteBuffer((char*)patchBusHeaderWord,4*sizeof(UInt_t));
 
-                 outfile.write((char*)(&patchBusHeader),4*sizeof(UInt_t));
 
                  for (Int_t iword = 0; iword < patchbusRDL; iword++)
                    {
                      buffer[iword] = busPatch[busno][iword];
                    }
                  
-                 outfile.write((char*)buffer,patchbusRDL*sizeof(UInt_t));
-                 
+                 outfile->WriteBuffer((char*)buffer,patchbusRDL*sizeof(UInt_t));
+
+               } // End of patch bus loop
+
+
+             // Adding a padding word if the total words odd
+             if (remainder == 1)
+               {
+                 UInt_t paddingWord = dspHeader.GetDefaultPaddingWord();
+                 outfile->WriteBuffer((char*)(&paddingWord),sizeof(UInt_t));
                }
            }
        }
-      
-      
+
       // Write real data header
       // take the pointer to the beginning of the data header
       // write the total number of words per ddl and bring the
       // pointer to the current file position and close it
-      UInt_t cFPosition = outfile.tellp();
+      UInt_t cFPosition = outfile->Tellp();
       sizeRawData = cFPosition - bHPosition - sizeof(header);
 
       header.fSize = cFPosition - bHPosition;
       header.SetAttribute(0);  // valid data
-      outfile.seekp(bHPosition);
-      outfile.write((char*)(&header),sizeof(header));
-      outfile.seekp(cFPosition);
+      outfile->Seekp(bHPosition);
+      outfile->WriteBuffer((char*)(&header),sizeof(header));
+      outfile->Seekp(cFPosition);
 
-      outfile.close();
+      delete outfile;
     } // DDL Loop over
 
 
@@ -314,12 +356,14 @@ void AliPMDDDLRawData::GetUMDigitsData(TTree *treeD, Int_t imodule,
                                       UInt_t busPatch[][1536])
 {
   // Retrives digits data UnitModule by UnitModule
+
   UInt_t baseword;
   UInt_t mcmno, chno;
   UInt_t adc;
   Int_t  det, smn, irow, icol;
-
-  const Int_t kMaxBus = 50;
+  Int_t  parity;
+  
+  const Int_t kMaxBus = 51;   // BKN
   Int_t totPatchBus, bPatchBus, ePatchBus;
   Int_t ibus, totmcm, rows, cols, rowe, cole;
   Int_t moduleno;
@@ -349,10 +393,6 @@ void AliPMDDDLRawData::GetUMDigitsData(TTree *treeD, Int_t imodule,
       modulePerDDL = 12;
     }
 
-
-
-
-
   TString fileName(gSystem->Getenv("ALICE_ROOT"));
 
   if(ddlno == 0)
@@ -419,22 +459,21 @@ void AliPMDDDLRawData::GetUMDigitsData(TTree *treeD, Int_t imodule,
   Int_t nentries = fDigits->GetLast();
   Int_t totword = nentries+1;
 
-  AliPMDdigit *fPMDdigit;
-
+  AliPMDdigit *pmddigit;
 
   for (Int_t ient = 0; ient < totword; ient++)
     {
-      fPMDdigit = (AliPMDdigit*)fDigits->UncheckedAt(ient);
+      pmddigit = (AliPMDdigit*)fDigits->UncheckedAt(ient);
       
-      det    = fPMDdigit->GetDetector();
-      smn    = fPMDdigit->GetSMNumber();
-      irow   = fPMDdigit->GetRow();
-      icol   = fPMDdigit->GetColumn();
-      adc    = (UInt_t) fPMDdigit->GetADC();
+      det    = pmddigit->GetDetector();
+      smn    = pmddigit->GetSMNumber();
+      irow   = pmddigit->GetRow();
+      icol   = pmddigit->GetColumn();
+      adc    = (UInt_t) pmddigit->GetADC();
 
       TransformS2H(smn,irow,icol);
 
-      GetMCMCh(ddlno, irow, icol, beginPatchBus, endPatchBus,
+      GetMCMCh(ddlno, smn, irow, icol, beginPatchBus, endPatchBus,
               mcmperBus, startRowBus, startColBus,
               endRowBus, endColBus, busno, mcmno, chno);
 
@@ -443,7 +482,8 @@ void AliPMDDDLRawData::GetUMDigitsData(TTree *treeD, Int_t imodule,
       AliBitPacking::PackWord(chno,baseword,12,17);
       AliBitPacking::PackWord(mcmno,baseword,18,28);
       AliBitPacking::PackWord(0,baseword,29,30);
-      AliBitPacking::PackWord(1,baseword,31,31);
+      parity = ComputeParity(baseword);      // generate the parity bit
+      AliBitPacking::PackWord(parity,baseword,31,31);
 
       Int_t jj = contentsBus[busno];
       busPatch[busno][jj] = baseword;
@@ -477,9 +517,6 @@ void AliPMDDDLRawData::TransformS2H(Int_t smn, Int_t &irow, Int_t &icol)
       icolnew = icol;
     }
 
-  // In the new geometry always Geant (0,0) and Hardware (0,0) start
-  // from the top left corner
-
   irow = irownew;
   icol = icolnew;
 
@@ -488,39 +525,148 @@ void AliPMDDDLRawData::TransformS2H(Int_t smn, Int_t &irow, Int_t &icol)
 
 //____________________________________________________________________________
 
-void AliPMDDDLRawData::GetMCMCh(Int_t ddlno, Int_t row, Int_t col,
+void AliPMDDDLRawData::GetMCMCh(Int_t ddlno, Int_t smn, Int_t row, Int_t col,
                                Int_t beginPatchBus, Int_t endPatchBus,
                                Int_t *mcmperBus,
                                Int_t *startRowBus, Int_t *startColBus,
                                Int_t *endRowBus, Int_t *endColBus,
                                Int_t & busno, UInt_t &mcmno, UInt_t &chno)
 {
-  // This part will be modified once the final track layout on the PCB is
-  // designed. This will only change the coordinate of the individual cell
-
-  static const UInt_t kCh[16][4] = { {12, 13, 18, 19},
-                                    {11, 15, 17, 21},
-                                    {10, 14, 16, 22},
-                                    {8, 9, 20, 23},
-                                    {7, 4, 25, 24},
-                                    {6, 0, 30, 26},
-                                    {5, 1, 31, 27},
-                                    {3, 2, 29, 28},
-                                    {44, 45, 50, 51},
-                                    {43, 47, 49, 53},
-                                    {42, 46, 48, 54},
-                                    {40, 41, 52, 55},
-                                    {39, 36, 57, 56},
-                                    {38, 32, 62, 58},
-                                    {37, 33, 63, 59},
-                                    {35, 34, 61, 60} };
-  
+  // This converts row col to hardware channel number
+  // This is the final version of mapping supplied by Mriganka
+
+    UInt_t iCh[16][4];
+
+    static const UInt_t kChDdl01[16][4] = { {6, 4, 5, 7},
+                                          {10, 2, 1, 9},
+                                          {12, 0, 3, 11},
+                                          {14, 8, 13, 15},
+                                          {16, 18, 23, 17},
+                                          {20, 28, 31, 19},
+                                          {22, 30, 29, 21},
+                                          {24, 26, 27, 25},
+                                          {38, 36, 37, 39},
+                                          {42, 34, 33, 41},
+                                          {44, 32, 35, 43},
+                                          {46, 40, 45, 47},
+                                          {48, 50, 55, 49},
+                                          {52, 60, 63, 51},
+                                          {54, 62, 61, 53},
+                                          {56, 58, 59, 57} };
+
+
+    static const UInt_t kChDdl23[16][4] = { {57, 59, 58, 56},
+                                           {53, 61, 62, 54},
+                                           {51, 63, 60, 52},
+                                           {49, 55, 50, 48},
+                                           {47, 45, 40, 46},
+                                           {43, 35, 32, 44},
+                                           {41, 33, 34, 42},
+                                           {39, 37, 36, 38},
+                                           {25, 27, 26, 24},
+                                           {21, 29, 30, 22},
+                                           {19, 31, 28, 20},
+                                           {17, 23, 18, 16},
+                                           {15, 13, 8, 14},
+                                           {11, 3, 0, 12},
+                                           {9, 1, 2, 10},
+                                           {7, 5, 4, 6} };
+    
+    
+    static const UInt_t kChDdl41[16][4] = { {56, 58, 59, 57},
+                                          {54, 62, 61, 53},
+                                          {52, 60, 63, 51},
+                                          {48, 50, 55, 49},
+                                          {46, 40, 45, 47},
+                                          {44, 32, 35, 43},
+                                          {42, 34, 33, 41},
+                                          {38, 36, 37, 39},
+                                          {24, 26, 27, 25},
+                                          {22, 30, 29, 21},
+                                          {20, 28, 31, 19},
+                                          {16, 18, 23, 17},
+                                          {14, 8, 13, 15},
+                                          {12, 0, 3, 11},
+                                          {10, 2, 1, 9},
+                                          {6, 4, 5, 7} };
+
+
+    static const UInt_t kChDdl42[16][4] = { {7, 5, 4, 6},
+                                           {9, 1, 2, 10},
+                                           {11, 3, 0, 12},
+                                           {15, 13, 8, 14},
+                                           {17, 23, 18, 16},
+                                           {19, 31, 28, 20},
+                                           {21, 29, 30, 22},
+                                           {25, 27, 26, 24},
+                                           {39, 37, 36, 38},
+                                           {41, 33, 34, 42},
+                                           {43, 35, 32, 44},
+                                           {47, 45, 40, 46},
+                                           {49, 55, 50, 48},
+                                           {51, 63, 60, 52},
+                                           {53, 61, 62, 54},
+                                           {57, 59, 58, 56} };
+
+
+    static const UInt_t kChDdl51[16][4] = { {7, 5, 4, 6},
+                                           {9, 1, 2, 10},
+                                           {11, 3, 0, 12},
+                                           {15, 13, 8, 14},
+                                           {17, 23, 18, 16},
+                                           {19, 31, 28, 20},
+                                           {21, 29, 30, 22},
+                                           {25, 27, 26, 24},
+                                           {39, 37, 36, 38},
+                                           {41, 33, 34, 42},
+                                           {43, 35, 32, 44},
+                                           {47, 45, 40, 46},
+                                           {49, 55, 50, 48},
+                                           {51, 63, 60, 52},
+                                           {53, 61, 62, 54},
+                                           {57, 59, 58, 56} };
+    
+
+
+    static const UInt_t kChDdl52[16][4] = { {56, 58, 59, 57},
+                                           {54, 62, 61, 53},
+                                           {52, 60, 63, 51},
+                                           {48, 50, 55, 49},
+                                           {46, 40, 45, 47},
+                                           {44, 32, 35, 43},
+                                           {42, 34, 33, 41},
+                                           {38, 36, 37, 39},
+                                           {24, 26, 27, 25},
+                                           {22, 30, 29, 21},
+                                           {20, 28, 31, 19},
+                                           {16, 18, 23, 17},
+                                           {14, 8, 13, 15},
+                                           {12, 0, 3, 11},
+                                           {10, 2, 1, 9},
+                                           {6, 4, 5, 7} };
+    
+    
+    for (Int_t i = 0; i < 16; i++)
+    {
+       for (Int_t j = 0; j < 4; j++)
+       {
+           if (ddlno == 0 || ddlno == 1) iCh[i][j] = kChDdl01[i][j];
+           if (ddlno == 2 || ddlno == 3) iCh[i][j] = kChDdl23[i][j];
+           
+           if (ddlno == 4 && smn < 6)                iCh[i][j] = kChDdl41[i][j];
+           if (ddlno == 4 && (smn >= 18 && smn < 24))iCh[i][j] = kChDdl42[i][j];
+           if (ddlno == 5 && (smn >= 12 && smn < 18))iCh[i][j] = kChDdl51[i][j];
+           if (ddlno == 5 && (smn >=  6 && smn < 12))iCh[i][j] = kChDdl52[i][j];
+       }
+    }
+
+
   Int_t irownew = row%16;
   Int_t icolnew = col%4;
   
-  chno  = kCh[irownew][icolnew];
-
-
+  chno  = iCh[irownew][icolnew];
+  
+  
   for (Int_t ibus = beginPatchBus; ibus <= endPatchBus; ibus++)
     {
       Int_t srow = startRowBus[ibus];
@@ -531,108 +677,117 @@ void AliPMDDDLRawData::GetMCMCh(Int_t ddlno, Int_t row, Int_t col,
       if ((row >= srow && row <= erow) && (col >= scol && col <= ecol))
        {
          busno = ibus;
-
+         
          // Find out the MCM Number
          //
-
+         
          if (ddlno == 0 || ddlno == 1)
            {
              // PRE plane, SU Mod = 0, 1
-             Int_t rowdiff = endRowBus[ibus] - startRowBus[ibus];
-             if(rowdiff > 16)
+             mcmno = (col-scol)/4 + 1;
+             
+           }
+         else if (ddlno == 2 || ddlno == 3)
+           {
+             // PRE plane,  SU Mod = 2, 3
+             icolnew = (col - scol)/4;
+             mcmno = tmcm - icolnew;
+           }
+         else if (ddlno == 4 )
+           {
+             // CPV plane,  SU Mod = 0, 3 : ddl = 4
+             
+             if(ibus <= 18)
                {
                  Int_t midrow = srow + 16;
                  if(row >= srow && row < midrow)
                    {
-                     mcmno = 12 + (col-scol)/4;
+                     mcmno = 12 + (col-scol)/4 + 1;
                    }
-                 else if(row >= midrow && row < erow)
+                 else if(row >= midrow && row <= erow)
+                 
                    {
-                     mcmno = (col-scol)/4;
+                     mcmno = (col-scol)/4 + 1;
                    }
                }
-             else
-               {
-                 mcmno = (col-scol)/4;
-               }
-           } // end of ddl 0 and 1
-         else if (ddlno == 2)
-           {
-             // PRE plane,  SU Mod = 2
-             
-             Int_t icolnew = (col - scol)/4;
-             mcmno = tmcm - 1 - icolnew;
-           }
-         else if (ddlno == 3)
-           {
-             // PRE plane,  SU Mod = 3
-             
-             Int_t icolnew = (col - scol)/4;
-             mcmno = tmcm - 1 - icolnew;
-           }
-         else if (ddlno == 4)
-           {
-             // CPV plane,  SU Mod = 0, 3 : ddl = 4
              
-             if(ibus <= 20)
+             else if (ibus > 18)
                {
                  Int_t rowdiff = endRowBus[ibus] - startRowBus[ibus];
                  if(rowdiff > 16)
                    {
                      Int_t midrow = srow + 16;
-                     if(row >= srow && row < midrow)
+                     if (row >= midrow && row <= erow)
                        {
-                         mcmno = 12 + (col-scol)/4;
+                         mcmno = 12 + (ecol -col)/4 + 1;
                        }
-                     else if(row >= midrow && row < erow)
+                     else if (row >= srow && row < midrow)
                        {
-                         mcmno = (col-scol)/4;
+                         mcmno = (ecol - col)/4 + 1;
                        }
                    }
-                 else
+                 else if (rowdiff < 16)
                    {
-                     mcmno = (col-scol)/4;
+                     mcmno = (ecol - col)/4 + 1;
                    }
                }
-             else if (ibus > 20)
-               {
-                 Int_t icolnew = (col - scol)/4;
-                 mcmno = tmcm - 1 - icolnew;
-               }
            }
-         else if (ddlno == 5)
+         else if ( ddlno == 5)
            {
-             // CPV plane,  SU Mod = 2, 1 : ddl = 5
+             // CPV plane,  SU Mod = 1, 2 : ddl = 5
+             
+             if(ibus <= 18)
+               {
+                 Int_t midrow = srow + 16;
+                 if(row >= srow && row < midrow)
+                   {
+                     mcmno = 12 + (col-scol)/4 + 1;
+                   }
+                 else if(row >= midrow && row <= erow)
+                   {
+                     mcmno = (col-scol)/4 + 1;
+                   }
+               }
              
-             if(ibus <= 20)
+             else if (ibus > 18)
                {
                  Int_t rowdiff = endRowBus[ibus] - startRowBus[ibus];
                  if(rowdiff > 16)
                    {
                      Int_t midrow = srow + 16;
-                     if(row >= srow && row < midrow)
+                     if (row >= midrow && row <= erow)
                        {
-                         mcmno = 12 + (col-scol)/4;
+                         mcmno = 12 + (ecol - col)/4 + 1;
                        }
-                     else if(row >= midrow && row < erow)
+                     else if (row >= srow && row < midrow)
                        {
-                         mcmno = (col-scol)/4;
+                         mcmno = (ecol - col)/4 + 1;
                        }
                    }
-                 else
+                 else if (rowdiff < 16)
                    {
-                     mcmno = (col-scol)/4;
+                     mcmno = (ecol - col)/4 + 1;
                    }
                }
-             else if (ibus > 20)
-               {
-                 Int_t icolnew = (col - scol)/4;
-                 mcmno = tmcm - 1 - icolnew;
-               }
            }
-       }  
+       }
     }
-  
-}
+} 
+
 //____________________________________________________________________________
 
+Int_t AliPMDDDLRawData::ComputeParity(UInt_t baseword)
+{
+  // Generate the parity bit
+
+  Int_t count = 0;
+  for(Int_t j=0; j<29; j++)
+    {
+      if (baseword & 0x01 ) count++;
+      baseword >>= 1;
+    }
+  Int_t parity = count%2;
+  return parity;
+}
+
+//____________________________________________________________________________