X-Git-Url: http://git.uio.no/git/?p=u%2Fmrichter%2FAliRoot.git;a=blobdiff_plain;f=TRD%2FAliTRDcalibDB.cxx;h=1b229dfff967e133ef5c0ef83ed312b02d272dda;hp=b8133ac8899d837a67ff221de1d8ff1b44165a13;hb=eecd219a7f070544d3fbeb3b72750ae6f6ed5ffc;hpb=3df58e28e8d33bb9d78f4847f62a8aea3cd35e70

diff --git a/TRD/AliTRDcalibDB.cxx b/TRD/AliTRDcalibDB.cxx
index b8133ac8899..1b229dfff96 100644
--- a/TRD/AliTRDcalibDB.cxx
+++ b/TRD/AliTRDcalibDB.cxx
@@ -37,8 +37,6 @@
 
 #include "AliTRDPIDReference.h"
 #include "AliTRDcalibDB.h"
-#include "AliTRDtrapConfig.h"
-#include "AliTRDtrapConfigHandler.h"
 #include "AliTRDCommonParam.h"
 
 #include "Cal/AliTRDCalROC.h"
@@ -111,7 +109,6 @@ AliTRDcalibDB::AliTRDcalibDB()
   ,fPRFpad(0)
   ,fPIDResponse(NULL)
   ,fOnlineGainTableID(0)
-  ,fTrapConfig(0x0)
 {
   //
   // Default constructor
@@ -143,7 +140,6 @@ AliTRDcalibDB::AliTRDcalibDB(const AliTRDcalibDB &c)
   ,fPRFpad(0)
   ,fPIDResponse(NULL)
   ,fOnlineGainTableID(0)
-  ,fTrapConfig(0x0)
 {
   //
   // Copy constructor (not that it make any sense for a singleton...)
@@ -307,9 +303,6 @@ const TObject *AliTRDcalibDB::GetCachedCDBObject(Int_t id)
     case kIDFEE : 
       return CacheCDBEntry(kIDFEE               ,"TRD/Calib/FEE"); 
       break;
-    case kIDTrapConfig :
-      return CacheCDBEntry(kIDFEE               ,"TRD/Calib/TrapConfig"); 
-      break;
     case kIDDCS :
       return CacheCDBEntry(kIDDCS               ,"TRD/Calib/DCS");
       break;
@@ -1750,57 +1743,3 @@ Int_t AliTRDcalibDB::PadResponse(Double_t signal, Double_t dist
 }
 
 
-AliTRDtrapConfig* AliTRDcalibDB::GetTrapConfig()
-{
-  // return an existing TRAPconfig or load it from the OCDB
-  // in case of failure, a default TRAPconfig is created
-
-  if (fTrapConfig)
-    return fTrapConfig;
-  else {
-    // query the configuration to be used
-    TString configName;
-    this->GetGlobalConfiguration(configName);
-    TString configVersion;
-    this->GetGlobalConfigurationVersion(configVersion);
-
-    this->LoadTrapConfig(configName, configVersion);
-
-    // if we still don't have a valid TRAPconfig, create a default one
-    if (!fTrapConfig) {
-      AliWarning("Falling back to default configuration");
-      fTrapConfig = new AliTRDtrapConfig("default", "default TRAP configuration");
-      AliTRDtrapConfigHandler cfgHandler(fTrapConfig);
-      cfgHandler.Init();
-      cfgHandler.LoadConfig();
-    }
-
-    AliInfo(Form("using TRAPconfig \"%s\"", fTrapConfig->GetTitle()));
-
-    return fTrapConfig;
-  }
-}
-
-
-AliTRDtrapConfig* AliTRDcalibDB::LoadTrapConfig(const TString &name, const TString &version)
-{
-  // try to load the specified configuration from the OCDB
-  // if it fails, or it does not exist, return null
-
-  AliInfo(Form("looking for TRAPconfig \"%s.%s\"", name.Data(), version.Data()));
-
-  const AliTRDCalTrapConfig *caltrap = dynamic_cast<const AliTRDCalTrapConfig*> (GetCachedCDBObject(kIDTrapConfig));
-
-  if (caltrap) {
-    TString configName(name);
-    configName.Append(".");
-    configName.Append(version);
-    fTrapConfig = caltrap->Get(configName);
-  }
-  else {
-    fTrapConfig = 0x0;
-    AliError("No TRAPconfig entry found!");
-  }
-
-  return fTrapConfig;
-}