X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=TPC%2FAliTPCcalibDB.h;h=af776f1bc34772d45c426f6e091da051005621a5;hb=8847ede185f01ffbc6e850dbd89e4dba493a96e0;hp=6530babcb026c1599e9c04a0b91bd24e11f012c2;hpb=0a997b33e21de52f8e23d08093dd16eae9b16d2c;p=u%2Fmrichter%2FAliRoot.git

diff --git a/TPC/AliTPCcalibDB.h b/TPC/AliTPCcalibDB.h
index 6530babcb02..af776f1bc34 100644
--- a/TPC/AliTPCcalibDB.h
+++ b/TPC/AliTPCcalibDB.h
@@ -19,6 +19,7 @@ class AliTPCExB;
 #include "TGraph.h"
 #include "AliTPCCalPad.h"
 #include "TString.h"
+#include "AliSplineFit.h"
 
 class AliTPCSensorTempArray;
 class AliDCSSensorArray;
@@ -31,8 +32,12 @@ class AliDCSSensorArray;
 class AliTPCCalibVdrift;
 class AliGRPObject;
 class AliTPCCalibRaw;
+class AliTPCdataQA;
 class TMap;
 class AliMagF;
+class AliTPCcalibDButil;
+class AliCTPTimeParams;
+class AliTPCCorrection;
 //class AliCDBStorage;
 
 class AliTPCcalibDB : public TObject
@@ -45,21 +50,27 @@ class AliTPCcalibDB : public TObject
   void   SetRun(Long64_t run);   
   void   Update();  //update entries
   void   UpdateRunInformations(Int_t run, Bool_t force=kFALSE);
+  void   UpdateNonRec();
   //
   Long64_t GetRun() const {return fRun;}
   //
   //
   //
-  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* 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;}
+  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;}
@@ -67,6 +78,12 @@ class AliTPCcalibDB : public TObject
   AliTPCCalPad* GetALTROFPED()     const {return fALTROConfigData?static_cast<AliTPCCalPad*>(fALTROConfigData->FindObject("FPED")):0;}
   AliTPCCalPad* GetALTROAcqStop()  const {return fALTROConfigData?static_cast<AliTPCCalPad*>(fALTROConfigData->FindObject("AcqStop")):0;}
   AliTPCCalPad* GetALTROMasked()   const {return fALTROConfigData?static_cast<AliTPCCalPad*>(fALTROConfigData->FindObject("Masked")):0;}
+  TMap* GetRCUconfig() const {return fALTROConfigData?(TMap*)(fALTROConfigData->FindObject("RCUconfig")):0;}
+  Int_t GetRCUTriggerConfig() const;
+  Bool_t IsTrgL0();
+  Bool_t IsTrgL1();
+    
+    
   //Pulser data
   TObjArray*    GetPulserData()  const {return fPulserData;}
   AliTPCCalPad* GetPulserTmean() const {return fPulserData?static_cast<AliTPCCalPad*>(fPulserData->FindObject("PulserTmean")):0;}
@@ -85,12 +102,14 @@ class AliTPCcalibDB : public TObject
   static Float_t GetCEchargeTime(Int_t run, Int_t sector, Double_t timeStamp=-1., Int_t *entries=0);
   //Raw calibration
   AliTPCCalibRaw* GetCalibRaw() const {return fCalibRaw;}
+  //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);
@@ -122,18 +141,30 @@ class AliTPCcalibDB : public TObject
   AliDCSSensorArray *     GetGoofieSensors(Int_t run);
   AliDCSSensorArray *     GetVoltageSensors(Int_t run);
   AliTPCCalibVdrift *     GetVdrift(Int_t run);
-	TObjArray *							GetTimeGainSplinesRun(Int_t run);
+  TObjArray *							GetTimeGainSplinesRun(Int_t run);
+  TObjArray*              GetTimeVdriftSplineRun(Int_t run);
   static Float_t GetGain(Int_t sector, Int_t row, Int_t pad);
   //
+  Double_t      GetVDriftCorrectionTime(Int_t timeStamp, Int_t run, Int_t side, Int_t mode);
+  Double_t      GetTime0CorrectionTime(Int_t timeStamp, Int_t run, Int_t side, Int_t mode);
+  Double_t      GetVDriftCorrectionGy(Int_t timeStamp, Int_t run, Int_t side, Int_t mode);
+  //
+  AliSplineFit* GetVdriftSplineFit(const char* name, Int_t run);
+  AliSplineFit* CreateVdriftSplineFit(const char* graphName, Int_t run);
+  //
   static void     CreateObjectList(const Char_t *filename, TObjArray *calibObjects);
   static void MakeTree(const char * fileName, TObjArray * array, const char * mapFileName = 0, AliTPCCalPad* outlierPad = 0, Float_t ltmFraction = 0.9);
   static void RegisterExB(Int_t index, Float_t bz, Bool_t bdelete);
   //
   //
-
+  
+  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
+  Bool_t CreateGUITree(const char* filename="");
   static Bool_t CreateGUITree(Int_t run, const char* filename="");
+  static Bool_t CreateRefFile(Int_t run, const char* filename="");
   //
 protected:
   
@@ -148,13 +179,20 @@ protected:
   AliTPCCalPad* fPadGainFactor;   // Gain calibration entry
   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
+  AliTPCdataQA  *fDataQA;         // qa object
   TObjArray *fALTROConfigData;    // ALTRO configuration data
   TObjArray *fPulserData;         // Calibration Pulser data
   TObjArray *fCEData;             // CE data
   //
+  //
+  //
+  //
   AliTPCSensorTempArray* fTemperature; // Temperature calibration entry
   AliTPCAltroMapping **fMapping;   // Altro mapping   
   //
@@ -179,6 +217,10 @@ protected:
   static AliTPCcalibDB* fgInstance;  // singleton control
   static Bool_t       fgTerminated;  // termination control 
   static TObjArray    fgExBArray;    // array of ExB corrections
+  AliTPCcalibDButil   *fDButil;       // utility class
+  //ctp info
+  AliCTPTimeParams *fCTPTimeParams;   //CTP timing parameters
+  
   ClassDef(AliTPCcalibDB, 0)
  private:
    AliTPCcalibDB (const AliTPCcalibDB& );