Revert "Revert "#103626: Commit DCal geometry to master" since the files are broken."

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

diff --git a/ITS/AliITSRawStreamSSD.cxx b/ITS/AliITSRawStreamSSD.cxx
index 82ba6579e181a75cbd7ce6ab46cbe1a9c6178698..6160871c7a00a94f557595c050962d97af82616a 100644 (file)
--- a/ITS/AliITSRawStreamSSD.cxx
+++ b/ITS/AliITSRawStreamSSD.cxx
@@ -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