modified

[u/mrichter/AliRoot.git] / TPC / AliTPCcalibDB.h

diff --git a/TPC/AliTPCcalibDB.h b/TPC/AliTPCcalibDB.h
index efcd006870bd8a4b4c3cf6bcc1bc146bb3803b30..e0c194818a7e6ebac2162d605833d5f073648a0e 100644 (file)
--- a/TPC/AliTPCcalibDB.h
+++ b/TPC/AliTPCcalibDB.h
@@ -20,6 +20,7 @@ class AliTPCExB;
 #include "AliTPCCalPad.h"
 #include "TString.h"
 #include "AliSplineFit.h"
+#include "TMap.h"
 
 class AliTPCSensorTempArray;
 class AliDCSSensorArray;
@@ -33,7 +34,6 @@ class AliTPCCalibVdrift;
 class AliGRPObject;
 class AliTPCCalibRaw;
 class AliTPCdataQA;
-class TMap;
 class AliMagF;
 class AliTPCcalibDButil;
 class AliCTPTimeParams;
@@ -61,7 +61,9 @@ class AliTPCcalibDB : public TObject
   void          SetExBField(Float_t bz);
   void          SetExBField( const AliMagF*   bmap);
   static AliTPCExB*    GetExB(Float_t bz,Bool_t bdelete);
-  AliTPCCalPad* GetPadGainFactor() const {return fPadGainFactor;}
+  AliTPCCalPad* GetPadGainFactorOld() const {return fPadGainFactor;}
+  AliTPCCalPad* GetPadGainFactor() const {return fActiveChannelMap;}
+  AliTPCCalPad* GetActiveChannelMap() const { return fActiveChannelMap; }
   AliTPCCalPad* GetDedxGainFactor() const {return fDedxGainFactor;}
   AliTPCCalPad* GetPadTime0() const {return fPadTime0;}
   AliTPCCalPad* GetDistortionMap(Int_t i) const;
@@ -81,6 +83,7 @@ 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* GetDDLMap()   const {return fALTROConfigData?static_cast<TMap*>(fALTROConfigData->FindObject("DDLArray")):0;}
   TMap* GetRCUconfig() const {return fALTROConfigData?(TMap*)(fALTROConfigData->FindObject("RCUconfig")):0;}
   Int_t GetRCUTriggerConfig() const;
   Bool_t IsTrgL0();
@@ -161,7 +164,7 @@ class AliTPCcalibDB : public TObject
   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;}
@@ -175,7 +178,7 @@ protected:
   AliCDBEntry* GetCDBEntry(const char* cdbPath);   
   Int_t        InitDeadMap();
 
-  Long64_t        fRun;         // current run number
+  Int_t        fRun;         // current run number
   AliTPCTransform *fTransform;      // object responsible for spacial corrections
   AliTPCExB *fExB;              // ExB correction factor
 //  AliCDBStorage* fLocator;      // Storage locator retrieved from AliCDBManager
@@ -183,6 +186,7 @@ protected:
   // calibration parameters per pad
   //
   AliTPCCalPad* fPadGainFactor;   // Gain calibration entry
+  AliTPCCalPad* fActiveChannelMap; // Map of active channels calculated on the fly
   AliTPCCalPad* fDedxGainFactor;   // Gain calibration entry - for dEdx
   AliTPCCalPad* fPadTime0;        // Time0 calibration entry
   TObjArray   *fDistortionMap;    // distortion map
@@ -198,7 +202,6 @@ protected:
   //
   //
   //
-  //
   AliTPCSensorTempArray* fTemperature; // Temperature calibration entry
   AliTPCAltroMapping **fMapping;   // Altro mapping   
   //
@@ -209,14 +212,14 @@ protected:
   //
   // Get the corssrun information
   //
-  TObjArray      fTimeGainSplinesArray; //! array Array of AliSplineFits: at 0 MIP position in time ; at 1 Fermi Plateau from cosmics
-  TObjArray      fGRPArray;                                                    //! array of GRPs  -  per run
-  TObjArray      fGRPMaps;                                                     //! array of GRPs maps  -  per run - old data  
-  TObjArray      fGoofieArray;                                 //! array of GOOFIE values -per run
-  TObjArray      fVoltageArray;                                        //! array of Chamber HV values -per run
-  TObjArray      fTemperatureArray;                    //! array of temperature sensors - per run
-  TObjArray      fVdriftArray;                                 //! array of v drift interfaces
-  TObjArray      fDriftCorrectionArray;                //! array of drift correction
+  TMap      fTimeGainSplinesArray; //! array Array of AliSplineFits: at 0 MIP position in time ; at 1 Fermi Plateau from cosmics
+  TMap      fGRPArray;                                                 //! array of GRPs  -  per run
+  TMap      fGRPMaps;                                                  //! array of GRPs maps  -  per run - old data  
+  TMap      fGoofieArray;                                      //! array of GOOFIE values -per run
+  TMap      fVoltageArray;                                     //! array of Chamber HV values -per run
+  TMap      fTemperatureArray;                 //! array of temperature sensors - per run
+  TMap      fVdriftArray;                                      //! array of v drift interfaces
+  TMap      fDriftCorrectionArray;                //! array of drift correction
 
   TArrayI        fRunList;                                                     //! run list - indicates try to get the run param
   Bool_t         fBHasAlignmentOCDB;                // Flag - alignment from the Transformation class
@@ -229,11 +232,11 @@ protected:
   AliCTPTimeParams *fCTPTimeParams;   //CTP timing parameters
   Int_t            fMode;             //RCU trigger config mode
 
-  ClassDef(AliTPCcalibDB, 0)
  private:
    AliTPCcalibDB (const AliTPCcalibDB& );
    AliTPCcalibDB& operator= (const AliTPCcalibDB& );
+  
+   ClassDef(AliTPCcalibDB, 0)
 };
 
-
 #endif