X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=TRD%2FAliTRDgtuSim.cxx;h=e574afb58efca44f83b1b5d8c4fbbe7f06f01e32;hb=4ec650ac1817219804a6fa716bc842e93a263e22;hp=89f8a43b1484ba5619b52b1d70ca17d12deda45b;hpb=637666cd0aa1519c72e19f35a7d3d426d4ee74c5;p=u%2Fmrichter%2FAliRoot.git

diff --git a/TRD/AliTRDgtuSim.cxx b/TRD/AliTRDgtuSim.cxx
index 89f8a43b148..e574afb58ef 100644
--- 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),
@@ -140,7 +142,7 @@ Bool_t AliTRDgtuSim::RunGTUFromTrackletFile(TString filename, Int_t event, Int_t
 	}
 	for (Int_t i = 5; i < tokens->GetEntriesFast(); i++) {
 	    UInt_t trackletWord = 0;
-	    sscanf(((TObjString*) tokens->At(i))->GetString().Data(), "%u", &trackletWord);
+	    sscanf(((TObjString*) tokens->At(i))->GetString().Data(), "%i", &trackletWord);
 	    if (trackletWord == 0x10001000) 
 		break;
 	    AliDebug(2,Form("%i. tracklet: %s -> 0x%08x", i-4, ((TObjString*) tokens->At(i))->GetString().Data(), trackletWord));
@@ -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;
   }