X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=TRD%2FAliTRDcalibDB.h;h=449821aa614000baf21771a4a8f6e963d426cb3f;hb=970080e061cb908db64a5f31f39fa612a4620d43;hp=0f0669e7e20dc6f54c18ded5dcbc0ad642afafc2;hpb=eda91732d32da31e2d70876811be9680851ede8c;p=u%2Fmrichter%2FAliRoot.git

diff --git a/TRD/AliTRDcalibDB.h b/TRD/AliTRDcalibDB.h
index 0f0669e7e20..449821aa614 100644
--- a/TRD/AliTRDcalibDB.h
+++ b/TRD/AliTRDcalibDB.h
@@ -23,6 +23,9 @@
 #include "AliTRDPIDResponse.h"
 #endif
 
+#include "AliTRDCalTrapConfig.h"
+#include "AliTRDtrapConfig.h"
+
 class TString;
 
 class AliCDBEntry;
@@ -45,6 +48,13 @@ class AliTRDcalibDB : public TObject {
        , kNsector =  18
        , kNdet    = 540 };
   
+  enum { kFltrSet = 1
+       , kReadout
+       , kTimebin
+       , kTrkMode
+       , kTrigSet
+       , kAddOpti };
+
   static AliTRDcalibDB               *Instance();
   static void                         Terminate();
 
@@ -59,7 +69,7 @@ class AliTRDcalibDB : public TObject {
   Float_t                             GetVdriftAverage(Int_t det);
         AliTRDCalROC                 *GetVdriftROC(Int_t det);
   const AliTRDCalDet                 *GetVdriftDet();
-
+  TObjArray                          *GetPHQ();
   const AliTRDCalDet                 *GetExBDet();
 
   Float_t                             GetT0(Int_t det, Int_t col, Int_t row);
@@ -83,9 +93,14 @@ class AliTRDcalibDB : public TObject {
   Float_t                             GetPRFlo() const      { return fPRFlo;  };
   Float_t                             GetPRFhi() const      { return fPRFhi;  };
 
+  Int_t                               ExtractTimeBinsFromString(TString tbstr);
   Int_t                               GetNumberOfTimeBinsDCS();
   void                                GetFilterType(TString &filterType);
   void                                GetGlobalConfiguration(TString &config);
+  void                                GetGlobalConfigurationVersion(TString &version);
+  Int_t                               GetNumberOfParsDCS(TString cname, Char_t delimiter='_');
+  Int_t                               GetNumberOfOptsDCS(TString cname, Int_t cfgType);
+  void                                GetDCSConfigParOption(TString cname, Int_t cfgType, Int_t option, TString &cfgo);
 
   Int_t                               GetOnlineGainTableID();
 
@@ -109,6 +124,7 @@ class AliTRDcalibDB : public TObject {
   Bool_t                              IsChamberNoData(Int_t det);
   Bool_t                              IsHalfChamberNoData(Int_t det, Int_t side);
   Bool_t                              IsChamberBadCalibrated(Int_t det);
+  Bool_t                              IsChamberNotCalibrated(Int_t det);
 
   const AliTRDCalMonitoring          *GetMonitoringObject();
   const AliTRDCalPID                 *GetPIDObject(AliTRDpidUtil::ETRDPIDMethod m);
@@ -118,8 +134,15 @@ class AliTRDcalibDB : public TObject {
   Int_t                               PadResponse(Double_t signal, Double_t dist
                                                 , Int_t layer, Double_t *pad) const;
 
+  AliTRDtrapConfig*                   GetTrapConfig();
+  void                                GetTrapConfig(TString &name, TString &version) { name = fTrapConfigName; version = fTrapConfigVersion; }
+  void                                SetTrapConfig(const TString name, const TString version) { fTrapConfigName = name; fTrapConfigVersion = version; }
+  void                                SetTrapConfig(AliTRDtrapConfig *trapcfg) { fTrapConfig = trapcfg; }
+
  protected:
 
+  AliTRDtrapConfig*                   LoadTrapConfig(const TString &name = "", const TString &version = "");
+
   // For caching see also implentation of GetCachedCDBObject in the .cxx file
   enum { kIDVdriftPad = 0
        , kIDVdriftChamber
@@ -133,6 +156,7 @@ class AliTRDcalibDB : public TObject {
        , kIDNoisePad
        , kIDPRFWidth
        , kIDFEE
+       , kIDTrapConfig
        , kIDChamberPos
        , kIDStackPos
        , kIDSuperModulePos
@@ -145,6 +169,7 @@ class AliTRDcalibDB : public TObject {
        , kIDPadStatus
        , kIDDCS
        , kIDAttach
+       , kIDPHQ
        , kCDBCacheSize };         // IDs of cached objects
 
   const TObject *GetCachedCDBObject(Int_t id);
@@ -173,6 +198,10 @@ class AliTRDcalibDB : public TObject {
   AliTRDPIDResponse    *fPIDResponse;               //  TRD PID Response function
 
   Int_t                 fOnlineGainTableID;         //  ID for online gain table 
+
+  AliTRDtrapConfig*     fTrapConfig;                //  TRAP configuration
+  TString               fTrapConfigName;            //  name of the TRAPconfig
+  TString               fTrapConfigVersion;         //  version of the TRAPconfig
   
  private:
 
@@ -181,7 +210,7 @@ class AliTRDcalibDB : public TObject {
   AliTRDcalibDB &operator=(const AliTRDcalibDB &c); 
   virtual ~AliTRDcalibDB();
 
-  ClassDef(AliTRDcalibDB, 7)                        //  Provides central access to the CDB
+  ClassDef(AliTRDcalibDB, 8)                        //  Provides central access to the CDB
 
 };