Change to comply with the new IndexToObject

diff --git a/PHOS/AliPHOSAnalyze.cxx b/PHOS/AliPHOSAnalyze.cxx
index 3891c4a78fad13bd2eebe49c656b2e26ddceb78c..ad6346398fbb03b73ec2eba7e981acde71cc75ce 100644 (file)
--- a/PHOS/AliPHOSAnalyze.cxx
+++ b/PHOS/AliPHOSAnalyze.cxx
@@ -72,6 +72,8 @@
 #include "TClonesArray.h"
 #include "TTree.h"
 #include "TMath.h"
+#include "TROOT.h"
+#include "TFolder.h"
 
 // --- Standard library ---
 
@@ -107,6 +109,7 @@ AliPHOSAnalyze::AliPHOSAnalyze(Text_t * fileName)
   ffileName = fileName ;
   fCorrection = 1.05 ;  //Value calculated for default parameters of reconstruction  
   fObjGetter = 0 ;  // should be instantiated
+ 
 }
 
 //____________________________________________________________________________
@@ -121,8 +124,6 @@ AliPHOSAnalyze::~AliPHOSAnalyze()
 {
   // dtor
 
-  if(fPHOS) {delete fPHOS     ; fPHOS    =0 ;}
-
 }
 //____________________________________________________________________________
 void AliPHOSAnalyze::DrawRecon(Int_t Nevent,Int_t Nmod,const char * branchName,const char* branchTitle){
@@ -147,9 +148,6 @@ void AliPHOSAnalyze::DrawRecon(Int_t Nevent,Int_t Nmod,const char * branchName,c
   fObjGetter = AliPHOSIndexToObject::GetInstance(ffileName.Data(),branchName,branchTitle) ;
   fObjGetter->GetEvent(Nevent);
   
-  fPHOS  = (AliPHOSv1 *)gAlice->GetDetector("PHOS") ;
-  fGeom  = AliPHOSGeometry::GetInstance( fPHOS->GetGeometry()->GetName(), fPHOS->GetGeometry()->GetTitle() );  
-
   //Plot Primary Particles
   TParticle * primary ;
   Int_t iPrimary ;
@@ -528,8 +526,7 @@ void AliPHOSAnalyze::Ls(){
 
 
   fObjGetter = AliPHOSIndexToObject::GetInstance(ffileName.Data(),"PHOSRP",branchTitle) ;
-  fGeom = AliPHOSGeometry::GetInstance(((AliPHOS*)gAlice->GetModule("PHOS"))->GetGeometry()->GetName(),
-                                      ((AliPHOS*)gAlice->GetModule("PHOS"))->GetGeometry()->GetTitle() );
+  fGeom = fObjGetter->GetPHOSGeometry() ; 
 
   Int_t ievent;
   for ( ievent=0; ievent < fObjGetter->GetMaxEvent() ; ievent++){
@@ -647,6 +644,8 @@ void AliPHOSAnalyze::PositionResolution(const char * branchTitle)
 
 
   fObjGetter = AliPHOSIndexToObject::GetInstance(ffileName.Data(),"PHOSRP",branchTitle) ;
+
+
   fGeom = AliPHOSGeometry::GetInstance(((AliPHOS*)gAlice->GetModule("PHOS"))->GetGeometry()->GetName(),
                                       ((AliPHOS*)gAlice->GetModule("PHOS"))->GetGeometry()->GetTitle() );
   

diff --git a/PHOS/AliPHOSAnalyze.h b/PHOS/AliPHOSAnalyze.h
index 6cb7e9446cea4941939e70be155e0d107731ec89..b940e26b5247714d455cb05c4a60bff165b7fc89 100644 (file)
--- a/PHOS/AliPHOSAnalyze.h
+++ b/PHOS/AliPHOSAnalyze.h
@@ -73,7 +73,6 @@ private:
   Int_t   fEvt ;                      //! the evt number being processed 
   AliPHOSGeometry * fGeom ;           //! the PHOS Geometry object
   AliPHOSIndexToObject * fObjGetter ; //! provides methods to retrieve objects from their index in a list
-  AliPHOSv1 * fPHOS ;                 //! the PHOS object from the root file 
   TString ffileName ;                 //! the root file that contains the data