X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=TPC%2FAliTPCcalibDB.h;h=882e94b46ac6aada95deb46c8a7ac3c8aee41565;hb=253cab770f7d9d83273a87891ebd519029730e0a;hp=57507c645684ebacdc26b37cf32fcc4b1ab0eefc;hpb=2293155b791f4307fd27ee15e4d9af1519771e76;p=u%2Fmrichter%2FAliRoot.git

diff --git a/TPC/AliTPCcalibDB.h b/TPC/AliTPCcalibDB.h
index 57507c64568..882e94b46ac 100644
--- a/TPC/AliTPCcalibDB.h
+++ b/TPC/AliTPCcalibDB.h
@@ -37,6 +37,7 @@ class TMap;
 class AliMagF;
 class AliTPCcalibDButil;
 class AliCTPTimeParams;
+class AliTPCCorrection;
 //class AliCDBStorage;
 
 class AliTPCcalibDB : public TObject
@@ -55,17 +56,22 @@ class AliTPCcalibDB : public TObject
   //
   //
   //
-  AliTPCTransform* GetTransform() {return fTransform;}
-  AliTPCExB*    GetExB() {return fExB;}
+  AliTPCTransform* GetTransform() const {return fTransform;}
+  AliTPCExB*    GetExB() const {return fExB;}
   void          SetExBField(Float_t bz);
   void          SetExBField( const AliMagF*   bmap);
   static AliTPCExB*    GetExB(Float_t bz,Bool_t bdelete);
-  AliTPCCalPad* GetPadGainFactor() {return fPadGainFactor;}
-  AliTPCCalPad* GetDedxGainFactor() {return fDedxGainFactor;}
-  AliTPCCalPad* GetPadTime0() {return fPadTime0;}
-  AliTPCCalPad* GetDistortionMap(Int_t i) {return (fDistortionMap) ? (AliTPCCalPad*)fDistortionMap->At(i):0;}
-  AliTPCCalPad* GetPadNoise() {return fPadNoise;}
-  AliTPCCalPad* GetPedestals() {return fPedestals;}
+  AliTPCCalPad* GetPadGainFactor() const {return fPadGainFactor;}
+  AliTPCCalPad* GetDedxGainFactor() const {return fDedxGainFactor;}
+  AliTPCCalPad* GetPadTime0() const {return fPadTime0;}
+  AliTPCCalPad* GetDistortionMap(Int_t i) const;
+  AliTPCCorrection * GetTPCComposedCorrection() const { return fComposedCorrection;}
+  TObjArray * GetTPCComposedCorrectionArray() const { return fComposedCorrectionArray;}
+  void          SetTPCComposedCorrection(AliTPCCorrection *compCorr) { fComposedCorrection=compCorr;}
+  AliTPCCorrection * GetTPCComposedCorrection(Float_t field) const;
+
+  AliTPCCalPad* GetPadNoise() const {return fPadNoise;}
+  AliTPCCalPad* GetPedestals() const{return fPedestals;}
   //ALTRO config data
   TObjArray* GetAltroConfigData()  const {return fALTROConfigData;}
   AliTPCCalPad* GetALTROAcqStart() const {return fALTROConfigData?static_cast<AliTPCCalPad*>(fALTROConfigData->FindObject("AcqStart")):0;}
@@ -91,6 +97,7 @@ class AliTPCcalibDB : public TObject
   AliTPCCalPad* GetCEQmean()    const {return fCEData?static_cast<AliTPCCalPad*>(fCEData->FindObject("CEQmean")):0;}
   TObjArray*    GetCErocTtime() const {return fCEData?static_cast<TObjArray*>(fCEData->FindObject("rocTtime")):0;}
   TObjArray*    GetCErocQtime() const {return fCEData?static_cast<TObjArray*>(fCEData->FindObject("rocQtime")):0;}
+  TObjArray*    GetCEfitsDrift()const {return fCEData?static_cast<TObjArray*>(fCEData->FindObject("ceFitsDrift")):0;}
   TGraph*       GetCErocTgraph(const Int_t roc)const {return GetCErocTtime()?static_cast<TGraph*>(GetCErocTtime()->At(roc)):0;}
   TGraph*       GetCErocQgraph(const Int_t roc)const {return GetCErocQtime()?static_cast<TGraph*>(GetCErocQtime()->At(roc)):0;}
   static Float_t GetCEdriftTime(Int_t run, Int_t sector, Double_t timeStamp=-1., Int_t *entries=0);
@@ -100,11 +107,11 @@ class AliTPCcalibDB : public TObject
   //QA object
   AliTPCdataQA*   GetDataQA() const {return fDataQA;}
   //
-  AliTPCSensorTempArray* GetTemperature() {return fTemperature;}
-  AliTPCParam*  GetParameters(){return fParam;}
-  AliTPCAltroMapping ** GetMapping(){ return fMapping;}
-  AliTPCClusterParam *GetClusterParam(){ return fClusterParam;}
-  TObjArray *GetTimeGainSplines(){ return fTimeGainSplines;}  
+  AliTPCSensorTempArray* GetTemperature() const {return fTemperature;}
+  AliTPCParam*  GetParameters() const {return fParam;}
+  AliTPCAltroMapping ** GetMapping() const{ return fMapping;}
+  AliTPCClusterParam *GetClusterParam() const { return fClusterParam;}
+  TObjArray *GetTimeGainSplines() const { return fTimeGainSplines;}  
   //
   //GRP information
   static AliGRPObject * GetGRP(Int_t run);
@@ -118,7 +125,7 @@ class AliTPCcalibDB : public TObject
   static Float_t GetDCSSensorValue(AliDCSSensorArray *arr, Int_t timeStamp, const char * sensorName, Int_t sigDigits=-1);
   static Float_t GetDCSSensorMeanValue(AliDCSSensorArray *arr, const char * sensorName, Int_t sigDigits=-1);
   //Voltage information
-  static Float_t GetChamberHighVoltage(Int_t run, Int_t sector, Int_t timeStamp=-1, Int_t sigDigits=0);
+  static Float_t GetChamberHighVoltage(Int_t run, Int_t sector, Int_t timeStamp=-1, Int_t sigDigits=0, Bool_t current=kFALSE);
   static Float_t GetSkirtVoltage(Int_t run, Int_t sector, Int_t timeStamp=-1, Int_t sigDigits=0);
   static Float_t GetCoverVoltage(Int_t run, Int_t sector, Int_t timeStamp=-1, Int_t sigDigits=0);
   static Float_t GetGGoffsetVoltage(Int_t run, Int_t sector, Int_t timeStamp=-1, Int_t sigDigits=0);
@@ -153,6 +160,7 @@ class AliTPCcalibDB : public TObject
   //
   //
   
+  AliTPCCalPad* MakeDeadMap(Double_t notInMap=1, const char *nameMappingFile="$ALICE_ROOT/TPC/Calib/tpcMapping.root" );
   AliGRPObject * MakeGRPObjectFromMap(TMap *map);
   AliCTPTimeParams* GetCTPTimeParams() const {return fCTPTimeParams;}
   //Create a tree suited for diplaying with the AliTPCCalibViewerGUI
@@ -174,6 +182,8 @@ protected:
   AliTPCCalPad* fDedxGainFactor;   // Gain calibration entry - for dEdx
   AliTPCCalPad* fPadTime0;        // Time0 calibration entry
   TObjArray   *fDistortionMap;    // distortion map
+  AliTPCCorrection *fComposedCorrection;  // general space point corrections
+  TObjArray *      fComposedCorrectionArray; //space point corrections for different field setting
   AliTPCCalPad* fPadNoise;        // Noise calibration entry
   AliTPCCalPad* fPedestals;       // Pedestal calibration entry
   AliTPCCalibRaw *fCalibRaw;      // raw data calibration entry