coding convention

[u/mrichter/AliRoot.git] / PHOS / AliPHOSCalibrationDB.cxx

diff --git a/PHOS/AliPHOSCalibrationDB.cxx b/PHOS/AliPHOSCalibrationDB.cxx
index 7c766ee4933583d7382502612a96cada7c1900d9..672d75aa63e376d78c116b699b44c07f8b6b09dc 100644 (file)
--- a/PHOS/AliPHOSCalibrationDB.cxx
+++ b/PHOS/AliPHOSCalibrationDB.cxx
@@ -22,9 +22,8 @@
 //////////////////////////////////////////////////////////////////////////////
 
 // --- ROOT system ---
-#include "TFile.h"
+
 // --- Standard library ---
-#include <iostream.h>
 #include <fstream>
 
 // --- AliRoot header files ---
@@ -43,11 +42,11 @@ ClassImp(AliPHOSCalibrationDB)
   fctdb = 0 ;
 }
 //____________________________________________________________________________ 
-AliPHOSCalibrationDB::AliPHOSCalibrationDB(const char* filename ,const char * database):
+AliPHOSCalibrationDB::AliPHOSCalibrationDB(const char * database):
   TNamed("AliPHOSCalibrationDB",database){
   //Creates the containers: we prepare places for all channels in PHOS
 
-  AliPHOSGeometry * geom = AliPHOSGeometry::GetInstance("GPS2","") ;
+  AliPHOSGeometry * geom = AliPHOSGeometry::GetInstance("IHEP","") ;
   fNChannels = geom->GetNModules()*geom->GetNPhi()*geom->GetNZ()+
                geom->GetNumberOfCPVPadsZ()*geom->GetNumberOfCPVPadsPhi()*geom->GetNModules() ;
   //Note, that to avoid shifting AbsId each time we access data, we do not use
@@ -86,7 +85,7 @@ void  AliPHOSCalibrationDB::SetAll(Float_t pedestal, Float_t slope){
       fSlopes->AddAt(slope,i);
     }
   else
-    cout << "Please, create me with non-default constructor!" << endl;
+    Warning("SetAll", "Please, create me with non-default constructor!") ;
 }
 //____________________________________________________________________________
 void AliPHOSCalibrationDB::ReadCalibrationParameters(const char * filename, Option_t* opt){
@@ -94,7 +93,7 @@ void AliPHOSCalibrationDB::ReadCalibrationParameters(const char * filename, Opti
 
   if(strcmp(opt,"gains")==0){  //read gains
     if(!fctdb){
-      cout << "Specify Connections Table Database first" << endl ;
+      Error("ReadCalibrationParameters", "Specify Connections Table Database first") ;
       return ;
     }
     ifstream gainfile(filename) ; 
@@ -108,7 +107,7 @@ void AliPHOSCalibrationDB::ReadCalibrationParameters(const char * filename, Opti
   else
     if(strstr(opt,"pedest")){  //read pedestals
       if(!fctdb){
-       cout << "Specify Connections Table Database first" << endl ;
+       Error("ReadCalibrationParameters", "Specify Connections Table Database first") ;
        return ;
       }
       ifstream pfile(filename) ; 
@@ -120,9 +119,7 @@ void AliPHOSCalibrationDB::ReadCalibrationParameters(const char * filename, Opti
       pfile.close();
    }
    else{
-     cout << "Available options are " << endl ;
-     cout << " `gains' : to read gains " << endl ;
-     cout << " `pedestals : to read pedestals " << endl ;
+     Warning("ReadCalibrationParameters", "Available options are\n `gains' : to read gains\n `pedestals : to read pedestals ") ;
    }
 }
 //____________________________________________________________________________