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

diff --git a/MUON/loadmacros.C b/MUON/loadmacros.C
index e39276ea6530540268c351e8a69cc3fcc8738213..f32ad74b8dacd6045d4d206044fa4ca5096af351 100644 (file)
--- 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 f9c13f84c9874432548f4efd934965c249d8015e..3413b4791dd5f753e2eaebe47860c434774c26a2 100644 (file)
--- 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 8331f153fea241b668f8c5ac42391a94e70b40b5..891e1eb27a5d9485b3b1dc07f0bd60d2941a60cb 100644 (file)
--- 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 db8ecd9129fcd382abdffb1e07f775f3329c7ab1..c7bf1fecb17b6b09611adb7d88cc961b6376d412 100644 (file)
--- 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 {