- fixing warnings

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

diff --git a/ITS/AliITSRawStreamSSD.cxx b/ITS/AliITSRawStreamSSD.cxx
index 18af7d265081b04b4ccadca7ce323b2081619694..6160871c7a00a94f557595c050962d97af82616a 100644 (file)
--- a/ITS/AliITSRawStreamSSD.cxx
+++ b/ITS/AliITSRawStreamSSD.cxx
@@ -214,12 +214,12 @@ AliITSRawStreamSSD::AliITSRawStreamSSD(AliRawReader* rawReader) :
   v = gGeoManager->GetVolume("ITSssdSensitivL5");
   if(!v) {
     // new geometry AliITSvPPRasymmFMD
-    AliInfo(Form("Enabling the SSD DDL mapping for the AliITSvPPRasymmFMD"));
+    AliDebugClass(1,"Enabling the SSD DDL mapping for the AliITSvPPRasymmFMD");
     SetvPPRasymmFMDDDLMapping();
   }
   else {
     // new geometry AliITSv11Hybrid
-    AliInfo(Form("Enabling the SSD DDL mapping for the AliITSv11Hybrid"));
+    AliDebugClass(1,"Enabling the SSD DDL mapping for the AliITSv11Hybrid");
     Setv11HybridDDLMapping();
   }
   //  fRawReader->Reset();
@@ -246,12 +246,12 @@ Bool_t AliITSRawStreamSSD::InitDDLModuleMap()
   v = gGeoManager->GetVolume("ITSssdSensitivL5");
   if(!v) {
     // new geometry AliITSvPPRasymmFMD
-    AliInfoClass(Form("Enabling the SSD DDL mapping for the AliITSvPPRasymmFMD"));
+    AliDebugClass(1,"Enabling the SSD DDL mapping for the AliITSvPPRasymmFMD");
     SetvPPRasymmFMDDDLMapping();
   }
   else {
     // new geometry AliITSv11Hybrid
-    AliInfoClass(Form("Enabling the SSD DDL mapping for the AliITSv11Hybrid"));
+    AliDebugClass(1,"Enabling the SSD DDL mapping for the AliITSv11Hybrid");
     Setv11HybridDDLMapping();
   }
   fgkDDLModuleMapInit = kTRUE;
@@ -528,8 +528,8 @@ Bool_t AliITSRawStreamSSD::Next()
 
 
   flag=1;
-  // relModuleID range 0 - 108
-  if(relModuleID > kModulesPerDDL){
+  // relModuleID range 0 - 107
+  if(relModuleID >= kModulesPerDDL){
     fRawReader->AddMajorErrorLog(kWrongModuleIdErr,Form("Module ID = %d > %d (max)",relModuleID,kModulesPerDDL));
     AliWarning(Form("Module ID = %d > %d (max)",relModuleID,kModulesPerDDL));
     return kFALSE;
@@ -537,8 +537,16 @@ Bool_t AliITSRawStreamSSD::Next()
   flag=0;
 
 
-
-  fModuleID = fgkDDLModuleMap[fRawReader->GetDDLID()][relModuleID];
+  Int_t ddlid=fRawReader->GetDDLID();
+  if(ddlid<0){
+    AliError("fRawReader->GetDDLID returns a negative value");
+    ddlid=0;
+  }
+  if(ddlid>=kDDLsNumber){
+    AliError(Form("fRawReader->GetDDLID returns a too big value %i \n",ddlid));
+    return kFALSE;
+  }
+  fModuleID = fgkDDLModuleMap[ddlid][relModuleID];
       
   fCoord2 =  (fData >> 12) & 0x000007FF; 
   fCoord1 = (fCoord2 < 768) ? 0 : 1; // strip 0 - 767 are Pside, strip 768 - 1535 are Nside