restyled Print

diff --git a/PHOS/AliPHOSClusterizerv1.cxx b/PHOS/AliPHOSClusterizerv1.cxx
index ec168fd5c6dc9227b4e42b83cdafe339192a4e05..23def01ab093d96a46bfa00d8d4c05c0b76901ca 100644 (file)
--- a/PHOS/AliPHOSClusterizerv1.cxx
+++ b/PHOS/AliPHOSClusterizerv1.cxx
@@ -1016,20 +1016,20 @@ void AliPHOSClusterizerv1::PrintRecPoints(Option_t * option)
   TObjArray * cpvRecPoints = AliPHOSGetter::GetInstance()->CpvRecPoints(BranchName()) ; 
 
   TString message ; 
   TObjArray * cpvRecPoints = AliPHOSGetter::GetInstance()->CpvRecPoints(BranchName()) ; 
 
   TString message ; 

-  message  = "event %d\n" ;
-  message += "       Found %d EMC RecPoints and %d CPV RecPoints \n" ; 
-  Info("PrintRecPoints", message.Data(),
-       gAlice->GetEvNumber(),
-       emcRecPoints->GetEntriesFast(),
-       cpvRecPoints->GetEntriesFast() ) ; 
-  
+  message  = "\nevent " ;
+  message += gAlice->GetEvNumber() ; 
+  message += "\n       Found " ; 
+  message += emcRecPoints->GetEntriesFast() ; 
+  message += "EMC RecPoints and " ;
+  message += cpvRecPoints->GetEntriesFast() ; 
+  message += " CPV RecPoints \n" ; 
+ 

   fRecPointsInRun +=  emcRecPoints->GetEntriesFast() ; 
   fRecPointsInRun +=  cpvRecPoints->GetEntriesFast() ; 
   
   if(strstr(option,"all")) {
   fRecPointsInRun +=  emcRecPoints->GetEntriesFast() ; 
   fRecPointsInRun +=  cpvRecPoints->GetEntriesFast() ; 
   
   if(strstr(option,"all")) {

-    message  = "EMC clusters " ;
-    message += " Index  Ene(MeV)   Multi  Module     X      Y      Z    Lambda 1   Lambda 2  # of prim  Primaries list " ; 
-    Info("PrintRecPoints", message.Data() ) ; 
+    message += "EMC clusters " ;
+    message += " Index  Ene(MeV) Multi Module X  Y  Z Lambda 1 Lambda 2  # of prim  Primaries list " ; 

     Int_t index ;
     for (index = 0 ; index < emcRecPoints->GetEntries() ; index++) {
       AliPHOSEmcRecPoint * rp = (AliPHOSEmcRecPoint * )emcRecPoints->At(index) ; 
     Int_t index ;
     for (index = 0 ; index < emcRecPoints->GetEntries() ; index++) {
       AliPHOSEmcRecPoint * rp = (AliPHOSEmcRecPoint * )emcRecPoints->At(index) ; 


@@ -1039,29 +1039,38 @@ void AliPHOSClusterizerv1::PrintRecPoints(Option_t * option)
       rp->GetElipsAxis(lambda);
       Int_t * primaries; 
       Int_t nprimaries;
       rp->GetElipsAxis(lambda);
       Int_t * primaries; 
       Int_t nprimaries;

+      message += " " ; 

       primaries = rp->GetPrimaries(nprimaries);
       primaries = rp->GetPrimaries(nprimaries);

-      message = "    %d       %f  %d      %f      %f      %f     %f    %f  %d\n" ; 
-      Info("PrintRecPoints", message.Data(), 
-          rp->GetIndexInList(),  
-          rp->GetEnergy(), 
-          rp->GetMultiplicity(),  
-          rp->GetPHOSMod(),  
-          locpos.X(),  
-          locpos.Y(),  
-          locpos.Z(), 
-          lambda[0], 
-          lambda[1], 
-          nprimaries ) ;
-     
+      message += "\n" ; 
+      message += rp->GetIndexInList() ;   
+      message += " " ; 
+      message += rp->GetEnergy();
+      message += " " ; 
+      message += rp->GetMultiplicity() ;  
+      message += " " ; 
+      message += rp->GetPHOSMod() ;
+      message += " " ; 
+      message += locpos.X() ;
+      message += " " ; 
+      message += locpos.Y() ;
+      message += " " ; 
+      message += locpos.Z() ;
+      message += " " ; 
+      message += lambda[0] ;
+      message += " " ; 
+      message += lambda[1] ;
+      message += " " ; 
+      message += nprimaries ;
+      message += " : " ; 
+      

       for (Int_t iprimary=0; iprimary<nprimaries; iprimary++) {
       for (Int_t iprimary=0; iprimary<nprimaries; iprimary++) {

-       message = "    %d" ; 
-       Info("PrintRecPoints", message.Data(), primaries[iprimary] ) ;
+       message += primaries[iprimary]  ;
+       message += " " ; 

       }
     }
     
     //Now plot CPV recPoints
       }
     }
     
     //Now plot CPV recPoints

-    message = "EMC clusters   Index      Multi      Module       X          Y          Z       # of prim  Primaries list \n" ;      
-    Info("PrintRecPoints", message.Data() ) ; 
+    message += "\nCPV clusters Index Multi Module X   Y   Z # of prim  Primaries list \n" ;      

     for (index = 0 ; index < cpvRecPoints->GetEntries() ; index++) {
       AliPHOSRecPoint * rp = (AliPHOSRecPoint * )cpvRecPoints->At(index) ; 
  
     for (index = 0 ; index < cpvRecPoints->GetEntries() ; index++) {
       AliPHOSRecPoint * rp = (AliPHOSRecPoint * )cpvRecPoints->At(index) ; 
  


@@ -1070,22 +1079,27 @@ void AliPHOSClusterizerv1::PrintRecPoints(Option_t * option)
   
       Int_t * primaries; 
       Int_t nprimaries ; 
   
       Int_t * primaries; 
       Int_t nprimaries ; 

-     
-      message = "      %d      %d    CPV      %f      %f      %f       %d" ; 
-      Info("PrintRecPoints", message.Data(), 
-          rp->GetIndexInList(), 
-          rp->GetPHOSMod(), 
-          locpos.X(), 
-          locpos.Y(), 
-          locpos.Z(), 
-          nprimaries) ; 
- 
+      message += "\n" ; 
+      message += rp->GetIndexInList() ;
+      message += " " ;  
+      message += rp->GetPHOSMod();  
+      message += " " ; 
+      message += locpos.X() ;
+      message += " " ; 
+      message += locpos.Y() ;  
+      message += " " ; 
+      message += locpos.Z() ; 
+      message += " " ; 
+      message +=  nprimaries ; 
+      message += " : " ; 
+      

       primaries = rp->GetPrimaries(nprimaries);
       for (Int_t iprimary=0; iprimary<nprimaries; iprimary++) {
       primaries = rp->GetPrimaries(nprimaries);
       for (Int_t iprimary=0; iprimary<nprimaries; iprimary++) {

-       message = "    %d " ; 
-       Info("PrintRecPoints", message.Data(), primaries[iprimary] ) ;
+       message += primaries[iprimary]  ;
+       message += " " ; 

       }
     }
   }
       }
     }
   }

+  Info("Print", message.Data() ) ; 

 }
 
 }
 

diff --git a/PHOS/AliPHOSDigitizer.cxx b/PHOS/AliPHOSDigitizer.cxx
index 6c31a9665efc50e74682451b256671b020b8d9ee..aa47cf42ed17ecc61fbd596e44b46344df2985a5 100644 (file)
--- a/PHOS/AliPHOSDigitizer.cxx
+++ b/PHOS/AliPHOSDigitizer.cxx
@@ -497,7 +497,7 @@ Bool_t AliPHOSDigitizer::Init()
 
   if( strcmp(GetTitle(), "") == 0 )
     SetTitle("galice.root") ;
 
   if( strcmp(GetTitle(), "") == 0 )
     SetTitle("galice.root") ;

-
+  

   AliPHOSGetter * gime = AliPHOSGetter::GetInstance(GetTitle(), GetName(), fToSplit) ; 
   if ( gime == 0 ) {
     Error("Init", "Could not obtain the Getter object !") ; 
   AliPHOSGetter * gime = AliPHOSGetter::GetInstance(GetTitle(), GetName(), fToSplit) ; 
   if ( gime == 0 ) {
     Error("Init", "Could not obtain the Getter object !") ; 


@@ -672,71 +672,77 @@ void AliPHOSDigitizer::Print(Option_t* option)const
 //__________________________________________________________________
  void AliPHOSDigitizer::PrintDigits(Option_t * option)
 {
 //__________________________________________________________________
  void AliPHOSDigitizer::PrintDigits(Option_t * option)
 {

-   // Print a table of digits
+  // Print a table of digits

   
   

-   AliPHOSGetter * gime = AliPHOSGetter::GetInstance() ; 
-   TClonesArray * digits = gime->Digits() ; 
-   
-   TString message ; 
-   message  = "event %d\n" ; 
-   message += "       Number of entries in Digits list %d\n" ;  
-   Info("Print", message.Data(), gAlice->GetEvNumber(), digits->GetEntriesFast() ) ;  
-   if(strstr(option,"all")||strstr(option,"EMC")){
-    
+  AliPHOSGetter * gime = AliPHOSGetter::GetInstance() ; 
+  TClonesArray * digits = gime->Digits() ; 
+  
+  TString message ; 
+  message  = "\nevent " ;
+  message += gAlice->GetEvNumber() ;
+  message += "\n       Number of entries in Digits list " ;  
+  message += digits->GetEntriesFast()  ;  
+  
+  if(strstr(option,"all")||strstr(option,"EMC")){  

     //loop over digits
     AliPHOSDigit * digit;
     //loop over digits
     AliPHOSDigit * digit;

-    message  = "EMC digits (with primaries):\n"  ;
-    message += "Digit Id     Amplitude   Index       Nprim  Primaries list\n" ; 
-    Info("Print", message.Data()) ; 
+    message += "\nEMC digits (with primaries):\n"  ;
+    message += "Digit Id Amplitude Index Nprim  Primaries list\n" ; 

     Int_t maxEmc = gime->PHOSGeometry()->GetNModules()*gime->PHOSGeometry()->GetNCristalsInModule() ;
     Int_t index ;
     for (index = 0 ; (index < digits->GetEntriesFast()) && 
     Int_t maxEmc = gime->PHOSGeometry()->GetNModules()*gime->PHOSGeometry()->GetNCristalsInModule() ;
     Int_t index ;
     for (index = 0 ; (index < digits->GetEntriesFast()) && 

-        (((AliPHOSDigit * )  digits->At(index))->GetId() <= maxEmc) ; index++) {
+          (((AliPHOSDigit * )  digits->At(index))->GetId() <= maxEmc) ; index++) {

       digit = (AliPHOSDigit * )  digits->At(index) ;
       if(digit->GetNprimary() == 0) 
        continue;
       digit = (AliPHOSDigit * )  digits->At(index) ;
       if(digit->GetNprimary() == 0) 
        continue;

-      message = "      %d          %d      %d     %d\n" ; 
-      Info("Print", message.Data(), 
-          digit->GetId(), 
-          digit->GetAmp(),  
-          digit->GetIndexInList(),     
-          digit->GetNprimary() ) ;
-      
+      message += "\n" ; 
+      message += digit->GetId() ; 
+      message += " " ; 
+      message += digit->GetAmp() ;  
+      message += " " ; 
+      message += digit->GetIndexInList() ;      
+      message += " " ; 
+      message += digit->GetNprimary()  ;
+      message += " : " ; 

       Int_t iprimary;
       for (iprimary=0; iprimary<digit->GetNprimary(); iprimary++) {
       Int_t iprimary;
       for (iprimary=0; iprimary<digit->GetNprimary(); iprimary++) {

-       message = "     %d\n" ; 
-       Info("Print", message.Data(), digit->GetPrimary(iprimary+1) ) ;
+       message += digit->GetPrimary(iprimary+1)  ;
+       message += " " ; 

       }    
     }
   }
       }    
     }
   }

-
+  

   if(strstr(option,"all")||strstr(option,"CPV")){
     
     //loop over CPV digits
     AliPHOSDigit * digit;
   if(strstr(option,"all")||strstr(option,"CPV")){
     
     //loop over CPV digits
     AliPHOSDigit * digit;

-    message  = "CPV digits:\n" ;
-    message += "Digit Id     Amplitude   Index       Nprim  Primaries list\n" ;
-    Info("Print", message.Data()) ; 
+    message += "\nCPV digits:\n" ;
+    message += "Digit Id Amplitude Index Nprim Primaries list\n" ;
+

     Int_t maxEmc = gime->PHOSGeometry()->GetNModules()*gime->PHOSGeometry()->GetNCristalsInModule() ;
     Int_t index ;
     for (index = 0 ; index < digits->GetEntriesFast(); index++) {
       digit = (AliPHOSDigit * )  digits->At(index) ;
       if(digit->GetId() > maxEmc){
     Int_t maxEmc = gime->PHOSGeometry()->GetNModules()*gime->PHOSGeometry()->GetNCristalsInModule() ;
     Int_t index ;
     for (index = 0 ; index < digits->GetEntriesFast(); index++) {
       digit = (AliPHOSDigit * )  digits->At(index) ;
       if(digit->GetId() > maxEmc){

-       message = "      %d          %d      %d     %d\n" ; 
-       Info("Print", message.Data(), 
-            digit->GetId(), 
-            digit->GetAmp(), 
-            digit->GetIndexInList(), 
-            digit->GetNprimary() ) ;
+       message += "\n" ; 
+       message += digit->GetId();  
+       message += " " ; 
+       message += digit->GetAmp() ; 
+       message += " " ; 
+       message += digit->GetIndexInList() ;  
+       message += " " ; 
+       message += digit->GetNprimary() ;
+       message += " : " ; 

        
        Int_t iprimary;
        for (iprimary=0; iprimary<digit->GetNprimary(); iprimary++) {
        
        Int_t iprimary;
        for (iprimary=0; iprimary<digit->GetNprimary(); iprimary++) {

-         message = "     %d\n" ; 
-         Info("Print", message.Data(), digit->GetPrimary(iprimary+1) ) ;
+         message += digit->GetPrimary(iprimary+1)  ;
+         message += " " ; 

        }    
       }
     }
   }
        }    
       }
     }
   }

+  Info("Print", message.Data() ) ; 

 }
 
 //__________________________________________________________________
 }
 
 //__________________________________________________________________

diff --git a/PHOS/AliPHOSPIDv1.cxx b/PHOS/AliPHOSPIDv1.cxx
index 6dc869aa3bfaeb3e01a283a3c42f020d3ad95f74..427f3706534bb9bfd510a7b98758b4b2dceda8bb 100644 (file)
--- a/PHOS/AliPHOSPIDv1.cxx
+++ b/PHOS/AliPHOSPIDv1.cxx
@@ -853,23 +853,27 @@ void AliPHOSPIDv1::PrintRecParticles(Option_t * option)
   TClonesArray * recParticles = gime->RecParticles(BranchName()) ; 
 
   TString message ; 
   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
   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) ;       
     
     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() ) ; 

 }
 
 
 }
 
 

diff --git a/PHOS/AliPHOSTrackSegmentMakerv1.cxx b/PHOS/AliPHOSTrackSegmentMakerv1.cxx
index 742a26ea347239f47ac9e12e2dd01f72bab63140..3a6cb20573b998e067d0acff21f755b5495ddbdb 100644 (file)
--- a/PHOS/AliPHOSTrackSegmentMakerv1.cxx
+++ b/PHOS/AliPHOSTrackSegmentMakerv1.cxx
@@ -552,19 +552,24 @@ void AliPHOSTrackSegmentMakerv1::PrintTrackSegments(Option_t * option)
   TClonesArray * trackSegments = AliPHOSGetter::GetInstance()->TrackSegments(taskName) ; 
 
   TString message ; 
   TClonesArray * trackSegments = AliPHOSGetter::GetInstance()->TrackSegments(taskName) ; 
 
   TString message ; 

-  message  = "AliPHOSTrackSegmentMakerv1: event %d\n" ; 
-  message += "      Found %d TrackSegments\n" ; 
+  message  = "\nevent " ;
+  message += gAlice->GetEvNumber() ; 
+  message += "\n      Found " ;
+  message += trackSegments->GetEntriesFast() ; 
+  message += " TrackSegments\n" ; 

 
   if(strstr(option,"all")) {  // printing found TS
 
   if(strstr(option,"all")) {  // printing found TS

-    message += "TrackSegment #     EMC RP#        CPV RP#    \n" ; 
-    Info("PrintTrackSegments", message.Data(), 
-        gAlice->GetEvNumber(), 
-        trackSegments->GetEntriesFast() ) ;  
+    message += "TrackSegment #  EMC RP#  CPV RP#\n" ; 

     Int_t index;
     for (index = 0 ; index <trackSegments->GetEntriesFast() ; index++) {
       AliPHOSTrackSegment * ts = (AliPHOSTrackSegment * )trackSegments->At(index) ; 
     Int_t index;
     for (index = 0 ; index <trackSegments->GetEntriesFast() ; index++) {
       AliPHOSTrackSegment * ts = (AliPHOSTrackSegment * )trackSegments->At(index) ; 

-      message = "       %d    %d    %d\n" ; 
-      Info("PrintTrackSegments", message.Data(), ts->GetIndexInList(), ts->GetEmcIndex(), ts->GetCpvIndex() ) ;
+      message += "\n" ; 
+      message += ts->GetIndexInList() ; 
+      message += " " ; 
+      message += ts->GetEmcIndex() ; 
+      message += " " ; 
+      message += ts->GetCpvIndex() ; 

     }  
   }
     }  
   }

+  Info("Print", message.Data() ) ; 

 }
 }