Modified Config files which are used by AliITStestAll0.sh to work with the

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

diff --git a/PHOS/AliPHOSPIDv1.cxx b/PHOS/AliPHOSPIDv1.cxx
index 6dc869aa3bfaeb3e01a283a3c42f020d3ad95f74..380330f4214df70a3a90ca59cb76b0c58568a30d 100644 (file)
--- a/PHOS/AliPHOSPIDv1.cxx
+++ b/PHOS/AliPHOSPIDv1.cxx
@@ -95,8 +95,6 @@
 // --- Standard library ---
 
 #include <Riostream.h>
-#include <fstream>
-#include <iomanip>
 
 // --- AliRoot header files ---
 
@@ -638,8 +636,7 @@ void  AliPHOSPIDv1::MakeRecParticles(){
   TObjArray * cpvRecPoints = gime->CpvRecPoints() ; 
   TClonesArray * trackSegments = gime->TrackSegments() ; 
   if ( !emcRecPoints || !cpvRecPoints || !trackSegments ) {
-    Error("MakeRecParticles", "RecPoints or TrackSegments not found !") ;  
-    abort() ; 
+    Fatal("MakeRecParticles", "RecPoints or TrackSegments not found !") ;  
   }
   TClonesArray * recParticles  = gime->RecParticles() ; 
   recParticles->Clear();
@@ -670,8 +667,7 @@ void  AliPHOSPIDv1::MakeRecParticles(){
     
     // YK: check if (emc != 0) !!!
     if (!emc) {
-      Error("MakeRecParticles", "-> emc(%d) = %d", ts->GetEmcIndex(), emc ) ;
-      abort();
+      Fatal("MakeRecParticles", "-> emc(%d) = %d", ts->GetEmcIndex(), emc ) ;
     }
     Float_t    e = emc->GetEnergy() ;   
     Int_t cluster = GetClusterOption(e) ;// Gives value to cluster that defines the energy range parameter to be used in de RCPV, TOF and used in the PCA.
@@ -853,23 +849,27 @@ void AliPHOSPIDv1::PrintRecParticles(Option_t * option)
   TClonesArray * recParticles = gime->RecParticles(BranchName()) ; 
 
   TString message ; 
-  message  = "event %d\n" ; 
-  message += "       found %d RecParticles\n" ; 
-  Info("PrintRecParticles", message.Data(), gAlice->GetEvNumber(), recParticles->GetEntriesFast() ) ; 
+  message  = "\nevent " ;
+  message += gAlice->GetEvNumber() ; 
+  message += "       found " ; 
+  message += recParticles->GetEntriesFast(); 
+  message += " RecParticles\n" ; 
+
   if(strstr(option,"all")) {  // printing found TS
-    message = "  PARTICLE         Index    \n" ;
-    Info("PrintRecParticles", message.Data() ) ; 
+    message += "\n  PARTICLE         Index    \n" ; 
     
     Int_t index ;
     for (index = 0 ; index < recParticles->GetEntries() ; index++) {
       AliPHOSRecParticle * rp = (AliPHOSRecParticle * ) recParticles->At(index) ;       
-      message = "          %s     %d     Type %d\n" ; 
-      Info("PrintRecParticles", message.Data(), 
-          rp->Name().Data(), 
-          rp->GetIndexInList(), 
-          rp->GetType() );
+      message += "\n" ;
+      message += rp->Name().Data() ;  
+      message += " " ;
+      message += rp->GetIndexInList() ;  
+      message += " " ;
+      message += rp->GetType()  ;
     }
-  }  
+  }
+  Info("Print", message.Data() ) ; 
 }