Coverity fixes.

[u/mrichter/AliRoot.git] / PHOS / AliPHOSRecPoint.cxx

diff --git a/PHOS/AliPHOSRecPoint.cxx b/PHOS/AliPHOSRecPoint.cxx
index a6010a34c6789842eccc1d9a9ff8f7c058a88c29..e84d789d4ffa5365bdc142e45bfef6d92027597e 100644 (file)
--- a/PHOS/AliPHOSRecPoint.cxx
+++ b/PHOS/AliPHOSRecPoint.cxx
@@ -18,7 +18,7 @@
 //  Why should I put meaningless comments
 //  just to satisfy
 //  the code checker                
-//*-- Author: Gines Martinez (SUBATECH)
+//-- Author: Gines Martinez (SUBATECH)
 
 // --- ROOT system ---
 #include "TPad.h"
@@ -46,7 +46,7 @@ AliPHOSRecPoint::AliPHOSRecPoint()
     fMulTrack(0),fMaxDigit(100),fMulDigit(0),fMaxTrack(200),
     fDigitsList(0),fTracksList(0),fAmp(0),
     fIndexInList(-1), // to be set when the point is already stored
-    fLocPos(0,0,0),fLocPosM(0)
+    fLocPos(0,0,0)
 {
   // ctor
 
@@ -58,7 +58,7 @@ AliPHOSRecPoint::AliPHOSRecPoint(const char * )
     fMulTrack(0),fMaxDigit(100),fMulDigit(0),fMaxTrack(200),
     fDigitsList(new Int_t[fMaxDigit]),fTracksList(new Int_t[fMaxTrack]),fAmp(0),
     fIndexInList(-1), // to be set when the point is already stored
-    fLocPos(0,0,0),fLocPosM(new TMatrixF(3,3))
+    fLocPos(0,0,0)
 
 {
   // ctor
@@ -69,7 +69,6 @@ AliPHOSRecPoint::~AliPHOSRecPoint()
 {
   // dtor
   
-  delete fLocPosM ; 
   delete [] fDigitsList ; 
   delete [] fTracksList ;  
   
@@ -80,7 +79,7 @@ AliPHOSRecPoint::AliPHOSRecPoint(const AliPHOSRecPoint &rp) :
   fPHOSMod(rp.fPHOSMod),fMulTrack(rp.fMulTrack),fMaxDigit(rp.fMaxDigit),
   fMulDigit(rp.fMulDigit),fMaxTrack(rp.fMaxTrack),fDigitsList(0x0),
   fTracksList(0x0),fAmp(rp.fAmp),fIndexInList(rp.fIndexInList), 
-  fLocPos(rp.fLocPos),fLocPosM(rp.fLocPosM)
+  fLocPos(rp.fLocPos)
 {
   //copy ctor
 
@@ -106,7 +105,6 @@ AliPHOSRecPoint& AliPHOSRecPoint::operator= (const AliPHOSRecPoint &rp)
   fAmp = rp.fAmp;
   fIndexInList = rp.fIndexInList; 
   fLocPos = rp.fLocPos;
-  fLocPosM = rp.fLocPosM;
 
   for(Int_t i=0; i<fMaxDigit; i++)
     fDigitsList[i] = rp.fDigitsList[i];
@@ -166,7 +164,7 @@ void AliPHOSRecPoint::ExecuteEvent(Int_t event, Int_t, Int_t)
   case kButton1Down:{
     AliPHOSDigit * digit ;
   
-    AliPHOSGeometry * phosgeom = AliPHOSLoader::GetPHOSGeometry();
+    AliPHOSGeometry * phosgeom =  AliPHOSGeometry::GetInstance() ;
 
     Int_t iDigit;
     Int_t relid[4] ;
@@ -225,7 +223,7 @@ break;
   }
 }
 //____________________________________________________________________________
-void AliPHOSRecPoint::EvalAll(TClonesArray * digits) 
+void AliPHOSRecPoint::EvalAll(TClonesArray * /* digits */) 
 {
   //evaluates (if necessary) all RecPoint data members 
 
@@ -312,12 +310,12 @@ void AliPHOSRecPoint::EvalLocal2TrackingCSTransform()
   //Calculate offset to crystal surface.
   //See fCrystalShift code in AliPHOSGeometry::Init()).
 
-  Float_t * inthermo = geoEMCA->GetInnerThermoHalfSize() ;
-  Float_t * strip = geoEMCA->GetStripHalfSize() ;
-  Float_t* splate = geoEMCA->GetSupportPlateHalfSize();
-  Float_t * crystal = geoEMCA->GetCrystalHalfSize() ;
-  Float_t * pin = geoEMCA->GetAPDHalfSize() ;
-  Float_t * preamp = geoEMCA->GetPreampHalfSize() ;
+  const Float_t * inthermo = geoEMCA->GetInnerThermoHalfSize() ;
+  const Float_t * strip    = geoEMCA->GetStripHalfSize() ;
+  const Float_t * splate   = geoEMCA->GetSupportPlateHalfSize();
+  const Float_t * crystal  = geoEMCA->GetCrystalHalfSize() ;
+  const Float_t * pin      = geoEMCA->GetAPDHalfSize() ;
+  const Float_t * preamp   = geoEMCA->GetPreampHalfSize() ;
   crystalShift = -inthermo[1]+strip[1]+splate[1]+crystal[1]-geoEMCA->GetAirGapLed()/2.+pin[1]+preamp[1] ;
 
   if(IsEmc()) {
@@ -330,7 +328,7 @@ void AliPHOSRecPoint::EvalLocal2TrackingCSTransform()
   lxyz[1] = lxyz[1] - dy;
 
   const TGeoHMatrix* tr2loc = GetTracking2LocalMatrix();
-  if(!tr2loc) AliFatal(Form("No Tracking2LocalMatrix found."));
+  if(!tr2loc) AliFatal(Form("No Tracking2LocalMatrix found for VolumeID=%d",GetVolumeId()));
 
   tr2loc->MasterToLocal(lxyz,txyz);
   SetX(txyz[0]); SetY(txyz[1]); SetZ(txyz[2]);