Compilation on Windoiws/Cygwin

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

diff --git a/PHOS/AliPHOSRecPoint.cxx b/PHOS/AliPHOSRecPoint.cxx
index 9e9163ffc48c8ded140c711c43e9f56d8f4b2bd4..9b3496d297abdfe0b536f1868c9851c1763ce904 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 ;  
   
@@ -78,15 +77,17 @@ AliPHOSRecPoint::~AliPHOSRecPoint()
 AliPHOSRecPoint::AliPHOSRecPoint(const AliPHOSRecPoint &rp) : 
   AliCluster(rp),
   fPHOSMod(rp.fPHOSMod),fMulTrack(rp.fMulTrack),fMaxDigit(rp.fMaxDigit),
-  fMulDigit(rp.fMulDigit),fMaxTrack(rp.fMaxTrack),fDigitsList(new Int_t[rp.fMaxDigit]),
-  fTracksList(new Int_t[rp.fMaxTrack]),fAmp(rp.fAmp),fIndexInList(rp.fIndexInList), 
-  fLocPos(rp.fLocPos),fLocPosM(rp.fLocPosM)
+  fMulDigit(rp.fMulDigit),fMaxTrack(rp.fMaxTrack),fDigitsList(0x0),
+  fTracksList(0x0),fAmp(rp.fAmp),fIndexInList(rp.fIndexInList), 
+  fLocPos(rp.fLocPos)
 {
   //copy ctor
 
+  if (rp.fMulDigit>0) fDigitsList = new Int_t[rp.fMulDigit];
   for(Int_t i=0; i<fMulDigit; i++)
     fDigitsList[i] = rp.fDigitsList[i];
 
+  if (rp.fMulTrack>0) fTracksList = new Int_t[rp.fMulTrack];
   for(Int_t i=0; i<fMulTrack; i++)
     fTracksList[i] = rp.fTracksList[i];
   
@@ -104,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];
@@ -164,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] ;
@@ -223,7 +223,7 @@ break;
   }
 }
 //____________________________________________________________________________
-void AliPHOSRecPoint::EvalAll(TClonesArray * digits) 
+void AliPHOSRecPoint::EvalAll(TClonesArray * /* digits */) 
 {
   //evaluates (if necessary) all RecPoint data members 
 
@@ -328,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]);