From 4d011d8f71b595385e48d6a489ddf642d4c720cb Mon Sep 17 00:00:00 2001 From: cblume Date: Wed, 31 Jan 2007 15:44:18 +0000 Subject: [PATCH] New data member in the common calibration class --- TRD/AliTRDRecParam.cxx | 6 +++-- TRD/Cal/AliTRDCalGlobals.cxx | 8 +++++++ TRD/Cal/AliTRDCalGlobals.h | 42 +++++++++++++++++++++++++++------- TRD/Cal/AliTRDCreateDummyCDB.C | 1 - 4 files changed, 46 insertions(+), 11 deletions(-) diff --git a/TRD/AliTRDRecParam.cxx b/TRD/AliTRDRecParam.cxx index 1226449d9e2..3026c1ffc3f 100644 --- 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 c2c3ed9d585..fccb64a92c0 100644 --- 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 9b9c7b0ebb9..cf943b56891 100644 --- 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 c46d25912dd..657c3e0f73d 100644 --- 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; -- 2.43.0