HLT event reconstruction moved to beginning of reconstruction. Minor modification...

diff --git a/STEER/AliReconstruction.cxx b/STEER/AliReconstruction.cxx
index 278ae52af5d65962f3025b1b645a5bcebc156bd5..16eccb7aea8df885ec60f1ffc0c8dc0e05130827 100644 (file)
--- a/STEER/AliReconstruction.cxx
+++ b/STEER/AliReconstruction.cxx
@@ -942,7 +942,15 @@ Bool_t AliReconstruction::RunEvent(Int_t iEvent)
 
     // local signle event reconstruction
     if (!fRunLocalReconstruction.IsNull()) {
-      if (!RunLocalEventReconstruction(fRunLocalReconstruction)) {
+      TString detectors="HLT";
+      // run HLT event reconstruction first
+      if (IsSelected(detectors, fRunLocalReconstruction) &&
+         !RunLocalEventReconstruction(detectors)) {
+       if (fStopOnError) {CleanUp(ffile, ffileOld); return kFALSE;}
+      }
+      detectors=fRunLocalReconstruction;
+      detectors.ReplaceAll("HLT", "");
+      if (!RunLocalEventReconstruction(detectors)) {
        if (fStopOnError) {CleanUp(ffile, ffileOld); return kFALSE;}
       }
     }

diff --git a/STEER/AliSimulation.cxx b/STEER/AliSimulation.cxx
index b76f26c6072a3d4b76b245d5b0ad91b5583b3d50..2c7b8935ff7b8646c92ed18123730491f942fa98 100644 (file)
--- a/STEER/AliSimulation.cxx
+++ b/STEER/AliSimulation.cxx
@@ -1686,9 +1686,15 @@ Bool_t AliSimulation::RunHLT()
   }
 
   // init the HLT simulation
-  if (fRunHLT.CompareTo("default")==0) fRunHLT="";
+  TString options;
+  if (fRunHLT.CompareTo("default")!=0) options=fRunHLT;
+  if (!IsSelected("HLT", fWriteRawData)) {
+    options+=" writerawfiles=";
+  } else {
+    options+=" writerawfiles=HLT";
+  }
   AliHLTSimulationInit_t fctInit=(AliHLTSimulationInit_t)(gSystem->DynFindSymbol(ALIHLTSIMULATION_LIBRARY, ALIHLTSIMULATION_INIT));
-  if (fctInit==NULL || (iResult=(fctInit(pHLT, pRunLoader, fRunHLT.Data())))<0) {
+  if (fctInit==NULL || (iResult=(fctInit(pHLT, pRunLoader, options.Data())))<0) {
     AliError(Form("can not init HLT simulation: error %d (init %p)", iResult, fctInit));
   } else {
     // run the HLT simulation