New data member in the common calibration class

diff --git a/TRD/AliTRDRecParam.cxx b/TRD/AliTRDRecParam.cxx
index 1226449d9e2b58486d75fd4fca1f27523868f027..3026c1ffc3f343041b048b7b9526f5821cf6b3ee 100644 (file)
--- a/TRD/AliTRDRecParam.cxx
+++ b/TRD/AliTRDRecParam.cxx
@@ -19,7 +19,7 @@
 //                                                                           //
 // Class containing constant reconstruction parameters                       //
 //                                                                           //
-// Request an instance with AliTRDRecParam::Instance()                 //
+// Request an instance with AliTRDRecParam::Instance()                       //
 // Then request the needed values                                            //
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
@@ -135,7 +135,9 @@ AliTRDRecParam &AliTRDRecParam::operator=(const AliTRDRecParam &p)
   // Assignment operator
   //
 
-  if (this != &p) ((AliTRDRecParam &) p).Copy(*this);
+  if (this != &p) {
+    ((AliTRDRecParam &) p).Copy(*this);
+  }
 
   return *this;
 

diff --git a/TRD/Cal/AliTRDCalGlobals.cxx b/TRD/Cal/AliTRDCalGlobals.cxx
index c2c3ed9d585d69696481508caf855cfd82d3110a..fccb64a92c084a5fb4edb35cab9cfa0c2e4e6493 100644 (file)
--- a/TRD/Cal/AliTRDCalGlobals.cxx
+++ b/TRD/Cal/AliTRDCalGlobals.cxx
@@ -29,6 +29,10 @@ ClassImp(AliTRDCalGlobals)
 AliTRDCalGlobals::AliTRDCalGlobals()
   :TNamed()
   ,fNumberOfTimeBins(0)
+  ,fTailCancelationTau1(0)
+  ,fTailCancelationTau2(0)
+  ,fTailCancelationAmp(0)
+  ,fPedestal(0)
 {
   //
   // AliTRDCalGlobals default constructor
@@ -40,6 +44,10 @@ AliTRDCalGlobals::AliTRDCalGlobals()
 AliTRDCalGlobals::AliTRDCalGlobals(const Text_t *name, const Text_t *title)
   :TNamed(name,title)
   ,fNumberOfTimeBins(0)
+  ,fTailCancelationTau1(0)
+  ,fTailCancelationTau2(0)
+  ,fTailCancelationAmp(0)
+  ,fPedestal(0)
 {
   //
   // AliTRDCalGlobals constructor

diff --git a/TRD/Cal/AliTRDCalGlobals.h b/TRD/Cal/AliTRDCalGlobals.h
index 9b9c7b0ebb96fe2554dba26c67f8721658fd59f1..cf943b568911eebd8c21e2f303064be15676e44c 100644 (file)
--- a/TRD/Cal/AliTRDCalGlobals.h
+++ b/TRD/Cal/AliTRDCalGlobals.h
@@ -13,23 +13,49 @@
 
 #include "TNamed.h"
 
+class TString;
+
 class AliTRDCalGlobals : public TNamed {
 
  public:
 
   AliTRDCalGlobals();
   AliTRDCalGlobals(const Text_t *name, const Text_t *title);
-  virtual ~AliTRDCalGlobals() {};
+  virtual ~AliTRDCalGlobals() { };
     
-  void    SetNumberOfTimeBins(Int_t value)   { fNumberOfTimeBins = value; };
-  Int_t   GetNumberOfTimeBins() const        { return fNumberOfTimeBins;  };
-  
+  void    SetNumberOfTimeBins(Int_t value)   { fNumberOfTimeBins    = value; }
+  void    SetTailCancelationTau1(Int_t tau1) { fTailCancelationTau1 = tau1;  }
+  void    SetTailCancelationTau2(Int_t tau2) { fTailCancelationTau2 = tau2;  }
+  void    SetTailCancelationAmp(Int_t amp)   { fTailCancelationAmp  = amp;   }
+  void    SetPedestal(Int_t ped)             { fPedestal            = ped;   }
+  void    SetADCClockphase(Float_t cp)       { fADCClockphase       = cp;    }
+  void    SetConfigID(TString id)            { fConfigID            = id;    }
+  void    SetGainTableID(TString id)         { fGainTableID         = id;    }
+  void    SetPretriggerConf(TString conf)    { fPretriggerConf      = conf;  }
+
+  Int_t   GetNumberOfTimeBins() const        { return fNumberOfTimeBins;     }
+  Int_t   GetTailCancelationTau1() const     { return fTailCancelationTau1;  }
+  Int_t   GetTailCancelationTau2() const     { return fTailCancelationTau2;  }
+  Int_t   GetTailCancelationAmp() const      { return fTailCancelationAmp;   }
+  Int_t   GetPedestal() const                { return fPedestal;             }
+  Float_t GetADCClockphase() const           { return fADCClockphase;        }
+  TString GetConfigID() const                { return fConfigID;             }
+  TString GetGainTableID() const             { return fGainTableID;          }
+  TString GetPretriggerConf() const          { return fPretriggerConf;       }
+
  protected:
 
-  Int_t   fNumberOfTimeBins;       // Number of timebins  
-    
-  ClassDef(AliTRDCalGlobals,2)     // TRD calibration class for global TRD parameters
+  Int_t   fNumberOfTimeBins;       //  Number of timebins  
+  Int_t   fTailCancelationTau1;    //  Tau1 of tail cancelation
+  Int_t   fTailCancelationTau2;    //  Tau2 of tail cancelation
+  Int_t   fTailCancelationAmp;     //  Amplitude of tail cancelation
+  Int_t   fPedestal;               //  Pedestal
+  Float_t fADCClockphase;          //  ADC clockphase in respect to TTC
+  TString fConfigID;               //  Configuration ID
+  TString fGainTableID;            //  Gain table ID
+  TString fPretriggerConf;         //  Pretrigger configuration
 
-};
+  ClassDef(AliTRDCalGlobals,3)     //  TRD calibration class for global TRD parameters
 
+};
 #endif

diff --git a/TRD/Cal/AliTRDCreateDummyCDB.C b/TRD/Cal/AliTRDCreateDummyCDB.C
index c46d25912dd21b243acd7473fda630137d55283a..657c3e0f73dc42f28aaa0f39550a1793c11d77c3 100644 (file)
--- a/TRD/Cal/AliTRDCreateDummyCDB.C
+++ b/TRD/Cal/AliTRDCreateDummyCDB.C
@@ -53,7 +53,6 @@ TObject* CreateGlobalsObject()
 {
   AliTRDCalGlobals *object = new AliTRDCalGlobals("Globals", "Global TRD calibration parameters");
 
-  object->SetSamplingFrequency(10.0);
   object->SetNumberOfTimeBins(22);
   
   return object;