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

diff --git a/ANALYSIS/AliAODPair.cxx b/ANALYSIS/AliAODPair.cxx
index c37f8afe74ae907f3be32612dd73a27729d77883..7771e34a8570e1b6bc9eea1784f1aadc34184133 100644 (file)
--- a/ANALYSIS/AliAODPair.cxx
+++ b/ANALYSIS/AliAODPair.cxx
@@ -7,7 +7,7 @@
 // class implements pair of particles and taking care of caluclation (almost)
 // all of pair properties (Qinv, InvMass,...)
 // 
-// more info: http://alisoft.cern.ch/people/skowron/analyzer/index.html
+// more info: http://aliweb.cern.ch/people/skowron/analyzer/index.html
 //
 ////////////////////////////////////////////////////////////////////////////
 

diff --git a/ANALYSIS/AliAODPair.h b/ANALYSIS/AliAODPair.h
index b31304995972c07757471901a88d1c9b4de06b13..289346623e892eba52f8ecf27fd44e8f691db30f 100644 (file)
--- a/ANALYSIS/AliAODPair.h
+++ b/ANALYSIS/AliAODPair.h
@@ -7,7 +7,7 @@
 //
 // class implements pair of particles and taking care of caluclation (almost)
 // all of pair properties (Qinv, InvMass,...)
-// more info: http://alisoft.cern.ch/people/skowron/analyzer/index.html
+// more info: http://aliweb.cern.ch/people/skowron/analyzer/index.html
 //
 ////////////////////////////////////////////////////////////////////////////
 

diff --git a/ANALYSIS/AliAODPairCut.cxx b/ANALYSIS/AliAODPairCut.cxx
index 033100afb65b9fbc10bd5a545774e9a9fde06b18..62c2907c2d21f5cd8ada909532d1f85754e84d42 100644 (file)
--- a/ANALYSIS/AliAODPairCut.cxx
+++ b/ANALYSIS/AliAODPairCut.cxx
@@ -6,7 +6,7 @@
 // Class AliAODPairCut:
 //
 // implements cut on the pair of particles
-// more info: http://alisoft.cern.ch/people/skowron/analyzer/index.html
+// more info: http://aliweb.cern.ch/people/skowron/analyzer/index.html
 // Author: Piotr.Skowronski@cern.ch
 //-------------------------------------------------------------------
 #include "AliAODPair.h"

diff --git a/ANALYSIS/AliAODPairCut.h b/ANALYSIS/AliAODPairCut.h
index 4b161f7d6f2a42d02fcf33e44c800958f46729b9..33c39f745d78006e28c0ea18d8811860476bc35e 100644 (file)
--- a/ANALYSIS/AliAODPairCut.h
+++ b/ANALYSIS/AliAODPairCut.h
@@ -6,7 +6,7 @@
 //Piotr Skowronski@cern.ch
 //Class implements cut on the pair of particles
 //
-//more info: http://alisoft.cern.ch/people/skowron/analyzer/index.html
+//more info: http://aliweb.cern.ch/people/skowron/analyzer/index.html
 #include <TNamed.h> 
 #include "AliAODPairBaseCut.h"
 

diff --git a/ANALYSIS/AliAODRun.cxx b/ANALYSIS/AliAODRun.cxx
index b601eee4d94d740ff6162a6ba8061cfba59b2326..69b205bf80d9ba2c6d4d9f79f9226d25d117f78a 100644 (file)
--- a/ANALYSIS/AliAODRun.cxx
+++ b/ANALYSIS/AliAODRun.cxx
@@ -7,7 +7,7 @@
 // Class storing and managing events                 //
 //                                                   //
 // Piotr.Skowronski@cern.ch                          //
-// http://alisoft.cern.ch/people/skowron/analyzer    //
+// http://aliweb.cern.ch/people/skowron/analyzer    //
 //                                                   //
 ///////////////////////////////////////////////////////
 

diff --git a/ANALYSIS/AliAODRun.h b/ANALYSIS/AliAODRun.h
index 7cb35698e372d6ca685438221b7782ef5de031bf..2910e3425dda063a73ed8fc57373e0208fe20a05 100644 (file)
--- a/ANALYSIS/AliAODRun.h
+++ b/ANALYSIS/AliAODRun.h
@@ -9,7 +9,7 @@
 // designed for fast acces                           //
 //                                                   //
 // Piotr.Skowronski@cern.ch                          //
-// http://alisoft.cern.ch/people/skowron/analyzer    //
+// http://aliweb.cern.ch/people/skowron/analyzer    //
 //                                                   //
 ///////////////////////////////////////////////////////
 

diff --git a/ANALYSIS/AliClusterMap.cxx b/ANALYSIS/AliClusterMap.cxx
index 94e501862a06754ad83005440ce5c30f15eccb46..2ff5bac289bfdf580eb377ffe13c1ff18162ddb4 100644 (file)
--- a/ANALYSIS/AliClusterMap.cxx
+++ b/ANALYSIS/AliClusterMap.cxx
@@ -1,4 +1,19 @@
-#include "AliClusterMap.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$ */
 
 //_________________________________________________
 ///////////////////////////////////////////////////
@@ -14,13 +29,18 @@
 //
 ///////////////////////////////////////////////////////////////////////////
 
+#include <TString.h>
 
+#include "AliClusterMap.h"
 #include "AliESDtrack.h"
+#include "AliLog.h"
 #include "AliTPCtrack.h"
 #include "AliVAODParticle.h"
-#include <TString.h>
+
 const Int_t AliClusterMap::fNPadRows = 159;
 
+ClassImp(AliClusterMap)
+
 AliClusterMap::AliClusterMap():
  fPadRawMap(fNPadRows)
 {
@@ -33,11 +53,8 @@ AliClusterMap::AliClusterMap(AliESDtrack* track):
 {
  //ctor
  
- if (AliVAODParticle::GetDebug() > 2)
-  { 
-    Info("AliClusterMap(AliESDtrack*)","");
-    Print();
-  } 
+ StdoutToAliDebug(3,Print());
+
 } 
 /***********************************************************************/
 
@@ -46,11 +63,7 @@ AliClusterMap::AliClusterMap(AliTPCtrack* track):
 {
  //ctor
  
- //Does not work since indeces in the claster index array 
- //in the TPC track does not correspond to the padraw segmatation
- if (AliVAODParticle::GetDebug() > 9) 
-   Info("AliClusterMap",
-      "#####################################################################"); 
+ AliDebug(10,"#####################################################################"); 
  if (track == 0x0)
   {
     Error("AliClusterMap","Pointer to TPC track is NULL");
@@ -64,8 +77,7 @@ AliClusterMap::AliClusterMap(AliTPCtrack* track):
     Int_t sect = (idx&0xff000000)>>24;
     Int_t row = (idx&0x00ff0000)>>16;
     if (sect > 18) row +=63; //if it is outer sector, add number of inner sectors
-    if (AliVAODParticle::GetDebug() > 9)  
-      Info("AliClusterMap","Cl.idx is %d, sect %d, row %d",idx,sect,row);
+    AliDebug(9,Form("Cl.idx is %d, sect %d, row %d",idx,sect,row));
       
     fPadRawMap.SetBitNumber(row,kTRUE);
     
@@ -96,11 +108,8 @@ AliClusterMap::AliClusterMap(AliTPCtrack* track):
      }
   }
   
- if (AliVAODParticle::GetDebug() > 2)
-  { 
-    Info("AliClusterMap(AliTPCtrack*)","");
-    Print();
-  } 
+ StdoutToAliDebug(3,Print());
+
 }
 /***********************************************************************/
 
@@ -135,8 +144,6 @@ Float_t AliClusterMap::GetOverlapFactor(const AliClusterMap& clmap) const
   //  -0.5 (low probability that these tracks are a split track)
   //  and
   //   1.0 (high probability that these tracks are a split track)
-  TString msg1;
-  TString msg2;
   
   Int_t nh = 0;
   Int_t an = 0;
@@ -145,9 +152,6 @@ Float_t AliClusterMap::GetOverlapFactor(const AliClusterMap& clmap) const
      Bool_t x = HasClAtPadRow(i);
      Bool_t y = clmap.HasClAtPadRow(i);
      
-     if (x) msg1+="1";else msg1+="0";
-     if (y) msg2+="1";else msg2+="0";
-     
      if (x && y)//both have clasters
       {
        an--;
@@ -169,24 +173,5 @@ Float_t AliClusterMap::GetOverlapFactor(const AliClusterMap& clmap) const
   if (nh > 0) retval = ((Float_t)an)/((Float_t)nh);
   else Warning("GetOverlapFactor","Number of counted cluters is 0.");
   
-  if (AliVAODParticle::GetDebug() > 2)
-   {
-     Info("GetOverlapFactor","Splitting Quality Factor is %f. SumAn = %d, SumClusters %d",retval,an,nh); 
-     if (retval == 1.0) 
-      { 
-        Print();
-        Info("AliClusterMap","BitMap is\n  %s\n",msg1.Data());
-        clmap.Print(); 
-        Info("AliClusterMap","BitMap is\n  %s\n\n\n\n",msg2.Data());
-      }
-     if (retval == -.5) 
-      { 
-        Print();
-        Info("AliClusterMap","BitMap is\n  %s\n",msg1.Data());
-        clmap.Print(); 
-        Info("AliClusterMap","BitMap is\n  %s\n\n\n\n",msg2.Data());
-      }
-   } 
- 
   return retval;
 }

diff --git a/ANALYSIS/AliReader.cxx b/ANALYSIS/AliReader.cxx
index 434f747f8c20ae3d3c9c65679e2b4e07779c78dc..df65af7eae1c761ce83bba04a0d4392edd2f22b6 100644 (file)
--- a/ANALYSIS/AliReader.cxx
+++ b/ANALYSIS/AliReader.cxx
@@ -1,4 +1,20 @@
-#include "AliReader.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$ */
+
 //_________________________________________________________________________
 ///////////////////////////////////////////////////////////////////////////
 //
@@ -49,18 +65,19 @@
 //
 ///////////////////////////////////////////////////////////////////////////
 
-#include <TString.h>
-#include <TObjString.h>
-#include <TObjArray.h>
 #include <TClass.h>
-#include <TRandom.h>
-#include <TH1.h>
-
 #include <TGliteXmlEventlist.h>
+#include <TH1.h>
+#include <TObjArray.h>
+#include <TObjString.h>
+#include <TRandom.h>
+#include <TString.h>
 
-#include "AliAODParticleCut.h"
 #include "AliAOD.h"
+#include "AliAODParticleCut.h"
 #include "AliAODRun.h"
+#include "AliLog.h"
+#include "AliReader.h"
  
 ClassImp(AliReader)
 //pure virtual
@@ -419,10 +436,8 @@ TString AliReader::GetDirName(Int_t entry)
         retval = ".";
         return retval;
       }
-     if (AliVAODParticle::GetDebug() > 0)
-      {
-        Warning("GetDirName","Index %d out of bounds",entry);
-      }
+     AliDebug(1,Form("Index %d out of bounds",entry));
+
      return retval;
    }
 
@@ -437,7 +452,7 @@ TString AliReader::GetDirName(Int_t entry)
      Error("GetDirName","Object in TObjArray is not a TObjString or its descendant");
      return retval;
    }
-  if (gDebug > 0) Info("GetDirName","Returned ok %s",dir->String().Data());
+  AliDebug(1,Form("Returned ok %s",dir->String().Data()));
   retval = dir->String();
   return retval;
 }

diff --git a/ANALYSIS/AliReaderAOD.cxx b/ANALYSIS/AliReaderAOD.cxx
index aaeda4118ccae0db4317aede902b95ce13d90532..234f8dc03b3fd6f267f19a11ceab6ce312febb11 100644 (file)
--- a/ANALYSIS/AliReaderAOD.cxx
+++ b/ANALYSIS/AliReaderAOD.cxx
@@ -1,4 +1,20 @@
-#include "AliReaderAOD.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$ */
+
 //______________________________________________________________________________
 ////////////////////////////////////////////////////////////////////////////////
 //                                                                            //
@@ -22,19 +38,22 @@
 //                                                                            //
 ////////////////////////////////////////////////////////////////////////////////
 
-ClassImp(AliReaderAOD)
 
 #include <TError.h>
 #include <TFile.h>
 #include <TTree.h>
 #include <TH1.h>
-#include "AliAOD.h"
 
+#include "AliAOD.h"
+#include "AliLog.h"
+#include "AliReaderAOD.h"
 
 const TString AliReaderAOD::fgkTreeName("TAOD");
 const TString AliReaderAOD::fgkReconstructedDataBranchName("reconstructed.");
 const TString AliReaderAOD::fgkSimulatedDataBranchName("simulated.");
 
+ClassImp(AliReaderAOD)
+
 AliReaderAOD::AliReaderAOD(const Char_t* aodfilename):
  fFileName(aodfilename),
  fReadSim(kFALSE),
@@ -312,11 +331,8 @@ Int_t AliReaderAOD::OpenFile(Int_t n)
  const TString dirname = GetDirName(n);
  if (dirname == "")
   {
-    if (AliVAODParticle::GetDebug() > 2 )
-      {
-        Info("OpenFile","Got empty string as a directory name."); 
-      }
-   return 1;
+    AliDebug(3,"Got empty string as a directory name."); 
+    return 1;
   }
  
  TString filename = dirname +"/"+ fFileName;
@@ -339,10 +355,7 @@ Int_t AliReaderAOD::OpenFile(Int_t n)
  fTree = dynamic_cast<TTree*>(fFile->Get(fgkTreeName));
  if (fTree == 0x0)
   {
-    if (AliVAODParticle::GetDebug() > 2 )
-      {
-        Info("ReadNext","Can not find TTree object named %s",fgkTreeName.Data());
-      }
+    AliDebug(3,Form("Can not find TTree object named %s",fgkTreeName.Data()));
     delete fFile;
     fFile = 0x0;
     return 4;

diff --git a/ANALYSIS/AliReaderESD.cxx b/ANALYSIS/AliReaderESD.cxx
index 3e44342a1564110c30c7272b8802e69e83d0bbfe..6c676394d793f7df08ae658c4396d2b1c9297ce5 100644 (file)
--- a/ANALYSIS/AliReaderESD.cxx
+++ b/ANALYSIS/AliReaderESD.cxx
@@ -1,4 +1,20 @@
-#include "AliReaderESD.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,30 +26,30 @@
 //                                                                  //
 //////////////////////////////////////////////////////////////////////
 
-#include <TPDGCode.h>
-#include <TString.h>
-#include <TObjString.h>
-#include <TTree.h>
 #include <TFile.h>
+#include <TGliteXmlEventlist.h>
+#include <TH1.h>
 #include <TKey.h>
+#include <TObjString.h>
+#include <TPDGCode.h>
 #include <TParticle.h>
-#include <TH1.h>
-
-#include <TGliteXmlEventlist.h>
-
-#include <AliRun.h>
-#include <AliRunLoader.h>
-#include <AliStack.h>
-#include <AliESDtrack.h>
-#include <AliKalmanTrack.h>
-#include <AliESD.h>
+#include <TString.h>
+#include <TTree.h>
 
-#include "AliAnalysis.h"
-#include "AliAODRun.h"
 #include "AliAOD.h"
 #include "AliAODParticle.h"
 #include "AliAODParticleCut.h"
+#include "AliAODRun.h"
+#include "AliAnalysis.h"
 #include "AliClusterMap.h"
+#include "AliESD.h"
+#include "AliESDtrack.h"
+#include "AliKalmanTrack.h"
+#include "AliLog.h"
+#include "AliReaderESD.h"
+#include "AliRun.h"
+#include "AliRunLoader.h"
+#include "AliStack.h"
 
 ClassImp(AliReaderESD)
 
@@ -155,8 +171,7 @@ Int_t AliReaderESD::ReadNext()
 //reads next event from fFile
   //fRunLoader is for reading Kine
   
-  if (AliVAODParticle::GetDebug())
-    Info("ReadNext","Entered");
+  AliDebug(1,"Entered");
     
   if (fEventSim == 0x0)  fEventSim = new AliAOD();
   if (fEventRec == 0x0)  fEventRec = new AliAOD();
@@ -182,10 +197,7 @@ Int_t AliReaderESD::ReadNext()
      AliESD* esd = dynamic_cast<AliESD*>(fFile->Get(esdname));
      if (esd == 0x0)
       {
-        if (AliVAODParticle::GetDebug() > 2 )
-          {
-            Info("ReadNext","Can not find AliESD object named %s",esdname.Data());
-          }
+        AliDebug(3,Form("Can not find AliESD object named %s",esdname.Data()));
         fCurrentDir++;
         delete fFile;//we have to assume there is no more ESD objects in the fFile
         fFile = 0x0;
@@ -278,10 +290,7 @@ Int_t AliReaderESD::ReadESDCentral(AliESD* esd)
      vertex->GetXYZ(vertexpos);
    }
    
-  if (AliVAODParticle::GetDebug() > 0)
-   {
-     Info("ReadESD","Primary Vertex is (%f,%f,%f)",vertexpos[0],vertexpos[1],vertexpos[2]);
-   }
+  AliDebug(1,Form("Primary Vertex is (%f,%f,%f)",vertexpos[0],vertexpos[1],vertexpos[2]));
    
   Info("ReadESD","Reading Event %d",fCurrentEvent);
 
@@ -299,8 +308,7 @@ Int_t AliReaderESD::ReadESDCentral(AliESD* esd)
      //if (esdtrack->HasVertexParameters() == kFALSE) 
      if ((esdtrack->GetStatus() & AliESDtrack::kITSrefit) == kFALSE)
       {
-        if (AliVAODParticle::GetDebug() > 2) 
-          Info("ReadNext","Particle skipped: Data at vertex not available.");
+        AliDebug(3,Form("Particle skipped: Data at vertex not available."));
         continue;
       }
 
@@ -308,16 +316,14 @@ Int_t AliReaderESD::ReadESDCentral(AliESD* esd)
       {
        if ((esdtrack->GetStatus() & AliESDtrack::kTPCin) == kFALSE)
         {
-          if (AliVAODParticle::GetDebug() > 2) 
-            Info("ReadNext","Particle skipped: Was not reconstructed in TPC.");
+          AliDebug(3,"Particle skipped: Was not reconstructed in TPC.");
           continue;
         }
       }     
 
      if ((esdtrack->GetStatus() & AliESDtrack::kESDpid) == kFALSE) 
       {
-        if (AliVAODParticle::GetDebug() > 2) 
-          Info("ReadNext","Particle skipped: PID BIT is not set.");
+        AliDebug(3,"Particle skipped: PID BIT is not set.");
         continue;
       }
 
@@ -327,8 +333,7 @@ Int_t AliReaderESD::ReadESDCentral(AliESD* esd)
      esdtrack->GetConstrainedExternalParameters(extx,extp);
      if (extp[4] == 0.0)
       {
-        if (AliVAODParticle::GetDebug() > 2) 
-          Info("ReadNext","Track has 0 contrianed curvature -> Probobly parameters never updated. Skipping.");
+        AliDebug(3,"Track has 0 contrianed curvature -> Probobly parameters never updated. Skipping.");
         continue;
       } 
      esdtrack->GetESDpid(pidtable);
@@ -357,8 +362,7 @@ Int_t AliReaderESD::ReadESDCentral(AliESD* esd)
          {
            if(Rejected(p->GetPdgCode())) 
             {
-              if ( AliVAODParticle::GetDebug() > 5 )
-                Info("ReadNext","Simulated Particle PID (%d) did not pass the cut.",p->GetPdgCode());
+              AliDebug(6,Form("Simulated Particle PID (%d) did not pass the cut.",p->GetPdgCode()));
               continue; //check if we are intersted with particles of this type 
             }
          }  
@@ -374,14 +378,13 @@ Int_t AliReaderESD::ReadESDCentral(AliESD* esd)
      for (Int_t s=0; s<AliPID::kSPECIES; s++) rc+=concentr[s]*pidtable[s];
      if (rc==0.0) 
       {
-        if (AliVAODParticle::GetDebug() > 2) 
-          Info("ReadNext","Particle rejected since total bayessian PID probab. is zero.");
+        AliDebug(3,"Particle rejected since total bayessian PID probab. is zero.");
         continue;
       }
 
      for (Int_t s=0; s<AliPID::kSPECIES; s++) w[s]=concentr[s]*pidtable[s]/rc;
 
-     if (AliVAODParticle::GetDebug() > 4)
+     if (AliDebugLevel() > 4)
       { 
         Info("ReadNext","###########################################################################");
         Info("ReadNext","Momentum: %f %f %f",mom[0],mom[1],mom[2]);
@@ -400,7 +403,7 @@ Int_t AliReaderESD::ReadESDCentral(AliESD* esd)
            msg+=")";
          }
         Info("ReadNext","%s",msg.Data());
-      }//if (AliVAODParticle::GetDebug()>4)
+      }//if (AliDebugLevel()>4)
 
       AliTrackPoints* tpts = 0x0;
       if (fNTrackPoints > 0) 
@@ -453,15 +456,13 @@ Int_t AliReaderESD::ReadESDCentral(AliESD* esd)
         Float_t pp = w[s];
         if (pp == 0.0) 
          {
-           if ( AliVAODParticle::GetDebug() > 5 )
-             Info("ReadNext","Probability of being PID %d is zero. Continuing.",pdgcode);
+           AliDebug(6,Form("Probability of being PID %d is zero. Continuing.",pdgcode));
            continue;
          }
 
         if(Rejected(pdgcode)) 
          {
-           if ( AliVAODParticle::GetDebug() > 5 )
-             Info("ReadNext","PID (%d) did not pass the cut.",pdgcode);
+           AliDebug(6,Form("PID (%d) did not pass the cut.",pdgcode));
            continue; //check if we are intersted with particles of this type 
          }
 
@@ -482,8 +483,7 @@ Int_t AliReaderESD::ReadESDCentral(AliESD* esd)
         if(Rejected(track))//check if meets all criteria of any of our cuts
                        //if it does not delete it and take next good track
          { 
-           if ( AliVAODParticle::GetDebug() > 4 )
-             Info("ReadNext","Track did not pass the cut");
+           AliDebug(5,"Track did not pass the cut");
            delete track;
            continue;
          }
@@ -508,7 +508,7 @@ Int_t AliReaderESD::ReadESDCentral(AliESD* esd)
         if (particle) fEventSim->AddParticle(particle);
         keeppart = kTRUE;
 
-        if (AliVAODParticle::GetDebug() > 4 )
+        if (AliDebugLevel() > 4 )
          {
            Info("ReadNext","\n\nAdding Particle with incarnation %d",pdgcode);
            track->Print();
@@ -579,10 +579,8 @@ Int_t AliReaderESD::ReadESDMuon(AliESD* esd)
 
  Int_t nTracks = (Int_t)esd->GetNumberOfMuonTracks() ;
 
- if (AliVAODParticle::GetDebug() > 0) {
-   Info("ReadESD","Reading Event %d",fCurrentEvent);
-   Info("ReadESD","Found %d tracks.",nTracks);
- }
+ AliDebug(1,Form("Reading Event %d \nFound %d tracks.",fCurrentEvent,nTracks));
+
  // settings
   Float_t Chi2Cut = 100.;
   Float_t PtCutMin = 1.;

diff --git a/ANALYSIS/AliReaderESD.h b/ANALYSIS/AliReaderESD.h
index 1225e575cf6330f824da41746fa6ff5695a51774..4d0e73ec015e9498c87874e8f2f1b370f2883c7e 100644 (file)
--- a/ANALYSIS/AliReaderESD.h
+++ b/ANALYSIS/AliReaderESD.h
@@ -8,7 +8,7 @@
 // This reader reads tracks from Event Summary Data                        //
 // do not read particles                                                   //
 // 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    //
 //                                                                         //
 /////////////////////////////////////////////////////////////////////////////
 

diff --git a/ANALYSIS/AliReaderESDTree.cxx b/ANALYSIS/AliReaderESDTree.cxx
index 9fe73220555f9486c4518830293deeb8ea43f0a9..5fc641180e4af12edd24917a02df130204e9c67a 100644 (file)
--- a/ANALYSIS/AliReaderESDTree.cxx
+++ b/ANALYSIS/AliReaderESDTree.cxx
@@ -1,4 +1,20 @@
-#include "AliReaderESDTree.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$ */
+
 //_______________________________________________________________________
 /////////////////////////////////////////////////////////////////////////
 //
@@ -14,12 +30,12 @@
 #include <TTree.h>
 #include <TFile.h>
 
-
-#include <AliRun.h>
-#include <AliRunLoader.h>
-
-#include <AliESD.h>
 #include "AliAOD.h"
+#include "AliESD.h"
+#include "AliLog.h"
+#include "AliReaderESDTree.h"
+#include "AliRun.h"
+#include "AliRunLoader.h"
 
 ClassImp(AliReaderESDTree)
 
@@ -43,8 +59,7 @@ Int_t AliReaderESDTree::ReadNext()
 //reads next event from fFile
 //fRunLoader is for reading Kine
   
-  if (AliVAODParticle::GetDebug())
-    Info("ReadNext","Entered");
+  AliDebug(1,"Entered");
     
   if (fEventSim == 0x0)  fEventSim = new AliAOD();
   if (fEventRec == 0x0)  fEventRec = new AliAOD();
@@ -72,10 +87,7 @@ Int_t AliReaderESDTree::ReadNext()
 
       if (!status)
         {
-          if (AliVAODParticle::GetDebug() > 2 )
-            {
-              Info("ReadNext","Can not find event# %d in Tree", fCurrentEvent);
-            }
+          AliDebug(2,Form("Cannot find event# %d in Tree", fCurrentEvent));
           fCurrentDir++;
           delete fTree;
           fTree = 0x0;

diff --git a/ANALYSIS/AliRunAnalysis.cxx b/ANALYSIS/AliRunAnalysis.cxx
index c43763dd406b27c6046b9791216e6a627f33bb3d..e0e26df92ac99d24270ab71c17965be461903a27 100644 (file)
--- a/ANALYSIS/AliRunAnalysis.cxx
+++ b/ANALYSIS/AliRunAnalysis.cxx
@@ -1,4 +1,23 @@
+/**************************************************************************
+ * 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$ */
+
 #include "AliRunAnalysis.h"
+#include "AliLog.h"
+
 //________________________________
 ///////////////////////////////////////////////////////////
 //
@@ -58,30 +77,25 @@ Int_t AliRunAnalysis::Run()
 
  if (fReader == 0x0)
   {
-    Error("Run","Reader is not set");
+    AliError("Reader is not set");
     return 1;
   }
  TDirectory* cwd = gDirectory; 
  Int_t nanal = fAnalysies.GetEntries();
- if (AliVAODParticle::GetDebug()) Info("Run","There is %d analysies",nanal);
+ AliDebug(1,Form("There are %d analyses",nanal));
  /******************************/ 
  /*  Init Event                */ 
  /******************************/ 
- if (AliVAODParticle::GetDebug()) Info("Run","Intializing analyses...");
+ AliDebug(1,"Intializing analyses...");
  for (Int_t an = 0; an < nanal; an++)
   {   
-      if (AliVAODParticle::GetDebug()) Info("Run","Intializing analysis %d", an);
       AliAnalysis* analysis = (AliAnalysis*)fAnalysies.At(an);
-      if (AliVAODParticle::GetDebug()) 
-       { 
-         Info("Run","Intializing analysis %d address %#x", an, analysis);
-         Info("Run","Intializing analysis %d name %d", an, analysis->GetName());
-         Info("Run","Intializing analysis %d: Calling Init...", an);
-       } 
+      AliDebug(1,Form("Intializing analysis %d,address=%#x, name=%s", 
+                     an, analysis, analysis->GetName()));
       analysis->Init();
-      if (AliVAODParticle::GetDebug()) Info("Run","Intializing analysis %d: Calling Init... Done");
+      AliDebug(1,Form("Init done for analysis %d",an));
   }
- if (AliVAODParticle::GetDebug()) Info("Run","Intializing analyses... Done.");
+ AliDebug(1,"Intializing analyses... Done.");
   
  while (fReader->Next() == kFALSE)
   {
@@ -93,14 +107,14 @@ Int_t AliRunAnalysis::Run()
      /******************************/ 
      if ( Rejected(eventrec,eventsim) )
       {
-        if (AliVAODParticle::GetDebug()) Info("Run","Event rejected by Event Cut");
+        AliDebug(1,"Event rejected by Event Cut");
         continue; //Did not pass the 
       }
       
      /******************************/ 
      /*  Process Event             */ 
      /******************************/ 
-     if (AliVAODParticle::GetDebug())  Info("Run","There is %d analyses",fAnalysies.GetEntries());
+     AliDebug(1,Form("There is %d analyses",fAnalysies.GetEntries()));
      
      for (Int_t an = 0; an < fAnalysies.GetEntries(); an++)
       {
@@ -113,23 +127,17 @@ Int_t AliRunAnalysis::Run()
  /******************************/ 
  /*  Finish Event              */ 
  /******************************/ 
- if (AliVAODParticle::GetDebug()) Info("Run","Finishing analyses... ");
- if (AliVAODParticle::GetDebug()) Info("Run","There is %d anlyses",fAnalysies.GetEntries());
+ AliDebug(1,Form("Finishing analyses...\n There are %d anlyses",fAnalysies.GetEntries()));
  if (cwd) cwd->cd();
  for (Int_t an = 0; an < fAnalysies.GetEntries(); an++)
   {
-      if (AliVAODParticle::GetDebug()) Info("Run","Finishing analysis %d", an);
       AliAnalysis* analysis = (AliAnalysis*)fAnalysies.At(an);
-      if (AliVAODParticle::GetDebug()) 
-       { 
-         Info("Run","Finishing analysis %d address %#x", an, analysis);
-         Info("Run","Finishing analysis %d name %d", an, analysis->GetName());
-         Info("Run","Finishing analysis %d: Calling Finish...",an);
-       } 
+      AliDebug(1,Form("Calling Finish for analysis %d address %#x name=%s", 
+                     an, analysis,analysis->GetName()));
       analysis->Finish();
-      if (AliVAODParticle::GetDebug()) Info("Run","Finishing analysis %d: Calling Finish... Done");
+      AliDebug(1,Form("Called Finish for analysis %d",an));
   }
- if (AliVAODParticle::GetDebug()) Info("Run","Finishing done");
+ AliDebug(1,"Finishing done");
 
  return 0;   
 }

diff --git a/ANALYSIS/AliTrackPoints.cxx b/ANALYSIS/AliTrackPoints.cxx
index 5408d97048250e3168b2c05cd2fe2071331fd90d..0a2b5108edf281f8144ec438d0c458aeb4885259 100644 (file)
--- a/ANALYSIS/AliTrackPoints.cxx
+++ b/ANALYSIS/AliTrackPoints.cxx
@@ -1,4 +1,23 @@
+/**************************************************************************
+ * 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$ */
+
 #include "AliTrackPoints.h"
+#include "AliLog.h"
+
 //_________________________________
 ////////////////////////////////////////////////////////////
 //                                                        //
@@ -95,8 +114,7 @@ AliTrackPoints::AliTrackPoints(Int_t n, AliESDtrack* track, Float_t mf, Float_t
        ((track->GetStatus() & AliESDtrack::kTPCin) == kFALSE)  )
    {
      //could happend: its stand alone tracking
-     if (GetDebug() > 3) 
-       Warning("AliTrackPoints","This ESD track does not contain TPC information");
+     AliDebug(3,"This ESD track does not contain TPC information");
        
      fN = 0;
      delete [] fX;
@@ -203,11 +221,9 @@ void AliTrackPoints::MakePoints( Float_t dr, Float_t r0, Double_t x, Double_t* p
   Double_t r = TMath::Hypot(x,y);
   
 
-  if (GetDebug() > 9) 
-    Info("AliTrackPoints","Radius0 %f, Real Radius %f",r0,r); 
+  AliDebug(9,Form("Radius0 %f, Real Radius %f",r0,r)); 
   
-  if (GetDebug() > 5) 
-    Info("AliTrackPoints","Phi Global at first padraw %f, Phi locat %f",phi0global,phi0local);
+  AliDebug(5,Form("Phi Global at first padraw %f, Phi locat %f",phi0global,phi0local));
     
   Double_t eta = x*c - par[2] ;//par[2] = fX*C - eta; eta==fP2 ; C==fP4
   
@@ -232,14 +248,12 @@ void AliTrackPoints::MakePoints( Float_t dr, Float_t r0, Double_t x, Double_t* p
      Double_t ftmp = (c2*rc + cst1/rc)/cst2;
      if (ftmp > 1.0) 
       {
-        if (GetDebug() > 1) 
-          Warning("AliTrackPoints","ASin argument > 1 %f:",ftmp);
+        AliDebug(1,Form("ASin argument > 1 %f:",ftmp));
         ftmp=1.0;
       }
      else if (ftmp < -1.0) 
       {
-        if (GetDebug() > 1) 
-          Warning("AliTrackPoints","ASin argument < -1 %f:",ftmp);
+        AliDebug(1,Form("ASin argument < -1 %f:",ftmp));
         ftmp=-1.0;
       }
       
@@ -249,22 +263,19 @@ void AliTrackPoints::MakePoints( Float_t dr, Float_t r0, Double_t x, Double_t* p
      ftmp = (rc*rc-dcasq)/cst2;
      if (ftmp < 0.0) 
       {
-        if (GetDebug() > 1) 
-          Warning("AliTrackPoints","Sqrt argument < 0: %f",ftmp);
+        AliDebug(1,Form("Sqrt argument < 0: %f",ftmp));
         ftmp=0.0;
       }
      
      ftmp = c2*TMath::Sqrt(ftmp);
      if (ftmp > 1.0) 
       {
-        if (GetDebug() > 1) 
-          Warning("AliTrackPoints","ASin argument > 1: %f",ftmp);
+        AliDebug(1,Form("ASin argument > 1: %f",ftmp));
         ftmp=1.0;
       }
      else if (ftmp < -1.0) 
       {
-        if (GetDebug() > 1) 
-          Warning("AliTrackPoints","ASin argument < -1: %f",ftmp);
+        AliDebug(2,Form("ASin argument < -1: %f",ftmp));
         ftmp=-1.0;
       }
      Double_t factorZ = TMath::ASin(ftmp)*par[3]/c2;
@@ -272,11 +283,8 @@ void AliTrackPoints::MakePoints( Float_t dr, Float_t r0, Double_t x, Double_t* p
      fX[i] = rc*TMath::Cos(phi);
      fY[i] = rc*TMath::Sin(phi);
      
-     if ( GetDebug() > 2 )
-      {
-        Info("AliTrackPoints","X %f Y %f Z %f R asked %f R obtained %f",
-             fX[i],fY[i],fZ[i],rc,TMath::Hypot(fX[i],fY[i]));
-      }
+     AliDebug(3,Form("AliTrackPoints","X %f Y %f Z %f R asked %f R obtained %f",
+             fX[i],fY[i],fZ[i],rc,TMath::Hypot(fX[i],fY[i])));
    }
 }
 /***************************************************************/
@@ -316,11 +324,8 @@ void AliTrackPoints::MakeITSPointsInnerFromVertexOuterFromTPC(AliESDtrack* track
     fX[i] = x;
     fY[i] = y;
     fZ[i] = z;
-    if ( GetDebug() > 2 )
-      {
-         Info("MakeITSPoints","X %f Y %f Z %f R asked %f R obtained %f",
-                fX[i],fY[i],fZ[i],r[i],TMath::Hypot(fX[i],fY[i]));
-      }
+    AliDebug(3,Form("X %f Y %f Z %f R asked %f R obtained %f",
+                fX[i],fY[i],fZ[i],r[i],TMath::Hypot(fX[i],fY[i])));
   }   
  
  for (Int_t i = 3; i < 6; i++)
@@ -331,11 +336,8 @@ void AliTrackPoints::MakeITSPointsInnerFromVertexOuterFromTPC(AliESDtrack* track
     fX[i] = ax;
     fY[i] = ay;
     fZ[i] = az;
-    if ( GetDebug() > 2 )
-     {
-       Info("MakeITSPoints","X %f Y %f Z %f R asked %f R obtained %f",
-                fX[i],fY[i],fZ[i],r[i],TMath::Hypot(fX[i],fY[i]));
-     }
+    AliDebug(3,Form("X %f Y %f Z %f R asked %f R obtained %f",
+                fX[i],fY[i],fZ[i],r[i],TMath::Hypot(fX[i],fY[i])));
   }
  
 }
@@ -355,10 +357,8 @@ void AliTrackPoints::PositionAt(Int_t n, Float_t &x,Float_t &y,Float_t &z)
   x = fX[n];
   y = fY[n];
   z = fZ[n];
-  if ( GetDebug() > 1 )
-    {
-      Info("AliTrackPoints","n %d; X %f; Y %f; Z %f",n,x,y,z);
-    }
+  AliDebug(2,Form("n %d; X %f; Y %f; Z %f",n,x,y,z));
+
 }
 /***************************************************************/
 
@@ -380,7 +380,7 @@ Double_t AliTrackPoints::AvarageDistance(const AliTrackPoints& tr)
 //  Info("AvarageDistance","Entered");
   if ( (fN <= 0) || (tr.fN <=0) )
    {
-     if (GetDebug()) Warning("AvarageDistance","One of tracks is empty");
+     AliDebug(1,"One of tracks is empty");
      return -1;
    }
 
@@ -393,14 +393,9 @@ Double_t AliTrackPoints::AvarageDistance(const AliTrackPoints& tr)
   Double_t sum = 0;
   for (Int_t i = 0; i<fN; i++)
    {
-     if (GetDebug()>9)
-      {
+     AliDebug(10,Form("radii: %f %f",TMath::Hypot(fX[i],fY[i]),TMath::Hypot(tr.fX[i],tr.fY[i])));
 //       Float_t r1sq = fX[i]*fX[i]+fY[i]*fY[i];
 //       Float_t r2sq = tr.fX[i]*tr.fX[i]+tr.fY[i]*tr.fY[i];
-       Float_t r1sq = TMath::Hypot(fX[i],fY[i]);
-       Float_t r2sq = TMath::Hypot(tr.fX[i],tr.fY[i]);
-       Info("AvarageDistance","radii: %f %f",r1sq,r2sq);
-      } 
 
       
      Double_t dx = fX[i]-tr.fX[i];
@@ -408,19 +403,14 @@ Double_t AliTrackPoints::AvarageDistance(const AliTrackPoints& tr)
      Double_t dz = fZ[i]-tr.fZ[i];
      sum+=TMath::Sqrt(dx*dx + dy*dy + dz*dz);
      
-     if (GetDebug()>1)
-      {
-       Info("AvarageDistance","Diff: x ,y z: %f , %f, %f",dx,dy,dz);
-       Info("AvarageDistance","xxyyzz %f %f %f %f %f %f",
-            fX[i],tr.fX[i],fY[i],tr.fY[i],fZ[i],tr.fZ[i]);
-      } 
+     AliDebug(2,Form("Diff: x ,y z: %f , %f, %f",dx,dy,dz));
+     AliDebug(2,Form("xxyyzz %f %f %f %f %f %f",
+            fX[i],tr.fX[i],fY[i],tr.fY[i],fZ[i],tr.fZ[i]));
    }
    
   Double_t retval = sum/((Double_t)fN);
-  if ( GetDebug() )
-    {
-      Info("AvarageDistance","Avarage distance is %f.",retval);
-    }
+  AliDebug(1,Form("Avarage distance is %f.",retval));
+
   return retval;
 }
 /***************************************************************/

diff --git a/HBTAN/AliHBTAnalysis.h b/HBTAN/AliHBTAnalysis.h
index 850acfaf0facb3164f35a6089594a2774685ef36..7f0782738e58ca2890cb019a69cd440c6d0b7747 100644 (file)
--- a/HBTAN/AliHBTAnalysis.h
+++ b/HBTAN/AliHBTAnalysis.h
@@ -15,7 +15,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
 //
 ////////////////////////////////////////////////////////////////////////////
 //_________________________________________________________

diff --git a/HBTAN/AliHBTAnalysisStavinskyMixing.cxx b/HBTAN/AliHBTAnalysisStavinskyMixing.cxx
index 0eefa671874caf15564a4bc6aa4dedc2faa352db..3c920669d9e1f7a4a360a60cb4e6de209ff5421c 100644 (file)
--- a/HBTAN/AliHBTAnalysisStavinskyMixing.cxx
+++ b/HBTAN/AliHBTAnalysisStavinskyMixing.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
 //
 ////////////////////////////////////////////////////////////////////////////
 //_________________________________________________________

diff --git a/HBTAN/AliHBTAnalysisStavinskyMixing.h b/HBTAN/AliHBTAnalysisStavinskyMixing.h
index 11eb1c7336fa5dec8b593d9c46e9dcecaf97f2af..fa72ee56116607e0d53f0c26ed605954bbc10eae 100644 (file)
--- a/HBTAN/AliHBTAnalysisStavinskyMixing.h
+++ b/HBTAN/AliHBTAnalysisStavinskyMixing.h
@@ -11,7 +11,7 @@
 // mirrored momenta.
 //
 // 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
 //
 ////////////////////////////////////////////////////////////////////////////
 //_________________________________________________________

diff --git a/HBTAN/AliHBTCorrectOSLCorrelFctn.cxx b/HBTAN/AliHBTCorrectOSLCorrelFctn.cxx
index 958862d38befa658deea432c9c800022b773440f..b6f8ef0119d4d7bd49709e35d7592379b67416a3 100644 (file)
--- a/HBTAN/AliHBTCorrectOSLCorrelFctn.cxx
+++ b/HBTAN/AliHBTCorrectOSLCorrelFctn.cxx
@@ -1,4 +1,23 @@
+/**************************************************************************
+ * 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$ */
+
 #include "AliHBTCorrectOSLCorrelFctn.h"
+#include "AliLog.h"
+
 //____________________
 ///////////////////////////////////////////////////////
 //                                                   //
@@ -88,7 +107,7 @@ void AliHBTCorrectOSLCorrelFctn::BuildHistos(Int_t nxbins, Float_t xmax, Float_t
                     Int_t nzbins, Float_t zmax, Float_t zmin)
 {
 //build histograms
-  if (AliVAODParticle::GetDebug()>1) Info("BuildHistos","Enetered BuildHistos(...)");
+  AliDebug(1,"Entered");
   
   AliHBTFunction3D::BuildHistos(nxbins,xmax,xmin,nybins,ymax,ymin,nzbins,zmax,zmin);
   

diff --git a/HBTAN/AliHBTCorrectQInvCorrelFctn.cxx b/HBTAN/AliHBTCorrectQInvCorrelFctn.cxx
index b99f23f4f9f96fd80d6e70896e5b0bf96625b9c4..bf52f46332c196e0c4daed51be0474827a3367c8 100644 (file)
--- a/HBTAN/AliHBTCorrectQInvCorrelFctn.cxx
+++ b/HBTAN/AliHBTCorrectQInvCorrelFctn.cxx
@@ -11,7 +11,7 @@
 // implemented and described by Michael A. Lisa      //
 //                                                   //
 // Piotr.Skowronski@cern.ch                          //
-// http://alisoft.cern.ch/people/skowron/analyzer    //
+// http://aliweb.cern.ch/people/skowron/analyzer    //
 //                                                   //
 ///////////////////////////////////////////////////////
 

diff --git a/HBTAN/AliHBTFunction.cxx b/HBTAN/AliHBTFunction.cxx
index ed8841b5004c51a57d88874d39bb017f662e6afa..198041dbf8e0a4ef3323b133f41eb589605dfbae 100644 (file)
--- a/HBTAN/AliHBTFunction.cxx
+++ b/HBTAN/AliHBTFunction.cxx
@@ -1,6 +1,23 @@
+/**************************************************************************
+ * 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$ */
+
 #include "AliHBTFunction.h"
+#include "AliLog.h"
 
-/* $Id: */
 
 //--------------------------------------------------------------------
 //AliHBTFunction
@@ -72,10 +89,7 @@ AliHBTFunction::AliHBTFunction(const AliHBTFunction & source):
 AliHBTFunction::~AliHBTFunction()
 {
 //destructor  
-  if (AliVAODParticle::GetDebug() > 1)
-   {
-     Info("~AliHBTFunction","Deleting %s",GetName());
-   }
+  AliDebug(1,"Deleting");
   delete fPairCut;
 }
 /******************************************************************/
@@ -91,23 +105,23 @@ AliHBTFunction & AliHBTFunction::operator= (const AliHBTFunction & source)
 void AliHBTFunction::WriteFunction()
 {
 //writes result of the function to file
-   if (AliVAODParticle::GetDebug()) Info("AliHBTFunction","%s",GetName());
+   AliDebug(1,"Entering");
    if (fWriteNumAndDen)
     { 
-     if (AliVAODParticle::GetDebug()) Info("AliHBTFunction","Writing Num & Den");
+     AliDebug(1,"Writing Num & Den");
      if (GetNumerator()) GetNumerator()->Write();
      if (GetDenominator()) GetDenominator()->Write();
-     if (AliVAODParticle::GetDebug()) Info("AliHBTFunction","Writing Num & Den Done");
+     AliDebug(1,"Writing Num & Den Done");
     } 
-   if (AliVAODParticle::GetDebug()) Info("AliHBTFunction","Getting Result");
+   AliDebug(1,"Getting Result");
    TH1* res = GetResult();
-   if (AliVAODParticle::GetDebug()) Info("AliHBTFunction","Getting Result Done");
+   AliDebug(1,"Getting Result Done");
    
    if (res) 
     { 
-      if (AliVAODParticle::GetDebug()) Info("AliHBTFunction","Writing Result");
+      AliDebug(1,"Writing Result");
       res->Write();
-      if (AliVAODParticle::GetDebug()) Info("AliHBTFunction","Writing Result Done");
+      AliDebug(1,"Writing Result Done");
     }
 }
 /******************************************************************/
@@ -116,11 +130,11 @@ TH1* AliHBTFunction::GetRatio(Double_t normfactor)
  {
  //returns ratio of numerator and denominator
  //
-   if (AliVAODParticle::GetDebug()>0) Info("GetRatio","Norm. Factor is %f for %s",normfactor,GetName());
+   AliDebug(1,Form("Norm. Factor is %f for %s",normfactor,GetName()));
    
    if (normfactor == 0.0)
     {
-      Error("GetRatio","Scaling Factor is 0. Null poiner returned");
+      AliError("Scaling Factor is 0. Null poiner returned");
       return 0x0;
     }
    TString str = fName + " ratio";
@@ -147,7 +161,7 @@ void AliHBTFunction::SetPairCut(AliAODPairCut* cut)
 
  if(!cut) 
    {
-     Error("AliHBTFunction::SetPairCut","argument is NULL");
+     AliError("argument is NULL");
      return;
    }
  delete fPairCut;
@@ -210,14 +224,14 @@ void AliHBTFunction::InitFunction()
 {
 //Iniotializes fctn.: Resets histograms
 //In case histograms are not created in ctor, builds with default parameters
-  if (AliVAODParticle::GetDebug()>1) Info("InitFunction","%s",GetName());
+  AliDebug(1,"Entering");
   if ( !(GetNumerator()&&GetDenominator()) ) BuildHistos();
   GetNumerator()->Reset();
   GetDenominator()->Reset();
 
   GetNumerator()->SetDirectory(0x0);
   GetDenominator()->SetDirectory(0x0);
-  if (AliVAODParticle::GetDebug()>1) Info("InitFunction","Done");
+  AliDebug(1,"Done");
 }
 /******************************************************************/
 /******************************************************************/
@@ -365,30 +379,30 @@ Double_t AliHBTFunction1D::Scale(TH1D* num,TH1D* den)
  //Calculates the factor that should be used to scale 
  //quatience of num and den to 1 at tail
  
-  if (AliVAODParticle::GetDebug()>0) Info("Scale","Enetered Scale()");
+  AliDebug(1,"Entered");
   if(!num) 
    {
-     Error("Scale","No numerator");
+     AliError("No numerator");
      return 0.0;
    }
   if(!den) 
    {
-     Error("Scale","No denominator");
+     AliError("No denominator");
      return 0.0;
    }
   
   if(fNBinsToScale < 1) 
    {
-    Error("Scale","Number of bins for scaling is smaller thnan 1");
+    AliError("Number of bins for scaling is smaller than 1");
     return 0.0;
    }
   UInt_t nbins = num->GetNbinsX();
   if (fNBinsToScale > nbins) 
    {
-    Error("Scale","Number of bins for scaling is bigger thnan number of bins in histograms");
+    AliError("Number of bins for scaling is bigger thnan number of bins in histograms");
     return 0.0;
    }
-  if (AliVAODParticle::GetDebug()>0) Info("Scale","No errors detected");
+  AliDebug(1,"No errors detected");
 
   Double_t densum = 0.0;
   Double_t numsum = 0.0;
@@ -404,13 +418,12 @@ Double_t AliHBTFunction1D::Scale(TH1D* num,TH1D* den)
      }
    }
   
-  if(AliVAODParticle::GetDebug() > 0)
-    Info("Scale","numsum=%f densum=%f fNBinsToScaleX=%d",numsum,densum,fNBinsToScale);
+  AliDebug(1,Form("numsum=%f densum=%f fNBinsToScaleX=%d",numsum,densum,fNBinsToScale));
   
   if (numsum == 0) return 0.0;
   Double_t ret = densum/numsum;
 
-  if(AliVAODParticle::GetDebug() > 0) Info("Scale","returning %f",ret);
+  AliDebug(1,Form("returning %f",ret));
   return ret;
 } 
 
@@ -426,7 +439,7 @@ Double_t AliHBTFunction1D::Scale(TH1D* num,TH1D* den)
 // Base Calss for 2-dimensinal Functions             //
 //                                                   //
 // Piotr.Skowronski@cern.ch                          //
-// http://alisoft.cern.ch/people/skowron/analyzer    //
+// http://aliweb.cern.ch/people/skowron/analyzer    //
 //                                                   //
 ///////////////////////////////////////////////////////
 
@@ -549,38 +562,38 @@ Double_t AliHBTFunction2D::Scale()
 // Calculates the factor that should be used to scale 
 // quatience of fNumerator and fDenominator to 1 at 
 // given region
-  if (AliVAODParticle::GetDebug()>0) Info("Scale","Enetered Scale()");
+  AliDebug(1,"Entered");
   if(!fNumerator) 
    {
-     Error("Scale","No numerator");
+     AliError("No numerator");
      return 0.0;
    }
   if(!fDenominator) 
    {
-     Error("Scale","No denominator");
+     AliError("No denominator");
      return 0.0;
    }
   
   if( (fNBinsToScaleX < 1) || (fNBinsToScaleY < 1) ) 
    {
-    Error("Scale","Number of bins for scaling is smaller thnan 1");
+    AliError("Number of bins for scaling is smaller thnan 1");
     return 0.0;
    }
   UInt_t nbinsX = fNumerator->GetNbinsX();
   if (fNBinsToScaleX > nbinsX) 
    {
-    Error("Scale","Number of X bins for scaling is bigger thnan number of bins in histograms");
+    AliError("Number of X bins for scaling is bigger thnan number of bins in histograms");
     return 0.0;
    }
    
   UInt_t nbinsY = fNumerator->GetNbinsX();
   if (fNBinsToScaleY > nbinsY) 
    {
-    Error("Scale","Number of Y bins for scaling is bigger thnan number of bins in histograms");
+    AliError("Number of Y bins for scaling is bigger thnan number of bins in histograms");
     return 0.0;
    }
 
-  if (AliVAODParticle::GetDebug()>0) Info("Scale","No errors detected");
+  AliDebug(1,"No errors detected");
 
   Int_t offsetX = nbinsX - fNBinsToScaleX - 1; //bin that we start loop over bins in axis X
   Int_t offsetY = nbinsY - fNBinsToScaleY - 1; //bin that we start loop over bins in axis X
@@ -598,13 +611,13 @@ Double_t AliHBTFunction2D::Scale()
        }
      }
   
-  if(AliVAODParticle::GetDebug() > 0) 
-    Info("Scale","numsum=%f densum=%f fNBinsToScaleX=%d fNBinsToScaleY=%d",numsum,densum,fNBinsToScaleX,fNBinsToScaleY);
+  AliDebug(1,Form("numsum=%f densum=%f fNBinsToScaleX=%d fNBinsToScaleY=%d",
+                 numsum,densum,fNBinsToScaleX,fNBinsToScaleY));
   
   if (numsum == 0) return 0.0;
   Double_t ret = densum/numsum;
 
-  if(AliVAODParticle::GetDebug() > 0) Info("Scale","returning %f",ret);
+  AliDebug(1,Form("returning %f",ret));
   return ret;
 } 
 
@@ -620,7 +633,7 @@ Double_t AliHBTFunction2D::Scale()
 // Base Calss for 3-dimensinal Functions             //
 //                                                   //
 // Piotr.Skowronski@cern.ch                          //
-// http://alisoft.cern.ch/people/skowron/analyzer    //
+// http://aliweb.cern.ch/people/skowron/analyzer    //
 //                                                   //
 ///////////////////////////////////////////////////////
 
@@ -734,7 +747,7 @@ void AliHBTFunction3D::BuildHistos(Int_t nxbins, Float_t xmax, Float_t xmin,
 {
   //Builds numerator and denominator histograms (3d-case)
   
-   if (AliVAODParticle::GetDebug()>1) Info("BuildHistos","Enetered AliHBTFunction3D::BuildHistos(...)");
+   AliDebug(1,"Entered");
    
    if (fNumerator )
     {
@@ -770,45 +783,45 @@ Double_t AliHBTFunction3D::Scale()
   // Calculates the factor that should be used to scale 
   // quatience of fNumerator and fDenominator to 1 at 
   // given volume
-  if (AliVAODParticle::GetDebug()>0) Info("Scale","Enetered Scale()");
+  AliDebug(1,"Entered");
   if(!fNumerator) 
    {
-     Error("Scale","No numerator");
+     AliError("No numerator");
      return 0.0;
    }
   if(!fDenominator) 
    {
-     Error("Scale","No denominator");
+     AliError("No denominator");
      return 0.0;
    }
   
   if( (fNBinsToScaleX < 1) || (fNBinsToScaleY < 1) || (fNBinsToScaleZ < 1)) 
    {
-    Error("Scale","Number of bins for scaling is smaller thnan 1");
+    AliError("Number of bins for scaling is smaller thnan 1");
     return 0.0;
    }
   UInt_t nbinsX = fNumerator->GetNbinsX();
   if (fNBinsToScaleX > nbinsX) 
    {
-    Error("Scale","Number of X bins for scaling is bigger thnan number of bins in histograms");
+    AliError("Number of X bins for scaling is bigger thnan number of bins in histograms");
     return 0.0;
    }
    
   UInt_t nbinsY = fNumerator->GetNbinsX();
   if (fNBinsToScaleY > nbinsY) 
    {
-    Error("Scale","Number of Y bins for scaling is bigger thnan number of bins in histograms");
+    AliError("Number of Y bins for scaling is bigger thnan number of bins in histograms");
     return 0.0;
    }
 
   UInt_t nbinsZ = fNumerator->GetNbinsZ();
   if (fNBinsToScaleZ > nbinsZ) 
    {
-    Error("Scale","Number of Z bins for scaling is bigger thnan number of bins in histograms");
+    AliError("Number of Z bins for scaling is bigger thnan number of bins in histograms");
     return 0.0;
    }
 
-  if (AliVAODParticle::GetDebug()>0) Info("Scale","No errors detected");
+  AliDebug(1,"No errors detected");
 
   Int_t offsetX = nbinsX - fNBinsToScaleX - 1; //bin that we start loop over bins in axis X
   Int_t offsetY = nbinsY - fNBinsToScaleY - 1; //bin that we start loop over bins in axis Y
@@ -829,14 +842,13 @@ Double_t AliHBTFunction3D::Scale()
          }
        }
   
-  if(AliVAODParticle::GetDebug() > 0) 
-    Info("Scale","numsum=%f densum=%f fNBinsToScaleX=%d fNBinsToScaleY=%d fNBinsToScaleZ=%d",
-          numsum,densum,fNBinsToScaleX,fNBinsToScaleY,fNBinsToScaleZ);
+  AliDebug(1,Form("numsum=%f densum=%f fNBinsToScaleX=%d fNBinsToScaleY=%d fNBinsToScaleZ=%d",
+          numsum,densum,fNBinsToScaleX,fNBinsToScaleY,fNBinsToScaleZ));
   
   if (numsum == 0) return 0.0;
   Double_t ret = densum/numsum;
 
-  if(AliVAODParticle::GetDebug() > 0) Info("Scale","returning %f",ret);
+  AliDebug(1,Form("returning %f",ret));
   return ret;
 } 
 /******************************************************************/
@@ -868,7 +880,7 @@ void AliHBTFunction3D::SetNumberOfBinsToScale(UInt_t xn, UInt_t yn,UInt_t zn)
 // one pair to fill function                         //
 //                                                   //
 // Piotr.Skowronski@cern.ch                          //
-// http://alisoft.cern.ch/people/skowron/analyzer    //
+// http://aliweb.cern.ch/people/skowron/analyzer    //
 //                                                   //
 ///////////////////////////////////////////////////////
 
@@ -924,7 +936,7 @@ void AliHBTOnePairFctn1D::ProcessDiffEventParticles(AliHBTPair* pair)
 // one pair to fill function                         //
 //                                                   //
 // Piotr.Skowronski@cern.ch                          //
-// http://alisoft.cern.ch/people/skowron/analyzer    //
+// http://aliweb.cern.ch/people/skowron/analyzer    //
 //                                                   //
 ///////////////////////////////////////////////////////
 
@@ -992,7 +1004,7 @@ void AliHBTOnePairFctn2D::ProcessDiffEventParticles(AliHBTPair* pair)
 // one pair to fill function                         //
 //                                                   //
 // Piotr.Skowronski@cern.ch                          //
-// http://alisoft.cern.ch/people/skowron/analyzer    //
+// http://aliweb.cern.ch/people/skowron/analyzer    //
 //                                                   //
 ///////////////////////////////////////////////////////
 ClassImp( AliHBTOnePairFctn3D)
@@ -1066,7 +1078,7 @@ void AliHBTOnePairFctn3D::ProcessDiffEventParticles(AliHBTPair* pair)
 // to fill function                                  //
 //                                                   //
 // Piotr.Skowronski@cern.ch                          //
-// http://alisoft.cern.ch/people/skowron/analyzer    //
+// http://aliweb.cern.ch/people/skowron/analyzer    //
 //                                                   //
 ///////////////////////////////////////////////////////
 ClassImp(AliHBTTwoPairFctn1D)
@@ -1128,7 +1140,7 @@ void AliHBTTwoPairFctn1D::ProcessDiffEventParticles(AliHBTPair* trackpair, AliHB
 // to fill function                                  //
 //                                                   //
 // Piotr.Skowronski@cern.ch                          //
-// http://alisoft.cern.ch/people/skowron/analyzer    //
+// http://aliweb.cern.ch/people/skowron/analyzer    //
 //                                                   //
 ///////////////////////////////////////////////////////
 
@@ -1197,7 +1209,7 @@ void AliHBTTwoPairFctn2D::ProcessDiffEventParticles(AliHBTPair* trackpair, AliHB
 // to fill function                                  //
 //                                                   //
 // Piotr.Skowronski@cern.ch                          //
-// http://alisoft.cern.ch/people/skowron/analyzer    //
+// http://aliweb.cern.ch/people/skowron/analyzer    //
 //                                                   //
 ///////////////////////////////////////////////////////
 

diff --git a/HBTAN/AliHBTFunction.h b/HBTAN/AliHBTFunction.h
index 04e2466643bd198a3f9dc54574b81e7f32b10143..253f69703b193a89bf2e549f6c2810d757421d80 100644 (file)
--- a/HBTAN/AliHBTFunction.h
+++ b/HBTAN/AliHBTFunction.h
@@ -10,7 +10,7 @@
 // Abstract Base Calss for all the function classes  //
 //                                                   //
 // Piotr.Skowronski@cern.ch                          //
-// http://alisoft.cern.ch/people/skowron/analyzer    //
+// http://aliweb.cern.ch/people/skowron/analyzer    //
 //                                                   //
 ///////////////////////////////////////////////////////
 
@@ -111,7 +111,7 @@ class AliHBTCorrelFunction
 // one pair to fill function                         //
 //                                                   //
 // Piotr.Skowronski@cern.ch                          //
-// http://alisoft.cern.ch/people/skowron/analyzer    //
+// http://aliweb.cern.ch/people/skowron/analyzer    //
 //                                                   //
 ///////////////////////////////////////////////////////
 
@@ -147,7 +147,7 @@ class AliHBTOnePairFctn
 // Lednicky's algorithm uses that as well            //
 //                                                   //
 // Piotr.Skowronski@cern.ch                          //
-// http://alisoft.cern.ch/people/skowron/analyzer    //
+// http://aliweb.cern.ch/people/skowron/analyzer    //
 //                                                   //
 ///////////////////////////////////////////////////////
 
@@ -163,7 +163,7 @@ class AliHBTTwoPairFctn
     ProcessDiffEventParticles(AliHBTPair* trackpair, AliHBTPair* partpair) = 0;
     
     virtual void Init() = 0;
-    virtual void Write() = 0;
+    virtual void Write(const char* /*x1*/ = 0 , int/*x2*/ = 0, int /*x3*/ = 0) = 0;
     virtual const char* Name() = 0;
             
    ClassDef(AliHBTTwoPairFctn,2)
@@ -181,7 +181,7 @@ class AliHBTTwoPairFctn
 // Base Calss for 1-dimensinal Functions             //
 //                                                   //
 // Piotr.Skowronski@cern.ch                          //
-// http://alisoft.cern.ch/people/skowron/analyzer    //
+// http://aliweb.cern.ch/people/skowron/analyzer    //
 //                                                   //
 ///////////////////////////////////////////////////////
 
@@ -238,7 +238,7 @@ class AliHBTFunction1D: public AliHBTFunction
 // Base Calss for 2-dimensinal Functions             //
 //                                                   //
 // Piotr.Skowronski@cern.ch                          //
-// http://alisoft.cern.ch/people/skowron/analyzer    //
+// http://aliweb.cern.ch/people/skowron/analyzer    //
 //                                                   //
 ///////////////////////////////////////////////////////
  
@@ -309,7 +309,7 @@ class AliHBTFunction2D: public AliHBTFunction
 // one pair to fill function                         //
 //                                                   //
 // Piotr.Skowronski@cern.ch                          //
-// http://alisoft.cern.ch/people/skowron/analyzer    //
+// http://aliweb.cern.ch/people/skowron/analyzer    //
 //                                                   //
 ///////////////////////////////////////////////////////
 
@@ -390,7 +390,7 @@ class AliHBTFunction3D: public AliHBTFunction
 // one pair to fill function                         //
 //                                                   //
 // Piotr.Skowronski@cern.ch                          //
-// http://alisoft.cern.ch/people/skowron/analyzer    //
+// http://aliweb.cern.ch/people/skowron/analyzer    //
 //                                                   //
 ///////////////////////////////////////////////////////
 
@@ -428,7 +428,7 @@ class AliHBTOnePairFctn1D: public AliHBTOnePairFctn, public AliHBTFunction1D
 // one pair to fill function                         //
 //                                                   //
 // Piotr.Skowronski@cern.ch                          //
-// http://alisoft.cern.ch/people/skowron/analyzer    //
+// http://aliweb.cern.ch/people/skowron/analyzer    //
 //                                                   //
 ///////////////////////////////////////////////////////
 
@@ -470,7 +470,7 @@ class AliHBTOnePairFctn2D: public AliHBTOnePairFctn, public AliHBTFunction2D
 // one pair to fill function                         //
 //                                                   //
 // Piotr.Skowronski@cern.ch                          //
-// http://alisoft.cern.ch/people/skowron/analyzer    //
+// http://aliweb.cern.ch/people/skowron/analyzer    //
 //                                                   //
 ///////////////////////////////////////////////////////
 
@@ -515,7 +515,7 @@ class AliHBTOnePairFctn3D: public AliHBTOnePairFctn, public AliHBTFunction3D
 // to fill function                                  //
 //                                                   //
 // Piotr.Skowronski@cern.ch                          //
-// http://alisoft.cern.ch/people/skowron/analyzer    //
+// http://aliweb.cern.ch/people/skowron/analyzer    //
 //                                                   //
 ///////////////////////////////////////////////////////
 
@@ -554,7 +554,7 @@ class AliHBTTwoPairFctn1D: public AliHBTTwoPairFctn, public AliHBTFunction1D
 // to fill function                                  //
 //                                                   //
 // Piotr.Skowronski@cern.ch                          //
-// http://alisoft.cern.ch/people/skowron/analyzer    //
+// http://aliweb.cern.ch/people/skowron/analyzer    //
 //                                                   //
 ///////////////////////////////////////////////////////
 
@@ -599,7 +599,7 @@ class AliHBTTwoPairFctn2D: public AliHBTTwoPairFctn, public AliHBTFunction2D
 // to fill function                                  //
 //                                                   //
 // Piotr.Skowronski@cern.ch                          //
-// http://alisoft.cern.ch/people/skowron/analyzer    //
+// http://aliweb.cern.ch/people/skowron/analyzer    //
 //                                                   //
 ///////////////////////////////////////////////////////
 

diff --git a/HBTAN/AliHBTMonitorFunction.cxx b/HBTAN/AliHBTMonitorFunction.cxx
index e4f8a24b0dfb2d9e5886bfae317c3ed9535013a3..60019a9207ce0bd4f22b6da31665938ca9156951 100644 (file)
--- a/HBTAN/AliHBTMonitorFunction.cxx
+++ b/HBTAN/AliHBTMonitorFunction.cxx
@@ -1,4 +1,23 @@
+/**************************************************************************
+ * 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$ */
+
+#include "AliLog.h"
 #include "AliHBTMonitorFunction.h"
+
 //__________________________________________________________________
 ////////////////////////////////////////////////////////////////////
 //
@@ -91,7 +110,7 @@ void AliHBTMonitorFunction::Write()
 void AliHBTMonitorFunction::Init()
  {
    //Writes an function to disk
-   if (AliVAODParticle::GetDebug()>0) Info("Init","%s",GetName());
+   AliDebug(1,"Entering");
    
    if (GetResult() == 0x0)
     {
@@ -100,7 +119,7 @@ void AliHBTMonitorFunction::Init()
     }
    GetResult()->Reset();
    GetResult()->SetDirectory(0x0);
-   if (AliVAODParticle::GetDebug()>0) Info("Init","%s Done.",GetName());
+   AliDebug(1,"Done");
  }
 /******************************************************************/
 

diff --git a/HBTAN/AliHBTPIDPurityFctns.cxx b/HBTAN/AliHBTPIDPurityFctns.cxx
index 984d074ca2ae2f3952b89b0525ec68f76d4d2f36..20fda46bc81e36b46cc189cda6d81cadda9cbb0a 100644 (file)
--- a/HBTAN/AliHBTPIDPurityFctns.cxx
+++ b/HBTAN/AliHBTPIDPurityFctns.cxx
@@ -1,4 +1,23 @@
+/**************************************************************************
+ * 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$ */
+
 #include "AliHBTPIDPurityFctns.h"
+#include "AliLog.h"
+
 //_______________________________________________________________________________
 /////////////////////////////////////////////////////////////////////////////////
 //
@@ -75,11 +94,11 @@ void AliHBTMonPIDPurityVsPtFctn::Write()
 void AliHBTMonPIDPurityVsPtFctn::Init()
 {
 //Initializes fuction
-  if (AliVAODParticle::GetDebug()>0) Info("Init","%s",GetName());
+  AliDebug(1,"Entering");
 
   if (fResult == 0x0)
    {   
-      Warning("Init","Function has NULL result histogram!");
+      AliWarning("Function has NULL result histogram!");
       return;
    }
   
@@ -109,7 +128,7 @@ void AliHBTMonPIDPurityVsPtFctn::Init()
   fAll->SetDirectory(0x0);
   fAll->Sumw2();
 
-  if (AliVAODParticle::GetDebug()>0) Info("Init","%s Done.",GetName());
+  AliDebug(1,"Done");
 }
 
 /******************************************************************/
@@ -260,11 +279,11 @@ void AliHBTMonPIDContaminationVsPtFctn::Write()
 void AliHBTMonPIDContaminationVsPtFctn::Init()
 {
 //Initializes fuction
-  if (AliVAODParticle::GetDebug()>0) Info("Init","%s",GetName());
+  AliDebug(1,"Entering");
 
   if (fResult == 0x0)
    {   
-      Warning("Init","Function has NULL result histogram!");
+      AliWarning("Function has NULL result histogram!");
       return;
    }
   
@@ -293,7 +312,7 @@ void AliHBTMonPIDContaminationVsPtFctn::Init()
   fAll->SetDirectory(0x0);
   fAll->Sumw2();
   
-  if (AliVAODParticle::GetDebug()>0) Info("Init","%s Done.",GetName());
+  AliDebug(1,"Done");
 }
 
 /******************************************************************/

diff --git a/HBTAN/AliHBTPair.cxx b/HBTAN/AliHBTPair.cxx
index a9fc502a53ba6d9b448d5367443ce60d1ae712a4..9ba86ca5082a55449e602f24d63c276a4105fec0 100644 (file)
--- a/HBTAN/AliHBTPair.cxx
+++ b/HBTAN/AliHBTPair.cxx
@@ -7,7 +7,7 @@
 // class implements pair of particles and taking care of caluclation (almost)
 // all of pair properties (Qinv, InvMass,...)
 // 
-// more info: http://alisoft.cern.ch/people/skowron/analyzer/index.html
+// more info: http://aliweb.cern.ch/people/skowron/analyzer/index.html
 //
 ////////////////////////////////////////////////////////////////////////////
 

diff --git a/HBTAN/AliHBTPair.h b/HBTAN/AliHBTPair.h
index 745f0416fcc3c4f4b5e6b1baf2d599a7a3a92bad..5961da77c0da523de87d820ee358e2f78174d635 100644 (file)
--- a/HBTAN/AliHBTPair.h
+++ b/HBTAN/AliHBTPair.h
@@ -7,7 +7,7 @@
 //
 // class implements pair of particles and taking care of caluclation (almost)
 // all of pair properties (Qinv, InvMass,...)
-// more info: http://alisoft.cern.ch/people/skowron/analyzer/index.html
+// more info: http://aliweb.cern.ch/people/skowron/analyzer/index.html
 //
 ////////////////////////////////////////////////////////////////////////////