If default parameters are allowed and runNumber is provided, search first for the...

[u/mrichter/AliRoot.git] / PMD / AliPMDDDLRawData.cxx

diff --git a/PMD/AliPMDDDLRawData.cxx b/PMD/AliPMDDDLRawData.cxx
index 5769d7d0a8abce4c1b772eafb1b7e73b740a090e..faca049fd0debbf11ca96ceed6b59c381c5121fe 100644 (file)
--- a/PMD/AliPMDDDLRawData.cxx
+++ b/PMD/AliPMDDDLRawData.cxx
@@ -111,7 +111,7 @@ void AliPMDDDLRawData::WritePMDRawData(TTree *treeD)
 
   Int_t contentsBus[kbusSize];
 
-  Char_t filename[60];
+  Char_t filename[80];
 
   Int_t modulePerDDL        = 0;
   Int_t mmodule = 0;
@@ -128,7 +128,7 @@ void AliPMDDDLRawData::WritePMDRawData(TTree *treeD)
          modulenoddl[im] = fDdlinfo->GetModulesPerDdl(iddl,im);;
        }
 
-      strncpy(filename,AliDAQ::DdlFileName("PMD",iddl),60);
+      strncpy(filename,AliDAQ::DdlFileName("PMD",iddl),79);
       
       outfile = new AliFstream(filename);
       
@@ -225,9 +225,6 @@ void AliPMDDDLRawData::WritePMDRawData(TTree *treeD)
       Int_t  iskip[5];
       UInt_t ddlEndWord[2] = {0xDEADFACE, 0xDEADFACE};
 
-      Int_t bknJunk = 0;
-
-
       for (Int_t iblock = 0; iblock < 2; iblock++)
        {
          // DSP Block Header
@@ -321,8 +318,6 @@ void AliPMDDDLRawData::WritePMDRawData(TTree *treeD)
 
                  outfile->WriteBuffer((char*)patchBusHeaderWord,4*sizeof(UInt_t));
 
-                 bknJunk += patchbusRDL;
-
                  for (Int_t iword = 0; iword < patchbusRDL; iword++)
                    {
                      buffer[iword] = busPatch[busno][iword];
@@ -376,11 +371,8 @@ void AliPMDDDLRawData::GetUMDigitsData(TTree *treeD, Int_t imodule,
   UInt_t mcmno = 0, chno = 0;
   UInt_t adc = 0;
   Int_t  det = 0, smn = 0, irow = 0, icol = 0;
-  Int_t  parity = 0;
+  UInt_t  parity = 0;
   
-  //  Int_t totPatchBus = 0, bPatchBus = 0, ePatchBus = 0;
-  //  Int_t ibus = 0, totmcm = 0, rows = 0, cols = 0, rowe = 0, cole = 0;
-  //  Int_t moduleno = 0;
   Int_t busno = 0;
   Int_t patchBusNo[kMaxBus], mcmperBus[kMaxBus];
   Int_t startRowBus[kMaxBus], startColBus[kMaxBus];
@@ -440,7 +432,9 @@ void AliPMDDDLRawData::GetUMDigitsData(TTree *treeD, Int_t imodule,
       smn    = pmddigit->GetSMNumber();
       irow   = pmddigit->GetRow();
       icol   = pmddigit->GetColumn();
-      adc    = (UInt_t) pmddigit->GetADC();
+      Float_t aadc = pmddigit->GetADC();
+      if (aadc < 0.) aadc = 0.;
+      adc    = (UInt_t) aadc;
 
       TransformS2H(smn,irow,icol);
       
@@ -791,17 +785,17 @@ void AliPMDDDLRawData::GetMCMCh(Int_t imodule, Int_t row, Int_t col,
 
 //____________________________________________________________________________
 
-Int_t AliPMDDDLRawData::ComputeParity(UInt_t baseword)
+UInt_t AliPMDDDLRawData::ComputeParity(UInt_t baseword)
 {
   // Generate the parity bit
 
-  Int_t count = 0;
+  UInt_t count = 0;
   for(Int_t j=0; j<29; j++)
     {
       if (baseword & 0x01 ) count++;
       baseword >>= 1;
     }
-  Int_t parity = count%2;
+  UInt_t parity = count%2;
   return parity;
 }
 //____________________________________________________________________________