X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=PHOS%2FAliPHOSRecPoint.cxx;h=d259034baa412e19acacd5c4731373bdd8f7fc99;hb=e8a76a2617f19ec07f7a5846e49d3f470164d638;hp=7ccbf5189d0ff2b47b6060f0dd26b6d0325e9c00;hpb=cde7e5dcc47a8f6d032d9c2249e827da2b01f0db;p=u%2Fmrichter%2FAliRoot.git

diff --git a/PHOS/AliPHOSRecPoint.cxx b/PHOS/AliPHOSRecPoint.cxx
index 7ccbf5189d0..d259034baa4 100644
--- a/PHOS/AliPHOSRecPoint.cxx
+++ b/PHOS/AliPHOSRecPoint.cxx
@@ -22,6 +22,8 @@
 
 // --- ROOT system ---
 #include "TPad.h"
+#include "TGraph.h"
+#include "TPaveText.h"
 #include "TClonesArray.h"
 
 // --- Standard library ---
@@ -38,23 +40,22 @@ ClassImp(AliPHOSRecPoint)
 
 //____________________________________________________________________________
 AliPHOSRecPoint::AliPHOSRecPoint()
-  : AliRecPoint()
+  : AliRecPoint(),
+    fPHOSMod(0)
 {
   // ctor
 
-  fMaxTrack = 200 ;
-  fPHOSMod = 0;
-
+  fMaxTrack = 0 ;
 }
 
 //____________________________________________________________________________
-AliPHOSRecPoint::AliPHOSRecPoint(const char * opt) : AliRecPoint(opt)
+AliPHOSRecPoint::AliPHOSRecPoint(const char * opt) 
+  : AliRecPoint(opt),
+    fPHOSMod(0)
 {
   // ctor
   
   fMaxTrack = 200 ;
-  fPHOSMod = 0;
-  
 }
 
 //____________________________________________________________________________
@@ -86,7 +87,7 @@ Int_t AliPHOSRecPoint::DistancetoPrimitive(Int_t px, Int_t py)
  }
 
 //______________________________________________________________________________
-void AliPHOSRecPoint::ExecuteEvent(Int_t event, Int_t px, Int_t py) const
+void AliPHOSRecPoint::ExecuteEvent(Int_t event, Int_t, Int_t)
 {
   // Execute action corresponding to one event
   // This member function is called when a AliPHOSRecPoint is clicked with the locator
@@ -106,8 +107,13 @@ void AliPHOSRecPoint::ExecuteEvent(Int_t event, Int_t px, Int_t py) const
     
   case kButton1Down:{
     AliPHOSDigit * digit ;
-    AliPHOSGetter * gime = AliPHOSGetter::GetInstance() ; 
-    AliPHOSGeometry * phosgeom =  const_cast<AliPHOSGeometry*>(gime->PHOSGeometry());
+  
+//  Accessing geometry this way is equivalent to getting from gAlice
+// to have Detector in Folder one have to load gAlice anyway
+//    AliPHOSLoader * gime = AliPHOSLoader::GetInstance();
+//    AliPHOSGeometry * phosgeom =  const_cast<AliPHOSGeometry*>(gime->PHOSGeometry());
+
+    AliPHOSGeometry * phosgeom = AliPHOSLoader::GetPHOSGeometry();
 
     Int_t iDigit;
     Int_t relid[4] ;
@@ -144,7 +150,7 @@ void AliPHOSRecPoint::ExecuteEvent(Int_t event, Int_t px, Int_t py) const
       clustertext ->Draw("");
     }
     gPad->Update() ; 
-    Print() ;
+    Print("dummy") ;
     delete[] xi ; 
     delete[] zi ; 
    }
@@ -166,11 +172,13 @@ break;
   }
 }
 //____________________________________________________________________________
-void AliPHOSRecPoint::EvalAll(Float_t logWeight,TClonesArray * digits) {
+void AliPHOSRecPoint::EvalAll(TClonesArray * digits) 
+{
   //evaluates (if necessary) all RecPoint data members 
 
   EvalPrimaries(digits) ;
 }
+
 //____________________________________________________________________________
 void AliPHOSRecPoint::EvalPHOSMod(AliPHOSDigit * digit) 
 {
@@ -178,9 +186,8 @@ void AliPHOSRecPoint::EvalPHOSMod(AliPHOSDigit * digit)
 
   if( fPHOSMod == 0){
   Int_t relid[4] ; 
-  
-  AliPHOSGetter * gime = AliPHOSGetter::GetInstance() ; 
-  AliPHOSGeometry * phosgeom =  const_cast<AliPHOSGeometry*>(gime->PHOSGeometry());
+ 
+  AliPHOSGeometry * phosgeom = (AliPHOSGetter::Instance())->PHOSGeometry();
 
   phosgeom->AbsToRelNumbering(digit->GetId(), relid) ;
   fPHOSMod = relid[0];
@@ -239,14 +246,11 @@ void  AliPHOSRecPoint::EvalPrimaries(TClonesArray * digits)
   
 }
 //____________________________________________________________________________
-void AliPHOSRecPoint::GetGlobalPosition(TVector3 & gpos, TMatrix & gmat) const
+void AliPHOSRecPoint::GetGlobalPosition(TVector3 & gpos, TMatrixF & gmat) const
 {
   // returns the position of the cluster in the global reference system of ALICE
   // and the uncertainty on this position
-  
-  
-  AliPHOSGetter::GetInstance()->PHOSGeometry()->GetGlobal(this, gpos, gmat) ;
- 
+  (AliPHOSGetter::Instance())->PHOSGeometry()->GetGlobal(this, gpos, gmat);
 }
 
 
@@ -271,3 +275,5 @@ void AliPHOSRecPoint::Paint(Option_t *)
   gPad->SetAttMarkerPS(markercolor,markerstyle,markersize) ;
   gPad->PaintPolyMarker(1,&x,&y,"") ;
 }
+//______________________________________________________________________________
+