X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=PHOS%2FAliPHOSCalibData.h;h=48866ddff1aec4849c6f62046fd4c79bac1a2a09;hb=39c725cf3672da992a6a603c99a2b21454792a14;hp=418785bedee6c7dffd51a9aca910a5ee91d63a97;hpb=1fdb1c5e59cfeb91f00ef26784c129843b0a881d;p=u%2Fmrichter%2FAliRoot.git

diff --git a/PHOS/AliPHOSCalibData.h b/PHOS/AliPHOSCalibData.h
index 418785bedee..48866ddff1a 100644
--- a/PHOS/AliPHOSCalibData.h
+++ b/PHOS/AliPHOSCalibData.h
@@ -15,6 +15,7 @@
 
 class AliPHOSEmcCalibData;
 class AliPHOSCpvCalibData;
+class AliPHOSEmcBadChannelsMap;
 class AliCDBMetaData;
 
 class AliPHOSCalibData: public TNamed {
@@ -24,12 +25,18 @@ class AliPHOSCalibData: public TNamed {
   AliPHOSCalibData(Int_t runNumber);
   AliPHOSCalibData(AliPHOSCalibData & phosCDB);
   virtual ~AliPHOSCalibData();
+
+  AliPHOSCalibData & operator = (const AliPHOSCalibData & rhs);
+
   void Reset();
   virtual void Print(Option_t *option = "") const; 
+
+  AliPHOSEmcCalibData *GetCalibDataEmc() const {return fCalibDataEmc;}
+  AliPHOSCpvCalibData *GetCalibDataCpv() const {return fCalibDataCpv;}
   
   void CreateNew();
-  void RandomEmc();
-  void RandomCpv();
+  void RandomEmc(Float_t ccMin=0.5   , Float_t ccMax=1.5);
+  void RandomCpv(Float_t ccMin=0.0009, Float_t ccMax=0.0015);
 
   Float_t GetADCchannelEmc(Int_t module, Int_t column, Int_t row) const;
   Float_t GetADCpedestalEmc(Int_t module, Int_t column, Int_t row) const;
@@ -43,21 +50,28 @@ class AliPHOSCalibData: public TNamed {
   void SetADCchannelCpv(Int_t module, Int_t column, Int_t row, Float_t value);
   void SetADCpedestalCpv(Int_t module, Int_t column, Int_t row, Float_t value);
 
+  Int_t  GetNumOfEmcBadChannels() const;
+  Bool_t IsBadChannelEmc(Int_t module, Int_t col, Int_t row) const; 
+  void   EmcBadChannelIds(Int_t *badIds=0); 
+
   void SetEmcDataPath(const char* emcPath) {fEmcDataPath=emcPath;}
   void SetCpvDataPath(const char* cpvPath) {fCpvDataPath=cpvPath;}
 
   Bool_t WriteEmc(Int_t firstRun, Int_t lastRun, AliCDBMetaData *md);
   Bool_t WriteCpv(Int_t firstRun, Int_t lastRun, AliCDBMetaData *md);
+  Bool_t WriteEmcBadChannelsMap(Int_t firstRun, Int_t lastRun, AliCDBMetaData *md);
 
  private:
 
   AliPHOSEmcCalibData* fCalibDataEmc; // EMC calibration data
   AliPHOSCpvCalibData* fCalibDataCpv; // CPV calibration data
+  AliPHOSEmcBadChannelsMap* fEmcBadChannelsMap; // EMC bad channels map
   
   TString fEmcDataPath; // path to EMC calibration data
   TString fCpvDataPath; // path to CPV calibration data
+  TString fEmcBadChannelsMapPath; // path to bad channels map
 
-  ClassDef(AliPHOSCalibData,2)    // PHOS Calibration data
+  ClassDef(AliPHOSCalibData,4)    // PHOS Calibration data
 };
 
 #endif