- enable tracklet simulation with TRAPconfig taken from OCDB object

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

diff --git a/TRD/AliTRDcalibDB.cxx b/TRD/AliTRDcalibDB.cxx
index b8133ac8899d837a67ff221de1d8ff1b44165a13..35eef807dfd1b3a0f5070c5cc740f9814d6fb890 100644 (file)
--- a/TRD/AliTRDcalibDB.cxx
+++ b/TRD/AliTRDcalibDB.cxx
@@ -1758,13 +1758,16 @@ AliTRDtrapConfig* AliTRDcalibDB::GetTrapConfig()
   if (fTrapConfig)
     return fTrapConfig;
   else {
-    // query the configuration to be used
-    TString configName;
-    this->GetGlobalConfiguration(configName);
-    TString configVersion;
-    this->GetGlobalConfigurationVersion(configVersion);
+    if ((fTrapConfigName.Length() <= 0) || (fTrapConfigVersion.Length() <= 0)) {
+      // query the configuration to be used
+      TString configName;
+      this->GetGlobalConfiguration(configName);
+      TString configVersion;
+      this->GetGlobalConfigurationVersion(configVersion);
+    }
 
-    this->LoadTrapConfig(configName, configVersion);
+    // try to load the requested configuration
+    this->LoadTrapConfig(fTrapConfigName, fTrapConfigVersion);
 
     // if we still don't have a valid TRAPconfig, create a default one
     if (!fTrapConfig) {