Correct overloading of virtual functions in the derived classes (icc)

[u/mrichter/AliRoot.git] / STEER / AliSimulation.cxx

diff --git a/STEER/AliSimulation.cxx b/STEER/AliSimulation.cxx
index 85db124b373ea3e2f989cef92512fe5eee81b59c..676103e31bed903965153c2a9411b35a3a4c977c 100644 (file)
--- a/STEER/AliSimulation.cxx
+++ b/STEER/AliSimulation.cxx
@@ -119,6 +119,8 @@
 #include "AliSimulation.h"
 #include "AliVertexGenFile.h"
 
+#include "AliDAQConfig.h"
+
 ClassImp(AliSimulation)
 
 
@@ -542,7 +544,7 @@ Bool_t AliSimulation::RunHitsDigitization(const char* detectors)
     if (fStopOnError) return kFALSE;
   }
 
-  //PH  delete runLoader;
+  delete runLoader;
   //PH Temporary fix to avoid interference with the PHOS loder/getter
   //PH The problem has to be solved in more general way 09/06/05
 
@@ -655,24 +657,6 @@ Bool_t AliSimulation::ConvertRawFilesToDate(const char* dateFileName)
 {
 // convert raw data DDL files to a DATE file with the program "dateStream"
 
-  // DATE setup
-  const Int_t kNDetectors = 17;
-  const char* kDetectors[kNDetectors] = {"TPC", "ITSSPD", "ITSSDD", "ITSSSD", 
-                                         "TRD", "TOF", "PHOS", "RICH", 
-                                         "EMCAL", "MUON", "MUTR", "ZDC", 
-                                         "PMD", "START", "VZERO", "CRT",
-                                         "FMD"};
-  const Int_t kDetectorDDLs[kNDetectors]   = {216, 20, 12, 16, 
-                                              18, 72, 20, 20, 
-                                              22, 20, 2, 1, 
-                                              6, 1, 1, 1,
-                                              3};
-  const Float_t kDetectorLDCs[kNDetectors] = {46, 2, 2, 1, 
-                                              4, 2, 1, 2, 
-                                              1, 2, 1, 1,
-                                              1, 0.5, 0.5, 1,
-                                              1};
-
   char* path = gSystem->Which(gSystem->Getenv("PATH"), "dateStream");
   if (!path) {
     AliError("the program dateStream was not found");