X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=PHOS%2FAliPHOSCalibrManager.h;h=ba5066095e504a01b1d4b10625943e995583a571;hb=90f906a785822a7b5033cb39a75ca3c3d1a66be2;hp=880f922dd332ebf745d38353943b47358caca31d;hpb=cd22852513da82b9c42377447842a71f3b6d8e42;p=u%2Fmrichter%2FAliRoot.git

diff --git a/PHOS/AliPHOSCalibrManager.h b/PHOS/AliPHOSCalibrManager.h
index 880f922dd33..ba5066095e5 100644
--- a/PHOS/AliPHOSCalibrManager.h
+++ b/PHOS/AliPHOSCalibrManager.h
@@ -24,34 +24,33 @@ class AliPHOSCalibrManager:public TNamed {
 
 public:
   AliPHOSCalibrManager() ;          // ctor
-  AliPHOSCalibrManager(const AliPHOSCalibrManager & manager) {
-    // cpy ctor: no need
-    // requested by the Coding Convention
-    Fatal("cpy ctor", "not implemented") ;
-  }
+  AliPHOSCalibrManager(const AliPHOSCalibrManager & manager);
  
   virtual ~AliPHOSCalibrManager() ; // dtor
   static AliPHOSCalibrManager * GetInstance() ;
-  static AliPHOSCalibrManager * GetInstance(const char * dbfilename ) ; 
+  static AliPHOSCalibrManager * GetInstance(const char * filename,const char * kind = "root" ) ; 
 
-  //To know correspondance when reads list of gains from ascii file 
-  void SetConTableDB(AliPHOSConTableDB * ctdb){fctdb = ctdb; }
+  void GetParameters(AliPHOSCalibrationData &data) ; 
+  
+  void SetConTable(AliPHOSConTableDB * ct){fctdb = ct ;}
 
-  //Read gains of pedestals from ascii file
-  void ReadFromASCII(AliPHOSCalibrationData & data,const char * filename = "gains.dat") ;
-
-  void ReadFromRoot(AliPHOSCalibrationData &data,Int_t run) ;
-
-  void WriteData(AliPHOSCalibrationData *data) ;
+  void WriteData(AliPHOSCalibrationData &data) ;
 
   AliPHOSCalibrManager & operator = (const AliPHOSCalibrManager & right) ;
 
 private:
-  AliPHOSCalibrManager(const char* filename) ;          
+  //Read gains of pedestals from ascii file
+  void ReadFromASCII(AliPHOSCalibrationData & data) ;
+
+  void ReadFromRoot(AliPHOSCalibrationData &data) ;
+
+  AliPHOSCalibrManager(const char* filename,const char * kind = "root") ;          
 
 private:
   TString   fFileName ;        //Name of file with calibration data
-  AliPHOSConTableDB * fctdb ;  //! Connection table of PHOS
+  Int_t     fInputKind;        //Kind of input to read/write data
+  AliPHOSConTableDB * fctdb ;  //Connection table used to read from ASCII file
+  
   static AliPHOSCalibrManager * fgCaMa ; // pointer to the unique instance of singleton