X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=PHOS%2FPHOSHistos.cxx;h=30fc014fb26f0b71c947497c094212901ebeef79;hb=fe0af2550d3cdb2570fa09852391f9849ba4954d;hp=25c2322390ad6a2d231f59ee3492f3e0859f58e2;hpb=6ad0bfa0999be42354e6caa187cf84fabe5cfa39;p=u%2Fmrichter%2FAliRoot.git

diff --git a/PHOS/PHOSHistos.cxx b/PHOS/PHOSHistos.cxx
index 25c2322390a..30fc014fb26 100644
--- a/PHOS/PHOSHistos.cxx
+++ b/PHOS/PHOSHistos.cxx
@@ -26,7 +26,6 @@
 
 // --- Standard library ---
 
-#include <iostream>
 #include <cstdio>
 
 
@@ -40,10 +39,10 @@
 #include "AliPHOSEmcRecPoint.h"
 #include "AliPHOSPpsdRecPoint.h"
 #include "AliPHOSClusterizerv1.h"
-#include "AliPHOSReconstructioner.h"
+#include "AliPHOSReconstructor.h"
 #include "AliPHOSTrackSegment.h"
 #include "AliPHOSTrackSegmentMakerv1.h"
-#include "AliPHOSParticleGuesserv1.h"
+#include "AliPHOSPIDv1.h"
 #include "PHOSHistos.h"
 
 
@@ -58,9 +57,9 @@ void PHOSHistos (Text_t* infile, Int_t nevent, Int_t Module)
   AliPHOSGeometry * Geom = AliPHOSGeometry::GetInstance(PHOS->GetGeometry()->GetName(),PHOS->GetGeometry()->GetTitle());
 //========== Creates the track segment maker
   AliPHOSTrackSegmentMakerv1 * tracksegmentmaker = new AliPHOSTrackSegmentMakerv1() ;
-  //========== Creates the particle guesser
-  AliPHOSParticleGuesserv1 * particleguesser = new AliPHOSParticleGuesserv1 ;
-  cout <<  "AnalyzeOneEvent > using particle guess " << particleguesser->GetName() << endl ; 
+  //========== Creates the particle identifier
+  AliPHOSPIDv1 * particleidentifier = new AliPHOSPIDv1 ;
+  Info("PHOSHistos", "AnalyzeOneEvent > using particle identifier %s\n", particleidentifier->GetName() ) ; 
     
   TH1F * hEmcDigit       = new TH1F("hEmcDigit","hEmcDigit",1000,0.,5.);
   TH1F * hVetoDigit      = new TH1F("hVetoDigit","hVetoDigit",1000,0.,3.e-5);
@@ -86,9 +85,9 @@ void PHOSHistos (Text_t* infile, Int_t nevent, Int_t Module)
     clusterizer->SetCalibrationParameters(0., 0.00000001) ;
 
   //========== Creates the Reconstructioner  
-    AliPHOSReconstructioner * Reconstructioner = new AliPHOSReconstructioner(clusterizer, tracksegmentmaker, particleguesser) ;
+    AliPHOSReconstructor * Reconstructioner = new AliPHOSReconstructor(clusterizer, tracksegmentmaker, particleidentifier) ;
      
-    cout << "Event " << ievent <<endl;
+    Info("PHOSHistos", "Event %d\n", ievent);
 
     Int_t RelId[4] ;
     //=========== Connects the various Tree's for evt
@@ -127,7 +126,7 @@ void PHOSHistos (Text_t* infile, Int_t nevent, Int_t Module)
      {
        if ( emc->GetPHOSMod() == Module )
        {  
-         Energy = emc->GetTotalEnergy() ;
+         Energy = emc->GetEnergy() ;
 	 hEmcCluster->Fill(Energy); 
          printf("Energy of the EMC cluster is %f \n",Energy);
 	 TClonesArray * PpsdRP = PHOS->PpsdClusters() ;
@@ -138,7 +137,7 @@ void PHOSHistos (Text_t* infile, Int_t nevent, Int_t Module)
 	   {
 	     if ( Ppsd->GetPHOSMod() == Module )
 	       { 
-		 Energy2 = Ppsd->GetTotalEnergy() ;
+		 Energy2 = Ppsd->GetEnergy() ;
 		 
 		 if (!Ppsd->GetUp()) hConvertorEmc->Fill(Energy,Energy2) ;
 	       }
@@ -155,7 +154,7 @@ void PHOSHistos (Text_t* infile, Int_t nevent, Int_t Module)
      {
        if ( Ppsd->GetPHOSMod() == Module )
        { 
-         Energy = Ppsd->GetTotalEnergy() ;
+         Energy = Ppsd->GetEnergy() ;
 
 	 if (!Ppsd->GetUp()) hConvertorCluster->Fill(Energy) ;
 	 if (Ppsd->GetUp()) hVetoCluster->Fill(Energy) ;