Ensure that the ADC array is only called for valid entries (AliTRDmcmSim) and bug...

diff --git a/TRD/AliTRDfeeParam.cxx b/TRD/AliTRDfeeParam.cxx
index 89ed26ef83133a162b72278143aaf346d20db3a0..f5e888b07872da418a82c1f71a1693959cf3ba2e 100644 (file)
--- a/TRD/AliTRDfeeParam.cxx
+++ b/TRD/AliTRDfeeParam.cxx
@@ -237,7 +237,7 @@ Int_t AliTRDfeeParam::GetPadColFromADC(Int_t irob, Int_t imcm, Int_t iadc) const
   // http://wiki.kip.uni-heidelberg.de/ti/TRD/index.php/Image:ROB_MCM_numbering.pdf
   //
 
-  if (iadc < 0 || iadc > 19 ) return -100;
+  if (iadc < 0 || iadc > fgkNadcMcm ) return -100;
   Int_t mcmcol = imcm%fgkNmcmRobInCol + GetRobSide(irob)*fgkNmcmRobInCol;  // MCM column number on ROC [0..7]
   Int_t padcol = mcmcol*fgkNcolMcm + fgkNcolMcm + 1 - iadc;
   // if( padcol < 0 || padcol >= fgkNcol ) return -1;   // thisi s commented because of reson above KO
@@ -428,3 +428,5 @@ void AliTRDfeeParam::SetArgon()
   fTFc2   = 0.07;
 
 }
+
+

diff --git a/TRD/AliTRDmcmSim.cxx b/TRD/AliTRDmcmSim.cxx
index f64fa291c4798b5992bd3bb58afcb21dce994dc4..f562be80429e6d609ac0b25dd88bb2ed2192d7bd 100644 (file)
--- a/TRD/AliTRDmcmSim.cxx
+++ b/TRD/AliTRDmcmSim.cxx
@@ -227,8 +227,8 @@ Bool_t AliTRDmcmSim::LoadMCM(AliRunLoader* const runloader, Int_t det, Int_t rob
   Int_t padrow = fFeeParam->GetPadRowFromMCM(rob, mcm);
   Int_t padcol = 0;
   for (Int_t ch = 0; ch < fNADC; ch++) {
+    padcol = GetCol(ch);
     for (Int_t tb = 0; tb < fNTimeBin; tb++) {
-      padcol = fFeeParam->GetPadColFromADC(rob, mcm, ch);
       if (padcol < 0) {
         fADCR[ch][tb] = 0;
         fADCF[ch][tb] = 0;
@@ -494,20 +494,20 @@ void AliTRDmcmSim::SetData(AliTRDarrayADC* const adcArray)
   Int_t firstAdc = 0;
   Int_t lastAdc = fNADC-1;
 
-  if (GetCol(firstAdc) > 143) {
+  while (GetCol(firstAdc) < 0) {
     for (Int_t iTimeBin = 0; iTimeBin < fNTimeBin; iTimeBin++) {
       fADCR[firstAdc][iTimeBin] = fSimParam->GetADCbaseline() << fgkAddDigits;
       fADCF[firstAdc][iTimeBin] = fSimParam->GetADCbaseline() << fgkAddDigits;
     }
-    firstAdc = 1;
+    firstAdc++;
   }
 
-  if (GetCol(lastAdc) < 0) {
+  while (GetCol(lastAdc) < 0) {
     for (Int_t iTimeBin = 0; iTimeBin < fNTimeBin; iTimeBin++) {
       fADCR[lastAdc][iTimeBin] = fSimParam->GetADCbaseline() << fgkAddDigits;
       fADCF[lastAdc][iTimeBin] = fSimParam->GetADCbaseline() << fgkAddDigits;
     }
-    lastAdc = fNADC - 2;
+    lastAdc--;
   }
 
   for (Int_t iTimeBin = 0; iTimeBin < fNTimeBin; iTimeBin++) {
@@ -552,7 +552,11 @@ Int_t AliTRDmcmSim::GetCol( Int_t iadc )
 
   if( !CheckInitialized() ) return -1;
 
-  return fFeeParam->GetPadColFromADC(fRobPos, fMcmPos, iadc);
+  Int_t col = fFeeParam->GetPadColFromADC(fRobPos, fMcmPos, iadc);
+  if (col < 0 || col >= fFeeParam->GetNcol()) 
+    return -1;
+  else 
+    return col;
 }
 
 Int_t AliTRDmcmSim::ProduceRawStream( UInt_t *buf, Int_t maxSize, UInt_t iEv)
@@ -1515,11 +1519,11 @@ void AliTRDmcmSim::WriteData(AliTRDarrayADC *digits)
   Int_t firstAdc = 0;
   Int_t lastAdc = fNADC - 1;
 
-  if (GetCol(firstAdc) > 143)
-    firstAdc = 1;
+  while (GetCol(firstAdc) < 0)
+    firstAdc++;
 
-  if (GetCol(lastAdc) < 0) 
-    lastAdc = fNADC - 2;
+  while (GetCol(lastAdc) < 0) 
+    lastAdc--;
 
   if (fTrapConfig->GetTrapReg(AliTRDtrapConfig::kEBSF) != 0) // store unfiltered data
   {
@@ -1730,4 +1734,3 @@ void AliTRDmcmSim::Sort6To2Worst(uint16_t  idx1i, uint16_t  idx2i, uint16_t  idx
 //    printf("idx21s=%d, idx23as=%d, idx22s=%d, idx23bs=%d, idx5o=%d, idx6o=%d\n",
 //            idx21s,    idx23as,    idx22s,    idx23bs,    *idx5o,    *idx6o);
 }
-