Bug fix for Savannah entry 74517 (Jochen)

diff --git a/TRD/AliTRDgtuSim.cxx b/TRD/AliTRDgtuSim.cxx
index 89f8a43b1484ba5619b52b1d70ca17d12deda45b..a90c8c295694fac5d4684b537633d829951b6f90 100644 (file)
--- a/TRD/AliTRDgtuSim.cxx
+++ b/TRD/AliTRDgtuSim.cxx
@@ -39,6 +39,7 @@
 #include "AliESDTrdTrack.h"
 
 #include "AliTRDgtuSim.h"
+#include "AliTRDfeeParam.h"
 #include "AliTRDgtuTMU.h"
 #include "AliTRDtrackGTU.h"
 #include "AliTRDtrackletWord.h"
@@ -50,6 +51,7 @@ ClassImp(AliTRDgtuSim)
 AliTRDgtuSim::AliTRDgtuSim(AliRunLoader *rl) 
   : TObject(),
   fRunLoader(rl),
+  fFeeParam(AliTRDfeeParam::Instance()),
   fTMU(0x0),
   fTrackletArray(0x0),
   fTrackTree(0x0),
@@ -172,6 +174,9 @@ Bool_t AliTRDgtuSim::RunGTU(AliLoader *loader, AliESDEvent *esd)
   // run the GTU on tracklets taken from the loader
   // if specified the GTU tracks are written to the ESD event 
 
+  if (!fFeeParam->GetTracklet())
+    return kFALSE;
+
     if (!LoadTracklets(loader)) {
        AliError("Could not load the tracklets. Nothing done ...");
        return kFALSE;
@@ -244,6 +249,9 @@ Bool_t AliTRDgtuSim::LoadTracklets(AliLoader *const loader)
 
   AliDebug(1,"Loading tracklets ...");
 
+  if (!fFeeParam->GetTracklet())
+    return kFALSE;
+
   if (!loader) {
     AliError("No loader given!");
     return kFALSE;
@@ -418,7 +426,7 @@ Bool_t AliTRDgtuSim::WriteTracksToLoader()
   // these tracks contain more information than the ones in the ESD
 
   if (!fTrackTree) {
-    AliError("No track tree found!");
+    AliDebug(1, "No track tree found!");
     return kFALSE;
   }
 

diff --git a/TRD/AliTRDgtuSim.h b/TRD/AliTRDgtuSim.h
index e84ac9aca123610d9e4cf69d782ba6345138659c..fe5ad146d0bca94ae6e5b755f70cf1393bf38001 100644 (file)
--- a/TRD/AliTRDgtuSim.h
+++ b/TRD/AliTRDgtuSim.h
@@ -18,6 +18,7 @@ class AliLoader;
 class AliESDEvent;
 
 class AliTRDgtuTMU;
+class AliTRDfeeParam;
 class TTree;
 class TList;
 
@@ -40,6 +41,7 @@ class AliTRDgtuSim : public TObject {
 
  protected:
   AliRunLoader         *fRunLoader;    //!
+  AliTRDfeeParam *fFeeParam;    //!
   AliTRDgtuTMU         *fTMU;          // pointer to TMU simulation class
   TClonesArray         *fTrackletArray;        // array of tracklets
   TTree        *fTrackTree;    // tree to hold the tracks of one event, used for writing in WriteTracksToFile()