- enable tracklet simulation with TRAPconfig taken from OCDB object

  (via AliTRDcalibDB instead of AliTRDtrapConfigHandler)

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) {

diff --git a/TRD/AliTRDcalibDB.h b/TRD/AliTRDcalibDB.h
index 5a9db47e05c89bd35e918f811e398da3c8c65e67..ba1a40d4068d29d522bab2b40f094dd27d3dcad6 100644 (file)
--- a/TRD/AliTRDcalibDB.h
+++ b/TRD/AliTRDcalibDB.h
@@ -123,11 +123,14 @@ class AliTRDcalibDB : public TObject {
                                                 , Int_t layer, Double_t *pad) const;
 
   AliTRDtrapConfig*                   GetTrapConfig();
+  void                                GetTrapConfig(TString &name, TString &version) { name = fTrapConfigName; version = fTrapConfigVersion; }
+  void                                SetTrapConfig(const TString name, const TString version) { fTrapConfigName = name; fTrapConfigVersion = version; }
   void                                SetTrapConfig(AliTRDtrapConfig *trapcfg) { fTrapConfig = trapcfg; }
-  AliTRDtrapConfig*                   LoadTrapConfig(const TString &name = "", const TString &version = "");
 
  protected:
 
+  AliTRDtrapConfig*                   LoadTrapConfig(const TString &name = "", const TString &version = "");
+
   // For caching see also implentation of GetCachedCDBObject in the .cxx file
   enum { kIDVdriftPad = 0
        , kIDVdriftChamber
@@ -185,6 +188,8 @@ class AliTRDcalibDB : public TObject {
   Int_t                 fOnlineGainTableID;         //  ID for online gain table 
 
   AliTRDtrapConfig*     fTrapConfig;                //  TRAP configuration
+  TString               fTrapConfigName;            //  name of the TRAPconfig
+  TString               fTrapConfigVersion;         //  version of the TRAPconfig
   
  private:
 
@@ -193,7 +198,7 @@ class AliTRDcalibDB : public TObject {
   AliTRDcalibDB &operator=(const AliTRDcalibDB &c); 
   virtual ~AliTRDcalibDB();
 
-  ClassDef(AliTRDcalibDB, 7)                        //  Provides central access to the CDB
+  ClassDef(AliTRDcalibDB, 8)                        //  Provides central access to the CDB
 
 };
 

diff --git a/TRD/AliTRDfeeParam.cxx b/TRD/AliTRDfeeParam.cxx
index 61558d20f15da86037c53f9b18a10a87b7b0ce86..d5e90a7eb0d25c6bab3ae91e7b097d408d5b5da0 100644 (file)
--- a/TRD/AliTRDfeeParam.cxx
+++ b/TRD/AliTRDfeeParam.cxx
@@ -47,7 +47,7 @@ ClassImp(AliTRDfeeParam)
 
 AliTRDfeeParam *AliTRDfeeParam::fgInstance   = 0;
 Bool_t          AliTRDfeeParam::fgTerminated = kFALSE;
-Bool_t          AliTRDfeeParam::fgTracklet = kFALSE;
+Bool_t          AliTRDfeeParam::fgTracklet = kTRUE;
 
 //_____________________________________________________________________________
 AliTRDfeeParam* AliTRDfeeParam::Instance()

diff --git a/TRD/AliTRDmcmSim.cxx b/TRD/AliTRDmcmSim.cxx
index 15354e08abe2b3ec5d9e607abdce2b085aaf4cf5..89f1b4285101a313c89f0996a3d74d03c16d4c44 100644 (file)
--- a/TRD/AliTRDmcmSim.cxx
+++ b/TRD/AliTRDmcmSim.cxx
@@ -42,7 +42,7 @@
 #include "AliLoader.h"
 
 #include "AliTRDfeeParam.h"
-#include "AliTRDtrapConfigHandler.h"
+#include "AliTRDcalibDB.h"
 #include "AliTRDtrapConfig.h"
 #include "AliTRDdigitsManager.h"
 #include "AliTRDarrayADC.h"
@@ -137,7 +137,7 @@ void AliTRDmcmSim::Init( Int_t det, Int_t robPos, Int_t mcmPos, Bool_t /* newEve
 
   if (!fInitialized) {
     fFeeParam      = AliTRDfeeParam::Instance();
-    fTrapConfig    = AliTRDtrapConfigHandler::GetTrapConfig();
+    fTrapConfig    = AliTRDcalibDB::Instance()->GetTrapConfig();
   }
 
   fDetector      = det;

diff --git a/TRD/AliTRDtrapConfigHandler.cxx b/TRD/AliTRDtrapConfigHandler.cxx
index d0945547485e62b76b3ba7ca72201c3574513147..e6a60706a35c8d3250ea83e85c37ae5f7586a91d 100644 (file)
--- a/TRD/AliTRDtrapConfigHandler.cxx
+++ b/TRD/AliTRDtrapConfigHandler.cxx
@@ -45,8 +45,6 @@
 
 using namespace std;
 
-AliTRDtrapConfig* AliTRDtrapConfigHandler::fgActiveTrapConfig = 0x0;
-
 AliTRDtrapConfigHandler::AliTRDtrapConfigHandler(AliTRDtrapConfig *cfg) :
      ltuParam()
      , fRestrictiveMask((0x3ffff << 11) | (0x1f << 6) | 0x3f)

diff --git a/TRD/AliTRDtrapConfigHandler.h b/TRD/AliTRDtrapConfigHandler.h
index 68598be601a466b79597e8947ce931e909459a09..0e485e3fcf9f7c29fbd8aefd5611c182639e31c3 100644 (file)
--- a/TRD/AliTRDtrapConfigHandler.h
+++ b/TRD/AliTRDtrapConfigHandler.h
@@ -76,26 +76,6 @@ class AliTRDtrapConfigHandler : public TObject {
   AliTRDtrapConfig *fTrapConfig;           // pointer to TRAP config in use
   AliTRDCalOnlineGainTable fGtbl;          // gain table
 
-  // to be moved to AliTRDcalibDB:
-public:
-  static AliTRDtrapConfig* GetTrapConfig() {
-    if (fgActiveTrapConfig) {
-      printf("returning existing TRAP config\n");
-      return fgActiveTrapConfig;
-    }
-    else {
-      printf("creating new TRAP config\n");
-      fgActiveTrapConfig = new AliTRDtrapConfig();
-      AliTRDtrapConfigHandler cfgHandler(fgActiveTrapConfig);
-      cfgHandler.Init();
-      cfgHandler.LoadConfig();
-      return fgActiveTrapConfig;
-    }
-  }
-  // static void SetTrapConfig(AliTRDtrapConfig *trapcfg) { fgActiveTrapConfig = trapcfg; }
-protected:
-  static AliTRDtrapConfig* fgActiveTrapConfig;
-
   ClassDef(AliTRDtrapConfigHandler,0)
 };