After playing, Andrew needs to cleanup :-)

[u/mrichter/AliRoot.git] / HLT / TPCLib / macros / sim-hlt-tpc.C

diff --git a/HLT/TPCLib/macros/sim-hlt-tpc.C b/HLT/TPCLib/macros/sim-hlt-tpc.C
index 138c2b0e7aeda5a3a532fa06ce2b77b8e7d1389b..709e1459be548d643f4207ca70fdf29be3180a37 100644 (file)
--- a/HLT/TPCLib/macros/sim-hlt-tpc.C
+++ b/HLT/TPCLib/macros/sim-hlt-tpc.C
@@ -134,7 +134,7 @@ sim_hlt_tpc(const char* options="CA")
       if (bCFSort) arg+=" -sorted ";
       if (bPropagateMC) arg+=" -do-mc ";
       cf.Form("CF_%02d_%d", slice, part);
-      AliHLTConfiguration cfconf(cf.Data(), "TPCClusterFinderUnpacked", publisher.Data(), arg.Data());
+      AliHLTConfiguration cfconf(cf.Data(), "TPCClusterFinderUnpacked", publisher.Data(), "");
       if (trackerInput.Length()>0) trackerInput+=" ";
       trackerInput+=cf;
       if (sinkClusterInput.Length()>0) sinkClusterInput+=" ";
@@ -170,14 +170,18 @@ sim_hlt_tpc(const char* options="CA")
     AliHLTConfiguration mergerconf("globalmerger","TPCGlobalMerger",mergerInput.Data(),"");
   }
 
+  TString converterInput="globalmerger";
+
   // collector for the MC information to be propagated from CFs to ESDConverter
-  AliHLTConfiguration mcinfo("mcinfo", "BlockFilter"   , sinkClusterInput.Data(), "-datatype 'CLMCINFO' 'TPC '");
+  if (bPropagateMC){
+    AliHLTConfiguration mcinfo("mcinfo", "BlockFilter"   , sinkClusterInput.Data(), "-datatype 'CLMCINFO' 'TPC '");  
+    AliHLTConfiguration mcTrackMarker("mcTrackMarker","TPCTrackMCMarker","globalmerger mcinfo","" );
+    converterInput+=" mcTrackMarker";
+  }
 
   if (writerInput.Length()>0) writerInput+=" ";
   writerInput+="globalmerger";
 
-  TString converterInput="globalmerger";
-  if (bPropagateMC) converterInput+=" mcinfo";
 
   //////////////////////////////////////////////////////////////////////////////////////////
   //
@@ -219,7 +223,7 @@ sim_hlt_tpc(const char* options="CA")
   sim.SetMakeDigits("");
   sim.SetMakeSDigits("");
   sim.SetMakeDigitsFromHits("");
-  sim.SetMakeTrigger("");
+  //sim.SetMakeTrigger("");
   sim.SetRunQA(":");
 
   // the normal simulation sets the specific storage for the GRP entry