Coding conventions

[u/mrichter/AliRoot.git] / TRD / AliTRDcalibDB.h

diff --git a/TRD/AliTRDcalibDB.h b/TRD/AliTRDcalibDB.h
index 9942ea2044f26fb0b7e31ecc180a68957e76c948..ae68497b92d8ebdf98635d8f0a1423036854c580 100644 (file)
--- a/TRD/AliTRDcalibDB.h
+++ b/TRD/AliTRDcalibDB.h
@@ -15,18 +15,18 @@
 #include "TObject.h"
 #endif
 
-#ifndef ALITRDRECOPARAM_H
-#include "AliTRDrecoParam.h"
+#ifndef ALITRDPIDUTIL_H
+#include "AliTRDpidUtil.h"
 #endif
 
 class AliCDBEntry;
 
+class AliTRDrecoParam;
 class AliTRDCalPID;
 class AliTRDCalMonitoring;
 class AliTRDCalROC;
 class AliTRDCalDet;
 class AliTRDCalSingleChamberStatus;
-
 class AliTRDcalibDB : public TObject {
 
  public:
@@ -73,6 +73,7 @@ class AliTRDcalibDB : public TObject {
 
   Char_t                              GetPadStatus(Int_t det, Int_t col, Int_t row);
   AliTRDCalSingleChamberStatus       *GetPadStatusROC(Int_t det);
+  AliTRDrecoParam*                    GetRecoParam(Int_t *eventtype);
 
   Char_t                              GetChamberStatus(Int_t det);
 
@@ -85,17 +86,16 @@ class AliTRDcalibDB : public TObject {
   Bool_t                              IsChamberMasked(Int_t det);
 
   const AliTRDCalMonitoring          *GetMonitoringObject();
-  const AliTRDCalPID                 *GetPIDObject(AliTRDrecoParam::AliTRDpidMethod method);
+  const AliTRDCalPID                 *GetPIDObject(AliTRDpidUtil::ETRDPIDMethod m);
 
   // Related functions, these depend on calibration data
-  static Float_t                      GetOmegaTau(Float_t vdrift, Float_t bz);
          Int_t                        PadResponse(Double_t signal, Double_t dist
                                                 , Int_t layer, Double_t *pad) const;
-  
+
  protected:
 
   // For caching see also implentation of GetCachedCDBObject in the .cxx file
-  enum { kCDBCacheSize = 18 };   // Number of cached objects
+  enum { kCDBCacheSize = 19 };   // Number of cached objects
   enum { kIDVdriftPad = 0
        , kIDVdriftChamber
        , kIDT0Pad
@@ -111,6 +111,7 @@ class AliTRDcalibDB : public TObject {
        , kIDSuperModulePos
        , kIDPIDNN
        , kIDPIDLQ
+       , kIDRecoParam
        , kIDMonitoringData
        , kIDChamberStatus
        , kIDPadStatus };         // IDs of cached objects
@@ -145,7 +146,7 @@ class AliTRDcalibDB : public TObject {
   AliTRDcalibDB &operator=(const AliTRDcalibDB &c); 
   virtual ~AliTRDcalibDB();
 
-  ClassDef(AliTRDcalibDB,3)                         //  Provides central access to the CDB
+  ClassDef(AliTRDcalibDB, 4)                         //  Provides central access to the CDB
 
 };