Move sampling frequency to common params

[u/mrichter/AliRoot.git] / TRD / AliTRDCalibra.cxx

diff --git a/TRD/AliTRDCalibra.cxx b/TRD/AliTRDCalibra.cxx
index 94507ea95f8bda911d71799d8be07110645b09da..658cd0fed06f901d4fa1864a5f40fe9d692c6058 100644 (file)
--- a/TRD/AliTRDCalibra.cxx
+++ b/TRD/AliTRDCalibra.cxx
@@ -1825,15 +1825,20 @@ Bool_t AliTRDCalibra::Init2Dhistos()
 
   // DB Setting
   // Get cal
-  AliTRDcalibDB *cal = AliTRDcalibDB::Instance();
+  AliTRDcalibDB     *cal    = AliTRDcalibDB::Instance();
   if (!cal) {
     AliInfo("Could not get calibDB");
     return kFALSE;
   }
+  AliTRDCommonParam *parCom = AliTRDCommonParam::Instance();
+  if (!parCom) {
+    AliInfo("Could not get CommonParam");
+    return kFALSE;
+  }
 
   // Some parameters
   fTimeMax = cal->GetNumberOfTimeBins();
-  fSf      = cal->GetSamplingFrequency();
+  fSf      = parCom->GetSamplingFrequency();
   if (fRelativeScaleAuto) {
     fRelativeScale = 0;
   }
@@ -2520,9 +2525,6 @@ Bool_t AliTRDCalibra::IsPadOn(Int_t detector, Int_t col, Int_t row) const
     return kFALSE;
   }
   
-  Int_t npads  = 18;
-  Int_t colmcm = (Int_t) col / npads;
-  
   if (!cal->IsChamberInstalled(detector)     || 
        cal->IsChamberMasked(detector)        || 
        cal->IsPadMasked(detector,col,row)) {
@@ -3216,7 +3218,7 @@ Bool_t AliTRDCalibra::Create2DDiSimOnline(Int_t iev1, Int_t iev2)
 
   // Some parameters
   fTimeMax = cal->GetNumberOfTimeBins();
-  fSf      = (Float_t) cal->GetSamplingFrequency();
+  fSf      = (Float_t) parCom->GetSamplingFrequency();
   if (fRelativeScaleAuto) {
     fRelativeScale = 0;
   }
@@ -3523,7 +3525,7 @@ Bool_t AliTRDCalibra::Create2DRaDaOnline(Int_t iev1, Int_t iev2)
 
   // Some parameters
   fTimeMax = cal->GetNumberOfTimeBins();
-  fSf      = (Float_t) cal->GetSamplingFrequency();
+  fSf      = (Float_t) parCom->GetSamplingFrequency();
   if (fRelativeScaleAuto) {
     fRelativeScale = 0;
   }