From ab0a4106e63ed65ec002751b8fe010030f569407 Mon Sep 17 00:00:00 2001 From: cblume Date: Tue, 20 Dec 2005 07:03:55 +0000 Subject: [PATCH] Fix compiler problems --- TRD/AliTRDRecParam.cxx | 4 ++-- TRD/AliTRDSimParam.cxx | 4 ++-- TRD/AliTRDcalibDB.cxx | 12 +++++++----- TRD/AliTRDcalibDB.h | 18 +++++++++++------- 4 files changed, 22 insertions(+), 16 deletions(-) diff --git a/TRD/AliTRDRecParam.cxx b/TRD/AliTRDRecParam.cxx index 4cdae39f1fb..07f4bf4c0bd 100644 --- a/TRD/AliTRDRecParam.cxx +++ b/TRD/AliTRDRecParam.cxx @@ -80,7 +80,7 @@ AliTRDRecParam::AliTRDRecParam() fLUTbin = 0; Init(); -}; +} //_____________________________________________________________________________ AliTRDRecParam::~AliTRDRecParam() @@ -93,7 +93,7 @@ AliTRDRecParam::~AliTRDRecParam() delete [] fLUT; fLUT = 0; } -}; +} //_____________________________________________________________________________ AliTRDRecParam::AliTRDRecParam(const AliTRDRecParam &p):TObject(p) diff --git a/TRD/AliTRDSimParam.cxx b/TRD/AliTRDSimParam.cxx index 97b3c6443af..4190e6624b5 100644 --- a/TRD/AliTRDSimParam.cxx +++ b/TRD/AliTRDSimParam.cxx @@ -163,7 +163,7 @@ void AliTRDSimParam::Init() fTimeStructOn = kTRUE; ReInit(); -}; +} //_____________________________________________________________________________ AliTRDSimParam::~AliTRDSimParam() @@ -181,7 +181,7 @@ AliTRDSimParam::~AliTRDSimParam() delete [] fCTsmp; fCTsmp = 0; } -}; +} //_____________________________________________________________________________ AliTRDSimParam::AliTRDSimParam(const AliTRDSimParam &p):TObject(p) diff --git a/TRD/AliTRDcalibDB.cxx b/TRD/AliTRDcalibDB.cxx index 3f151f18416..8f289697dcf 100644 --- a/TRD/AliTRDcalibDB.cxx +++ b/TRD/AliTRDcalibDB.cxx @@ -106,7 +106,7 @@ AliTRDcalibDB::AliTRDcalibDB() fCDBCache[i] = 0; fCDBEntries[i] = 0; } -}; +} //_____________________________________________________________________________ AliTRDcalibDB::~AliTRDcalibDB() @@ -116,7 +116,7 @@ AliTRDcalibDB::~AliTRDcalibDB() // Invalidate(); -}; +} //_____________________________________________________________________________ void AliTRDcalibDB::SetRun(Long64_t run) @@ -258,7 +258,7 @@ Float_t AliTRDcalibDB::GetVdrift(Int_t det, Int_t col, Int_t row) return -1; return roc->GetValue(col, row); -}; +} //_____________________________________________________________________________ Float_t AliTRDcalibDB::GetT0(Int_t det, Int_t col, Int_t row) @@ -276,7 +276,7 @@ Float_t AliTRDcalibDB::GetT0(Int_t det, Int_t col, Int_t row) return -1; return roc->GetValue(col, row); -}; +} //_____________________________________________________________________________ Float_t AliTRDcalibDB::GetGainFactor(Int_t det, Int_t col, Int_t row) @@ -294,7 +294,7 @@ Float_t AliTRDcalibDB::GetGainFactor(Int_t det, Int_t col, Int_t row) return -1; return roc->GetValue(col, row); -}; +} //_____________________________________________________________________________ Float_t AliTRDcalibDB::GetSamplingFrequency() @@ -322,6 +322,7 @@ Int_t AliTRDcalibDB::GetNumberOfTimeBins() return -1; return calGlobal->GetNumberOfTimeBins(); + } //_____________________________________________________________________________ @@ -357,5 +358,6 @@ Float_t AliTRDcalibDB::GetOmegaTau(Float_t vdrift) + p3[ib] * vdrift*vdrift*vdrift; return TMath::Tan(alphaL); + } diff --git a/TRD/AliTRDcalibDB.h b/TRD/AliTRDcalibDB.h index 101cd318016..8ca0734f72d 100644 --- a/TRD/AliTRDcalibDB.h +++ b/TRD/AliTRDcalibDB.h @@ -91,15 +91,18 @@ protected: TObject* GetCachedCDBObject(Int_t id) { // - // Retrieves a cdb object with the given id. The objects are cached as long as the run number is not changed. + // Retrieves a cdb object with the given id. The objects are cached as long as the + // run number is not changed. // // Put together the available objects here by using the lines // a) For usual calibration objects: // ase kID : return CacheCDBEntry(kID, "TRD/Calib/"); break; // See function CacheCDBEntry for details. // and - // b) For calibration data which depends on two objects: One containing a value per detector and one the local fluctuations per pad: - // case kID : return CacheMergeCDBEntry(kID, "TRD/Calib/", "TRD/Calib/"); break; + // b) For calibration data which depends on two objects: One containing a value + // per detector and one the local fluctuations per pad: + // case kID : return CacheMergeCDBEntry(kID, "TRD/Calib/", + // "TRD/Calib/"); break; // See function CacheMergeCDBEntry for details. // @@ -177,10 +180,11 @@ TObject* AliTRDcalibDB::CacheCDBEntry(Int_t id, const char* cdbPath) TObject* AliTRDcalibDB::CacheMergeCDBEntry(Int_t id, const char* cdbPadPath, const char* cdbChamberPath) { // - // Retrieves and caches an object (id ) from the CDB. This function is specialized for parameters which are stored - // as local variation at pad level of a global variable defined per detector chamber. It uses the classes AliTRDCalPad and AliTRDCalDet. - // Before storing the object it retrieves the local variations (cdbPadPath) and the global variable (cdbChamberPath) and merges them using - // the AliTRDCalPad::ScaleROCs. + // Retrieves and caches an object (id ) from the CDB. This function is specialized + // for parameters which are stored as local variation at pad level of a global variable + // defined per detector chamber. It uses the classes AliTRDCalPad and AliTRDCalDet. + // Before storing the object it retrieves the local variations (cdbPadPath) and the + // global variable (cdbChamberPath) and merges them using the AliTRDCalPad::ScaleROCs. // if (!fCDBCache[id]) -- 2.43.0