Reversing previous commit (Gines)

[u/mrichter/AliRoot.git] / MUON / AliMUONv1.cxx

diff --git a/MUON/AliMUONv1.cxx b/MUON/AliMUONv1.cxx
index d1da326056aff922a15dcc39929a7d62f57c22d0..e56042e3a02d6eb2c5f20b1b28c8e8872345ff57 100644 (file)
--- a/MUON/AliMUONv1.cxx
+++ b/MUON/AliMUONv1.cxx
@@ -38,7 +38,6 @@
 #include "AliMagF.h"
 #include "AliRun.h"
 #include "AliMC.h"
-#include "AliLog.h"
 
 ClassImp(AliMUONv1)
  
@@ -113,7 +112,7 @@ AliMUONv1::AliMUONv1(const AliMUONv1& right)
 {  
   // copy constructor (not implemented)
 
-  AliFatal("Copy constructor not provided.");
+  Fatal("AliMUONv1", "Copy constructor not provided.");
 }
 
 //___________________________________________
@@ -136,7 +135,7 @@ AliMUONv1& AliMUONv1::operator=(const AliMUONv1& right)
   // check assignement to self
   if (this == &right) return *this;
 
-  AliFatal("Assignement operator not provided.");
+  Fatal("operator =", "Assignement operator not provided.");
     
   return *this;  
 }    
@@ -169,7 +168,8 @@ void AliMUONv1::Init()
    // 
    // Initialize Tracking Chambers
    //
-   AliDebug(1,"Start Init for version 1 - CPC chamber type");
+
+   if(fDebug) printf("\n%s: Start Init for version 1 - CPC chamber type\n\n",ClassName());
    Int_t i;
    for (i=0; i<AliMUONConstants::NCh(); i++) {
        ( (AliMUONChamber*) (*fChambers)[i])->Init();
@@ -179,14 +179,14 @@ void AliMUONv1::Init()
    // Initialize geometry
    //
    fGeometryBuilder->InitGeometry();
-   AliDebug(1,"Finished Init for version 1 - CPC chamber type");
+   if(fDebug) printf("\n%s: Finished Init for version 1 - CPC chamber type\n",ClassName());
 
    //cp 
-   AliDebug(1,"Start Init for Trigger Circuits");
+   if(fDebug) printf("\n%s: Start Init for Trigger Circuits\n",ClassName());
    for (i=0; i<AliMUONConstants::NTriggerCircuit(); i++) {
      ( (AliMUONTriggerCircuit*) (*fTriggerCircuits)[i])->Init(i);
    }
-   AliDebug(1,"Finished Init for Trigger Circuits");
+   if(fDebug) printf("%s: Finished Init for Trigger Circuits\n",ClassName());
    //cp
 
    //
@@ -395,7 +395,7 @@ void AliMUONv1::StepManager()
       cerr << "   global position: "
            << x << ", " << y << ", " << z
            << endl;
-      AliWarning("DetElemId not identified.");
+      Warning("StepManager", "DetElemId not identified.");
     }  
     
     // One hit per chamber