From 67c48a1e8a2dfafdb4225fc50aa89f67c3b24392 Mon Sep 17 00:00:00 2001
From: ivana <ivana@f7af4fe6-9843-0410-8265-dc069ae4e863>
Date: Wed, 12 Jan 2011 16:14:38 +0000
Subject: [PATCH] In macros: - Adding test for loading Config.C in loadmacros.C
 and reverting last rootlogon.C update - Fixing runReconstruction.C,
 runSimulation.C to make them compiling again

---
 MUON/loadmacros.C        | 14 ++++++++++++--
 MUON/rootlogon.C         |  3 ---
 MUON/runReconstruction.C |  1 +
 MUON/runSimulation.C     |  7 +++++--
 4 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/MUON/loadmacros.C b/MUON/loadmacros.C
index e39276ea653..f32ad74b8da 100644
--- a/MUON/loadmacros.C
+++ b/MUON/loadmacros.C
@@ -44,7 +44,12 @@ void init()
   includePath        += "-I${ALICE_ROOT}/SHUTTLE/TestShuttle ";
   includePath        += "-I${ALICE_ROOT}/ITS ";
   includePath        += "-I${ALICE_ROOT}/MUON ";
-  includePath        += "-I${ALICE_ROOT}/MUON/mapping";
+  includePath        += "-I${ALICE_ROOT}/MUON/mapping ";
+
+  // includes needed for Config.C
+  includePath        += "-I${ALICE_ROOT}/STRUCT ";
+  includePath        += "-I${ALICE}/geant3/TGeant3 ";
+  includePath        += "-I${ALICE_ROOT}/THijing";
   gSystem->SetIncludePath(includePath.Data());
 
   // Load libraries not linked with aliroot
@@ -58,6 +63,11 @@ void init()
   gSystem->Load("libEG");
   gSystem->Load("libEGPythia6");
   gSystem->Load("libAliPythia6.so");
+  
+  // libraries needed for Config.C
+  gSystem->Load("libSTRUCT.so");
+  gSystem->Load("libITSbase.so");
+  gSystem->Load("libITSsim.so");
 }  
 
 void loadmacro(const TString& macroName)
@@ -77,10 +87,10 @@ void loadmacros ()
   loadmacro("AddTaskMuonAlignment");       // Javier
   loadmacro("AddTaskMuonReAlign");         // Javier
   loadmacro("DecodeRecoCocktail");         // Hermine, Alessandro     
+  loadmacro("Config");                     //      
   loadmacro("DIMUONFakes");                // Philippe P.
   loadmacro("fastMUONGen");                // Hermine, Alessandro
   loadmacro("fastMUONSim");                // Hermine, Alessandro
-  loadmacro("loadFromOCDB");               // Philippe P.
   loadmacro("MakeMUONFullMisAlignment");   // Javier, Ivana
   loadmacro("MakeMUONResMisAlignment");    // Javier, Ivana
   loadmacro("MakeMUONZeroMisAlignment");   // Javier, Ivana
diff --git a/MUON/rootlogon.C b/MUON/rootlogon.C
index f9c13f84c98..3413b4791dd 100644
--- a/MUON/rootlogon.C
+++ b/MUON/rootlogon.C
@@ -28,9 +28,6 @@
   includePath        += "-I${ALICE_ROOT}/MUON/mapping ";
   includePath        += "-I${ALICE_ROOT}/RAW ";
   includePath        += "-I${ALICE_ROOT}/include ";
-  includePath        += "-I${ALICE_ROOT}/STRUCT ";
-  includePath        += "-I${GEANT3}/TGeant3 ";
-  includePath        += "-I${ALICE_ROOT}/THijing ";
 
   gSystem->SetIncludePath(includePath.Data());
 }
diff --git a/MUON/runReconstruction.C b/MUON/runReconstruction.C
index 8331f153fea..891e1eb27a5 100644
--- a/MUON/runReconstruction.C
+++ b/MUON/runReconstruction.C
@@ -31,6 +31,7 @@
 #include "AliTracker.h"
 #include "AliReconstruction.h"
 #include <TRandom.h>
+#include <Riostream.h>
 //#include <TObjectTable.h>
 #endif
 
diff --git a/MUON/runSimulation.C b/MUON/runSimulation.C
index db8ecd9129f..c7bf1fecb17 100644
--- a/MUON/runSimulation.C
+++ b/MUON/runSimulation.C
@@ -26,7 +26,10 @@
 #if !defined(__CINT__) || defined(__MAKECINT__)
 #include "AliCDBManager.h"
 #include "AliSimulation.h"
+#include "AliRun.h"
+#include "AliHeader.h"
 #include <TRandom.h>
+#include <Riostream.h>
 #endif
 
 void runSimulation(int seed, 
@@ -53,14 +56,14 @@ void runSimulation(int seed,
     AliRunLoader* runLoader = AliRunLoader::Open(embedwith,"titi");
     if (runLoader == 0x0) 
     {
-      AliError(Form("Cannot open file %s",filename));    
+      cerr << Form("Cannot open file %s",embedwith) << endl;    
       return;
     }
     
     runLoader->LoadHeader();
     
     if ( ! runLoader->GetHeader() ) {
-      AliError("Cannot load header.");    
+      cerr << "Cannot load header." << endl;   
       return;
     }
     else {
-- 
2.39.3