Fix for the case of non-existent calibration files

[u/mrichter/AliRoot.git] / ITS / UPGRADE / AliITSUHit.cxx

diff --git a/ITS/UPGRADE/AliITSUHit.cxx b/ITS/UPGRADE/AliITSUHit.cxx
index 21f07d0a0bdb086cdbf64ff338339349ba84046b..cc36f030fa73c3d4b9d546db06879e74550dc456 100644 (file)
--- a/ITS/UPGRADE/AliITSUHit.cxx
+++ b/ITS/UPGRADE/AliITSUHit.cxx
@@ -95,7 +95,7 @@ void AliITSUHit::GetChipID(Int_t &layer,Int_t &stave,Int_t &sstave, Int_t &mod,I
   // Returns the layer stave and detector number lables for this
   // ITS chip. Note: indices start from 0!
   AliITSUGeomTGeo *gm = ((AliITSU*)gAlice->GetDetector("ITS"))->GetITSGeomTGeo();
-  if (!gm) AliFatal("NULL pointer to the geometry!");
+  if (!gm) { AliFatal("NULL pointer to the geometry!"); return; }
   gm->GetChipId(fModule,layer,stave,sstave,mod,det);
 }  
 
@@ -113,17 +113,17 @@ Int_t AliITSUHit::GetStave() const
 {
   // Returns the stave of TS chip. Note: indices start from 0!
   AliITSUGeomTGeo *gm = ((AliITSU*)gAlice->GetDetector("ITS"))->GetITSGeomTGeo();
-  if (!gm) AliFatal("NULL pointer to the geometry!");
+  if (!gm) { AliFatal("NULL pointer to the geometry!"); return -1; }
   return gm->GetStave(fModule);
 }  
 
 //______________________________________________________________________
-Int_t AliITSUHit::GetSubStave() const
+Int_t AliITSUHit::GetHalfStave() const
 {
   // Returns the substave of the chip. Note: indices start from 0!
   AliITSUGeomTGeo *gm = ((AliITSU*)gAlice->GetDetector("ITS"))->GetITSGeomTGeo();
   if (!gm) AliFatal("NULL pointer to the geometry!");
-  return gm->GetSubStave(fModule);
+  return gm->GetHalfStave(fModule);
 }  
 
 //______________________________________________________________________
@@ -131,7 +131,7 @@ Int_t AliITSUHit::GetModule() const
 {
   // Returns the module of the chip. Note: indices start from 0!
   AliITSUGeomTGeo *gm = ((AliITSU*)gAlice->GetDetector("ITS"))->GetITSGeomTGeo();
-  if (!gm) AliFatal("NULL pointer to the geometry!");
+  if (!gm) { AliFatal("NULL pointer to the geometry!"); return -1; }
   return gm->GetModule(fModule);
 }  
 
@@ -140,7 +140,7 @@ Int_t AliITSUHit::GetChipInModule() const // former GetDetector
 {
   // Returns the detector within the module(or stave). Note: indices start from 0!
   AliITSUGeomTGeo *gm = ((AliITSU*)gAlice->GetDetector("ITS"))->GetITSGeomTGeo();
-  if (!gm) AliFatal("NULL pointer to the geometry!");
+  if (!gm) { AliFatal("NULL pointer to the geometry!"); return -1; }
   return gm->GetChipIdInModule(fModule);
 }