Streamline the different messages output by the code using the AliLog, Remove warning...

diff --git a/ANALYSIS/AliAODParticle.cxx b/ANALYSIS/AliAODParticle.cxx
index 49ea5ce1e688e8ba34ebbefcf6490ea5b504dc5b..90a4bd06f99f3a58c36ca4a93ea5694735fb121a 100644 (file)
--- a/ANALYSIS/AliAODParticle.cxx
+++ b/ANALYSIS/AliAODParticle.cxx
@@ -1,4 +1,20 @@
-#include "AliAODParticle.h"
+/**************************************************************************
+ * Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
+ *                                                                        *
+ * Author: The ALICE Off-line Project.                                    *
+ * Contributors are mentioned in the code where appropriate.              *
+ *                                                                        *
+ * Permission to use, copy, modify and distribute this software and its   *
+ * documentation strictly for non-commercial purposes is hereby granted   *
+ * without fee, provided that the above copyright notice appears in all   *
+ * copies and that both the copyright notice and this permission notice   *
+ * appear in the supporting documentation. The authors make no claims     *
+ * about the suitability of this software for any purpose. It is          *
+ * provided "as is" without express or implied warranty.                  *
+ **************************************************************************/
+
+/* $Id$ */
+
 //___________________________________________________________
 /////////////////////////////////////////////////////////////
 //
@@ -15,8 +31,11 @@
 //
 /////////////////////////////////////////////////////////////
 #include <TParticle.h>
-#include "AliTrackPoints.h"
+
+#include "AliAODParticle.h"
 #include "AliClusterMap.h"
+#include "AliLog.h"
+#include "AliTrackPoints.h"
 
 ClassImp(AliAODParticle)
 
@@ -271,7 +290,7 @@ void AliAODParticle::SetPIDprobability(Int_t pdg, Float_t prob)
 //Ids are set in decreasing order
 //Check if total probability is not overcoming unity is performed
 //in case, warning is printed
-  if (GetDebug() > 9) Info("SetPIDprobability","Setting PID %d prob %f",pdg,prob);
+  AliDebug(9,Form("SetPIDprobability","Setting PID %d prob %f",pdg,prob));
 
   Float_t totprob = 0.0;//sums up probabilities
   Int_t idx = GetPidSlot(pdg);
@@ -285,10 +304,7 @@ void AliAODParticle::SetPIDprobability(Int_t pdg, Float_t prob)
        {
          Warning("SetPIDprobability","Total probability greater than unity (%f)",totprob);
        }
-     if (GetDebug() > 9) 
-      {
-        Info("SetPIDprobability","Current Total probability: %f",totprob);
-      }
+     AliDebug(9,Form("Current Total probability: %f",totprob));
      return;
    }
     
@@ -301,7 +317,7 @@ void AliAODParticle::SetPIDprobability(Int_t pdg, Float_t prob)
    {
      if ( fPidProb[i] > prob)
       {
-        if (GetDebug()>9) Info("SetPID","Copying entry %d",i);
+        AliDebug(9,Form("Copying entry %d",i));
         aPidProbNew[i] = fPidProb[i];
         aPidsNew[i] = fPids[i];
         totprob+=fPidProb[i];
@@ -309,7 +325,7 @@ void AliAODParticle::SetPIDprobability(Int_t pdg, Float_t prob)
      else break;
    }
 
-  if (GetDebug() > 9) Info("SetPID","Setting new PID on entry %d",i);
+  AliDebug(9,Form("SetPID","Setting new PID on entry %d",i));
   aPidProbNew[i] = prob;
   aPidsNew[i] = pdg;
   totprob+=prob;
@@ -317,7 +333,7 @@ void AliAODParticle::SetPIDprobability(Int_t pdg, Float_t prob)
 
   for (Int_t j = fNPids-1; j > i ;j--)//copy rest of old arays 
    {
-     if (GetDebug() > 9) Info("SetPID","Copying from old entry %d to new entry %d",j-1,j);
+     AliDebug(9,Form("SetPID","Copying from old entry %d to new entry %d",j-1,j));
      aPidProbNew[j] = fPidProb[j-1];
      aPidsNew[j] = fPids[j-1];
      totprob+=fPidProb[j-1];

diff --git a/HBTAN/AliHBTAnalysis.cxx b/HBTAN/AliHBTAnalysis.cxx
index 2e27aa8d5b611e3adf6fc0e176bc3e3a4477bc56..b330210a23293ac3c27faa63299e2048d836f145 100644 (file)
--- a/HBTAN/AliHBTAnalysis.cxx
+++ b/HBTAN/AliHBTAnalysis.cxx
@@ -14,7 +14,7 @@
 // ALICE Off-Line framework:
 //
 // Piotr.Skowronski@cern.ch
-// more info: http://alisoft.cern.ch/people/skowron/analyzer/index.html
+// more info: http://aliweb.cern.ch/people/skowron/analyzer/index.html
 //
 ////////////////////////////////////////////////////////////////////////////
 //_________________________________________________________
@@ -36,6 +36,7 @@
 #include "AliHBTPair.h"
 #include "AliHBTFunction.h"
 #include "AliHBTMonitorFunction.h"
+#include "AliLog.h"
  
 
 ClassImp(AliHBTAnalysis)
@@ -126,7 +127,7 @@ AliHBTAnalysis::~AliHBTAnalysis()
     
    if (fIsOwner)
     {
-      if (AliVAODParticle::GetDebug()>5)Info("~AliHBTAnalysis","Is Owner: Attempting to delete functions");
+      AliDebug(5,"Is Owner: Attempting to delete functions");
       DeleteFunctions();
       if (AliVAODParticle::GetDebug()>5)Info("~AliHBTAnalysis","Delete functions done");
     }

diff --git a/HBTAN/AliHBTPositionRandomizer.cxx b/HBTAN/AliHBTPositionRandomizer.cxx
index 08579bb57a7ff040b2530b45013a76aef896392e..affe33d0cf7a707943bd7f6ebe54734105517b71 100644 (file)
--- a/HBTAN/AliHBTPositionRandomizer.cxx
+++ b/HBTAN/AliHBTPositionRandomizer.cxx
@@ -1,4 +1,20 @@
-#include "AliHBTPositionRandomizer.h"
+/**************************************************************************
+ * Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
+ *                                                                        *
+ * Author: The ALICE Off-line Project.                                    *
+ * Contributors are mentioned in the code where appropriate.              *
+ *                                                                        *
+ * Permission to use, copy, modify and distribute this software and its   *
+ * documentation strictly for non-commercial purposes is hereby granted   *
+ * without fee, provided that the above copyright notice appears in all   *
+ * copies and that both the copyright notice and this permission notice   *
+ * appear in the supporting documentation. The authors make no claims     *
+ * about the suitability of this software for any purpose. It is          *
+ * provided "as is" without express or implied warranty.                  *
+ **************************************************************************/
+
+/* $Id $ */
+
 //___________________________________________________
 ////////////////////////////////////////////////////////////////////////////////
 // 
@@ -10,7 +26,10 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <TRandom.h>
+
 #include "AliAOD.h"
+#include "AliHBTPositionRandomizer.h"
+#include "AliLog.h"
 #include "AliVAODParticle.h"
 
 
@@ -131,7 +150,7 @@ void AliHBTPositionRandomizer::Randomize(AliAOD* event) const
 {
 // randomizes postions of all particles in the event
   static const Double_t kfmtocm = 1.e-13;
-  if (AliVAODParticle::GetDebug() > 5) Info("Randomize(AliAOD*)","");
+  AliDebug(5," ");
   if (event == 0x0) return;
 
   for (Int_t i = 0; i < event->GetNumberOfParticles(); i++)