coverity

diff --git a/EMCAL/AliCaloConstants.h b/EMCAL/AliCaloConstants.h
index ac3d07755cd4aec740a58d46d2a40044e2982471..00537f4871bc0f6631a83059e87b73e37cc15601 100644 (file)
--- a/EMCAL/AliCaloConstants.h
+++ b/EMCAL/AliCaloConstants.h
@@ -66,6 +66,7 @@ namespace CaloConstants
   namespace EMCALConstants
   {
     const int MAXHWADDR = 3279;
+    const int MAXCHANNELS = 1408;
     const double ECENTRALHIT = 0.845678; //Percentage of total enegry contain in a single tower for a central hit  
     const int NZROWSMOD      =  24;   // Number of rows per module
     const int NXCOLUMNSMOD   =  48;   // Number of columns per module 

diff --git a/EMCAL/AliCaloRawAnalyzerPeakFinder.cxx b/EMCAL/AliCaloRawAnalyzerPeakFinder.cxx
index 19675ea5ea77479345e15baf6d8d1a001a29150c..8d627019efc5175099ecc3748af58128123e644a 100644 (file)
--- a/EMCAL/AliCaloRawAnalyzerPeakFinder.cxx
+++ b/EMCAL/AliCaloRawAnalyzerPeakFinder.cxx
@@ -40,6 +40,7 @@
 using namespace std;
 
 
+
 ClassImp( AliCaloRawAnalyzerPeakFinder )
 
 

diff --git a/HLT/EMCAL/AliHLTEMCALMapper.cxx b/HLT/EMCAL/AliHLTEMCALMapper.cxx
index 00d2369f45fb96e28ebb4c047a5364eb9e9b296c..7b03a11272a95bc728282bab0aec96ba5ad35d0c 100644 (file)
--- a/HLT/EMCAL/AliHLTEMCALMapper.cxx
+++ b/HLT/EMCAL/AliHLTEMCALMapper.cxx
@@ -26,6 +26,7 @@ using EMCAL::NMODULES;
 using EMCAL::NRCUSPERMODULE;
 using EMCAL::NRCUSPERSECTOR;
 using EMCAL::MAXHWADDR;
+using EMCAL::MAXCHANNELS; 
 
 AliHLTEMCALMapper::AliHLTEMCALMapper(const unsigned long specification ) : AliHLTCaloMapper(specification, "EMCAL")
 {
@@ -82,21 +83,29 @@ AliHLTEMCALMapper::InitAltroMapping(const unsigned long specification )
              fHw2geomapPtr[i].fZRow = 0;
              fHw2geomapPtr[i].fGain = 0;
            }
-         for(int i=0; i<nChannels; i ++)
+         // MAXCHANNELS
+         if( nChannels <= MAXCHANNELS )
            {
-             res = fscanf(fp, "%d %d %d %d\n", &tmpHwaddr, &tmpXCol, &tmpZRow,  &tmpGain);
-             
-             if(tmpGain < 2)
+             for(int i=0; i<nChannels; i ++)
                {
-                 if( tmpHwaddr <= MAXHWADDR  )
+                 res = fscanf(fp, "%d %d %d %d\n", &tmpHwaddr, &tmpXCol, &tmpZRow,  &tmpGain);
+                 
+                 if(tmpGain < 2)
                    {
-                     fHw2geomapPtr[tmpHwaddr].fXCol   = (char)tmpXCol;
-                     fHw2geomapPtr[tmpHwaddr].fZRow   = (char)tmpZRow;
-                     fHw2geomapPtr[tmpHwaddr].fGain  =  (char)tmpGain;
-                   }
-               } 
+                     if( tmpHwaddr <= MAXHWADDR  )
+                       {
+                         fHw2geomapPtr[tmpHwaddr].fXCol   = (char)tmpXCol;
+                         fHw2geomapPtr[tmpHwaddr].fZRow   = (char)tmpZRow;
+                         fHw2geomapPtr[tmpHwaddr].fGain  =  (char)tmpGain;
+                       }
+                   } 
+               }
+             fIsInitializedMapping = true;       
+           }
+         else
+           {
+             fIsInitializedMapping = false;       
            }
-         fIsInitializedMapping = true;   
          fclose(fp);
        }
       else