AliLog output

diff --git a/FMD/AliFMDDigitizer.cxx b/FMD/AliFMDDigitizer.cxx
index 08b23751d042aa71d2da0d104c8d8e499f7e370e..5f35ef5b7d58f5c462facb468f8ee2b81ae74643 100644 (file)
--- a/FMD/AliFMDDigitizer.cxx
+++ b/FMD/AliFMDDigitizer.cxx
@@ -34,6 +34,7 @@
 #include <TRandom.h>
 
 
+#include "AliLog.h"
 #include "AliFMDDigitizer.h"
 #include "AliFMD.h"
 #include "AliFMDhit.h"
@@ -63,9 +64,7 @@ AliFMDDigitizer::AliFMDDigitizer(AliRunDigitizer* manager)
 {
   // ctor which should be used
   //  fDebug =0;
-#ifdef DEBUG
-     Info("AliFMDDigitizer"," processed");
-#endif
+  AliDebug(1," processed");
 }
 
 //------------------------------------------------------------------------
@@ -104,9 +103,7 @@ void AliFMDDigitizer::Exec(Option_t * /*option*/)
   pOutFMD = outRL->GetLoader("FMDLoader");
 
 
-#ifdef DEBUG
-  Info("Hits2Digits Exec"," start...";
-#endif
+  AliDebug(1," start...");
 
 
   Int_t volume, sector, ring, charge;
@@ -131,7 +128,7 @@ void AliFMDDigitizer::Exec(Option_t * /*option*/)
 
   if (inRL == 0x0)
     {
-      Error("Exec","Can not find Run Loader for input stream 0");
+      AliError("Can not find Run Loader for input stream 0");
       return;
     }
 
@@ -141,7 +138,7 @@ void AliFMDDigitizer::Exec(Option_t * /*option*/)
 
   if (fFMD == 0x0)
    {
-     Error("Exec","Can not get FMD from gAlice");
+     AliError("Can not get FMD from gAlice");
      return;
    }
 // Loop over files to digitize
@@ -150,9 +147,7 @@ void AliFMDDigitizer::Exec(Option_t * /*option*/)
   for (Int_t inputFile=0; inputFile<nFiles;inputFile++) 
    {
 
-#ifdef DEBUG
-  Info(" Digitizing event number ",fManager->GetOutputEventNr()) ;
-#endif
+  AliDebug(1,Form(" Digitizing event number %d",fManager->GetOutputEventNr()));
  
     if (fFMD)
      {
@@ -172,7 +167,7 @@ void AliFMDDigitizer::Exec(Option_t * /*option*/)
       if (brHits) {
           fFMD->SetHitsAddressBranch(brHits);
       }else{
-        Fatal("Exec","EXEC Branch FMD hit not found");
+        AliFatal("Branch FMD hit not found");
       }
       TClonesArray *fFMDhits = fFMD->Hits ();
       

diff --git a/FMD/AliFMDDigitizer.h b/FMD/AliFMDDigitizer.h
index 3bd3d4876f016cc0d19b790150e8c55f2f6356d9..028d88c361c3be4588379404f7f2285b504287c7 100644 (file)
--- a/FMD/AliFMDDigitizer.h
+++ b/FMD/AliFMDDigitizer.h
@@ -21,7 +21,6 @@ class AliFMDDigitizer : public AliDigitizer {
   Int_t PutNoise(Int_t charge) {return (Int_t)(gRandom->Gaus(charge,500));}
   TClonesArray *Digits() const {return fDigits;}
   TClonesArray *Hits() const {return fHits;}
-   Bool_t GetDebug() const {return fManager->GetDebug();}
 
   
   enum {kBgTag = -1};

diff --git a/FMD/AliFMDv1.cxx b/FMD/AliFMDv1.cxx
index c171622e26172489011fbe5a35147a4df7851f7c..a0e4b2a71de9669c6cfbef9056edfecd4c9994f4 100644 (file)
--- a/FMD/AliFMDv1.cxx
+++ b/FMD/AliFMDv1.cxx
@@ -268,11 +268,11 @@ void AliFMDv1::CreateGeometry()
            
      //Granularity
     fSectorsSi1=20;
-    //    fRingsSi1=256*2;
-     fRingsSi1=3; // for drawing only
+        fRingsSi1=256*2;
+       //  fRingsSi1=3; // for drawing only
     fSectorsSi2=40;
-    //   fRingsSi2=128*2;
-       fRingsSi2=3; //for  drawing onl
+       fRingsSi2=128*2;
+       //   fRingsSi2=3; //for  drawing onl
     if(ifmd==1||ifmd==3)
       { 
         gMC->Gsdvn(nameSector, nameSi , fSectorsSi2, 2);