X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;ds=sidebyside;f=PHOS%2FAliPHOSCalibrManager.cxx;h=26eb33403989e1e3e27e90159bbb148e53322bdb;hb=24f126079399620106ef944221d0d1ce3c4bbed2;hp=461743f83edf6c12955db38264a0e3a801e0dabb;hpb=e4778e0cb7d562ad374619ab98a29bfb0fa7e47d;p=u%2Fmrichter%2FAliRoot.git

diff --git a/PHOS/AliPHOSCalibrManager.cxx b/PHOS/AliPHOSCalibrManager.cxx
index 461743f83ed..26eb3340398 100644
--- a/PHOS/AliPHOSCalibrManager.cxx
+++ b/PHOS/AliPHOSCalibrManager.cxx
@@ -45,6 +45,7 @@
 #include <fstream> 
 
 // --- AliRoot header files ---
+#include "AliLog.h"  
 #include "AliPHOSConTableDB.h"
 #include "AliPHOSCalibrManager.h"
 #include "AliPHOSCalibrationData.h"
@@ -53,26 +54,41 @@ ClassImp(AliPHOSCalibrManager)
   
   AliPHOSCalibrManager * AliPHOSCalibrManager::fgCaMa = 0 ;
 //____________________________________________________________________________ 
-AliPHOSCalibrManager::AliPHOSCalibrManager():TNamed() 
+AliPHOSCalibrManager::AliPHOSCalibrManager() : 
+  fFileName(""),
+  fInputKind(0),
+  fctdb(0)
 {
   // default ctor: not to be used
-  fInputKind = 0 ;
-  fFileName= "" ;
-  fctdb = 0 ;
-  Fatal("Default constructor","Should not use") ;
+  AliFatal(Form("Should not be used")) ;
 }
 //____________________________________________________________________________ 
 AliPHOSCalibrManager::AliPHOSCalibrManager(const char* filename,const char * kind ):
-  TNamed("AliPHOSCalibrManager",filename){
+  TNamed("AliPHOSCalibrManager",filename),
+  fFileName(filename),
+  fInputKind(0),
+  fctdb(0)
+{
   if(strcmp(kind,"root")==0){
     fInputKind = 0 ;
   }
   else{
     fInputKind = 1 ;
   }
-  fFileName = filename;
-  fctdb = 0 ;
 } 
+
+//____________________________________________________________________________ 
+AliPHOSCalibrManager::AliPHOSCalibrManager(const AliPHOSCalibrManager & manager) : 
+  TNamed(manager), 
+  fFileName(""),
+  fInputKind(0),
+  fctdb(0)
+{
+  // cpy ctor: no need
+  // requested by the Coding Convention
+  Fatal("cpy ctor", "not implemented") ;
+}
+
 //____________________________________________________________________________ 
 AliPHOSCalibrManager::~AliPHOSCalibrManager()
 {
@@ -124,7 +140,7 @@ void AliPHOSCalibrManager::ReadFromASCII(AliPHOSCalibrationData &data){
   // where module is an array of 8*8 crystals and RR and CC are module raw and column position 
 
   if(!fctdb){
-    Error("ReadCalibrationParameters", "Specify Connections Table Database first") ;
+    AliError(Form("Specify Connections Table Database first")) ;
     return ;
   }
   
@@ -182,9 +198,10 @@ void AliPHOSCalibrManager::ReadFromRoot(AliPHOSCalibrationData & data)
   if(!file || !file->IsOpen())
     file = TFile::Open(fFileName) ;
   if(!file->IsOpen()){
-    Error("ReadFromRoot","Can not open file %s\n",fFileName.Data() ) ;
+    AliError(Form("Can not open file %s\n",fFileName.Data() )) ;
     return ;
   }
+
   AliPHOSCalibrationData * tmp = dynamic_cast<AliPHOSCalibrationData*>(file->Get(searchname) ) ;
   if(!tmp)
     Error("ReadFromRoot","there is no data %s in file %s",fFileName.Data(),fFileName.Data()) ;
@@ -221,7 +238,7 @@ void AliPHOSCalibrManager::WriteData(AliPHOSCalibrationData &data)
   if(!file || !file->IsOpen()){
     file = TFile::Open(fFileName,"UPDATE") ;
     if(!file->IsOpen()){
-      Error("WriteData","Can not open file %s\n",fFileName.Data() ) ;
+      AliError(Form("Can not open file %s\n",fFileName.Data() )) ;
       return ;
      }
   }