Corrected library names and paths to macros
authorhristov <Peter.Hristov@cern.ch>
Mon, 8 Dec 2014 13:27:04 +0000 (14:27 +0100)
committeragrigora <alina.grigoras@cern.ch>
Mon, 15 Dec 2014 12:52:09 +0000 (13:52 +0100)
36 files changed:
STEER/macros/CreateAODfromESD.C
test/PbPbbench/aod.C
test/PbPbbench/monsim.C
test/PbPbbench/recraw/aod.C
test/PbPbbench/sim.C
test/embedding/Config.C
test/generators/TUHKMgen/runtest.sh
test/generators/epos/runtest.sh
test/generators/herwig/Config.C
test/generators/herwig/runtest.sh
test/generators/therminator/Config.C
test/generators/therminator/runtest.sh
test/genkine/gen/fastGen.C
test/genkine/gen/fastMcProduction.C
test/genkine/runtest.sh
test/genkine/sim/aod.C
test/gun/aod.C
test/gun/recraw/aod.C
test/merge/backgr/aod.C
test/merge/backgr/sim.C
test/merge/runtest.sh
test/merge/signal/aod.C
test/merge/signal/sim.C
test/pileup/aod.C
test/pileup/check.C
test/pileup/sim.C
test/ppbench/aod.C
test/ppbench/recraw/aod.C
test/ppbench/sim.C
test/pploadlibs/aod.C
test/pploadlibs/runcheck.C
test/rawmerge/Config.C
test/testdEdx/sim.C
test/vmctest/ppbench/runtest.sh
test/vmctest/production/Config.C
test/vmctest/production/ConfigG3.C

index cc31e2c3df79250117de750845129f94f5c6cfbd..d294dbc8eb4b47082da3a861d9741bc1457c1b0d 100644 (file)
@@ -1,3 +1,4 @@
+#if !defined( __CINT__) || defined(__MAKECINT__)
 #include <cstring>
 #include <TChain.h>
 #include <TSystem.h>
@@ -7,6 +8,7 @@
 #include "AliAnalysisTaskESDfilter.h"
 #include "AliAnalysisDataContainer.h"
 #include "AliTaskCDBconnect.h"
+#endif
 
 void CreateAODfromESD(const char *inFileName = "AliESDs.root",
                      const char *outFileName = "AliAOD.root",
index 911379c34bdcf7791f4b5c9e989a3b7dd6166a78..249a626e4fbf2f0834996e0d98c1dfae8fd426c0 100644 (file)
@@ -6,8 +6,8 @@ void aod(){
     gSystem->Load("libPWGHFbase");
     gSystem->Load("libPWGmuon");
     gSystem->Load("libESDfilter");
-    gSystem->Load("libTENDER");
+    gSystem->Load("libTender");
     gSystem->Load("libPWGPP");
 
-    gROOT->Macro("${ALICE_ROOT}/STEER/CreateAODfromESD.C(\"AliESDs.root\",\"AliAOD.root\",\"local://$ALICE_ROOT/OCDB\",\"local://.\")");
+    gROOT->Macro("${ALICE_ROOT}/STEER/macros/CreateAODfromESD.C(\"AliESDs.root\",\"AliAOD.root\",\"local://$ALICE_ROOT/OCDB\",\"local://.\")");
 }
index f540c13f84b93db38b39b1beb22915827c770d65..6e7ea1239822a47a4b459f14ecc0bbcf1272f31c 100644 (file)
@@ -5,7 +5,7 @@ void monsim(Int_t nev=1){
   gSystem->Load("libAliPythia6");
   gSystem->Load("libgeant321");
   
-  gSystem->Load("libhijing");
+  gSystem->Load("libHIJING");
   gSystem->Load("libTHijing");
 
   // MonaLisa monitoring
index 55bfd5f804c1681f28a2bcc3ef46c67e136d9557..3f0eef0374737a892bd8385e71e3f904a90e6f3a 100644 (file)
@@ -6,8 +6,8 @@ void aod(){
     gSystem->Load("libPWGHFbase");
     gSystem->Load("libPWGmuon");
     gSystem->Load("libESDfilter");
-    gSystem->Load("libTENDER");
+    gSystem->Load("libTender");
     gSystem->Load("libPWGPP");
 
-    gROOT->Macro("${ALICE_ROOT}/STEER/CreateAODfromESD.C(\"AliESDs.root\",\"AliAODs.root\",\"local://$ALICE_ROOT/OCDB\",\"local://..\",kFALSE)");
+    gROOT->Macro("${ALICE_ROOT}/STEER/macros/CreateAODfromESD.C(\"AliESDs.root\",\"AliAODs.root\",\"local://$ALICE_ROOT/OCDB\",\"local://..\",kFALSE)");
 }
index 4fe6586460cdc1f5a8ffa6995a01d65760ae9bfb..aa3ddfaeba0f370139dd1fbb07467bca6680529b 100644 (file)
@@ -6,7 +6,7 @@ void sim(Int_t nev=1) {
   gSystem->Load("libAliPythia6");
   gSystem->Load("libgeant321");
   
-  gSystem->Load("libhijing");
+  gSystem->Load("libHIJING");
   gSystem->Load("libTHijing");
 
   AliSimulation simulator;
index 1a0ee201dfaf1e3c03e88f17b7129ce9c4db3572..530c7441ce2d3e587fa4e91405acccc240545a13 100644 (file)
@@ -502,7 +502,7 @@ AliGenerator* MbPhojet()
 //    DPMJET
 #if defined(__CINT__)
 #endif
-      gSystem->Load("libdpmjet");      // Parton density functions
+      gSystem->Load("libDPMJET");      // Parton density functions
       gSystem->Load("libTDPMjet");      // Parton density functions
 
       AliGenDPMjet* dpmjet = new AliGenDPMjet(-1); 
index 856dcc5f05fdbd1e06c74bc287355cf5412a9e54..355f04ec148d90c15bdb2c8d8ace4e7fc41f6c05 100755 (executable)
@@ -18,8 +18,8 @@ aliroot -b -q $1sim.C      2>&1 | tee sim.log
 mv syswatch.log simwatch.log
 aliroot -b -q $1rec.C      2>&1 | tee rec.log
 mv syswatch.log recwatch.log
-aliroot -b -q ${ALICE_ROOT}/STEER/CheckESD.C 2>&1 | tee check.log
-aliroot -b -q ${ALICE_ROOT}/STEER/CreateAODfromESD.C 2>&1 | tee aod.log
+aliroot -b -q ${ALICE_ROOT}/STEER/macros/CheckESD.C 2>&1 | tee check.log
+aliroot -b -q ${ALICE_ROOT}/STEER/macros/CreateAODfromESD.C 2>&1 | tee aod.log
 
 
 
index 046aabd4ed870256c7206563feec7a922ba01d0b..029fc6ac7c9fb17a3f286852de3f2e8ae7665af2 100755 (executable)
@@ -18,8 +18,8 @@ aliroot -b -q $1sim.C      2>&1 | tee sim.log
 mv syswatch.log simwatch.log
 aliroot -b -q $1rec.C      2>&1 | tee rec.log
 mv syswatch.log recwatch.log
-aliroot -b -q ${ALICE_ROOT}/STEER/CheckESD.C 2>&1 | tee check.log
-aliroot -b -q ${ALICE_ROOT}/STEER/CreateAODfromESD.C 2>&1 | tee aod.log
+aliroot -b -q ${ALICE_ROOT}/STEER/macros/CheckESD.C 2>&1 | tee check.log
+aliroot -b -q ${ALICE_ROOT}/STEER/macros/CreateAODfromESD.C 2>&1 | tee aod.log
 
 
 
index 5f0ccc07b76283a3966d4b70ee27dc6244523b31..b0605e37015be2e2f41b56a3438293b301751805 100644 (file)
@@ -453,7 +453,7 @@ AliGenerator* MbPhojet()
   comment = comment.Append(" pp at 14 TeV: Phojet low-pt");
 
 #if defined(__CINT__)
-  gSystem->Load("libdpmjet"); // Parton density functions
+  gSystem->Load("libDPMJET"); // Parton density functions
   gSystem->Load("libTDPMjet"); // Parton density functions
 #endif
 
@@ -474,7 +474,7 @@ AliGenerator* Herwig()
   comment = comment.Append("pp at 14 TeV: Herwig");
 
 #if defined(__CINT__)
-  gSystem->Load("libherwig"); // HERWIG library
+  gSystem->Load("libHERWIG"); // HERWIG library
   gSystem->Load("libTHerwig"); // HERWIG library
 #endif
 
index 856dcc5f05fdbd1e06c74bc287355cf5412a9e54..355f04ec148d90c15bdb2c8d8ace4e7fc41f6c05 100755 (executable)
@@ -18,8 +18,8 @@ aliroot -b -q $1sim.C      2>&1 | tee sim.log
 mv syswatch.log simwatch.log
 aliroot -b -q $1rec.C      2>&1 | tee rec.log
 mv syswatch.log recwatch.log
-aliroot -b -q ${ALICE_ROOT}/STEER/CheckESD.C 2>&1 | tee check.log
-aliroot -b -q ${ALICE_ROOT}/STEER/CreateAODfromESD.C 2>&1 | tee aod.log
+aliroot -b -q ${ALICE_ROOT}/STEER/macros/CheckESD.C 2>&1 | tee check.log
+aliroot -b -q ${ALICE_ROOT}/STEER/macros/CreateAODfromESD.C 2>&1 | tee aod.log
 
 
 
index 56e771ab83ee3e9007c47deffbece2d9f141bfab..577c6af1bf1aaea30a6f107b10384cd953e5c494 100644 (file)
@@ -462,7 +462,7 @@ comment = comment.Append(" pp at 14 TeV: Phojet low-pt");
 //
 //    DPMJET
 #if defined(__CINT__)
-gSystem->Load("libdpmjet"); // Parton density functions
+gSystem->Load("libDPMJET"); // Parton density functions
 gSystem->Load("libTDPMjet"); // Parton density functions
 #endif
 AliGenDPMjet* dpmjet = new AliGenDPMjet(-1);
index 856dcc5f05fdbd1e06c74bc287355cf5412a9e54..355f04ec148d90c15bdb2c8d8ace4e7fc41f6c05 100755 (executable)
@@ -18,8 +18,8 @@ aliroot -b -q $1sim.C      2>&1 | tee sim.log
 mv syswatch.log simwatch.log
 aliroot -b -q $1rec.C      2>&1 | tee rec.log
 mv syswatch.log recwatch.log
-aliroot -b -q ${ALICE_ROOT}/STEER/CheckESD.C 2>&1 | tee check.log
-aliroot -b -q ${ALICE_ROOT}/STEER/CreateAODfromESD.C 2>&1 | tee aod.log
+aliroot -b -q ${ALICE_ROOT}/STEER/macros/CheckESD.C 2>&1 | tee check.log
+aliroot -b -q ${ALICE_ROOT}/STEER/macros/CreateAODfromESD.C 2>&1 | tee aod.log
 
 
 
index 5b2532eb35c28f9d48007680c4aa4dc1538f63b3..7db7ad7826033bb1865cbadae98c0938e2af6408 100644 (file)
@@ -2,6 +2,8 @@
 // Below we select events containing the decays D* -> D0 pi, D0 -> K- pi+
 // inside the barrel part of the ALICE detector (45 < theta < 135)
 
+// To be able to compile, please add -I<ALIROOT_INSTALL_PATH>/include
+// to your .rootrc
 #if !defined(__CINT__) || defined(__MAKECINT__)
 #include <Riostream.h>
 #include <TH1F.h>
@@ -19,8 +21,8 @@
 #include "AliRun.h"
 #include "AliStack.h"
 #include "AliHeader.h"
-#include "PYTHIA6/AliGenPythia.h"
-#include "PYTHIA6/AliPythia.h"
+#include "AliGenPythia.h"
+#include "AliPythia.h"
 #endif
 
 Float_t EtaToTheta(Float_t arg);
index fc40955b1685931dc06e6291f6ef6fe7da64a5c1..2bb2f4e50a534185bd6ebf41b35316096892b2cc 100644 (file)
@@ -188,12 +188,12 @@ void fastMcProduction(Int_t nev = 300) {
   }
     
   if (proc == kHijing || proc == kHijing2000 || proc == kHijing_pA ) {
-    gSystem->Load("libhijing");        
+    gSystem->Load("libHIJING");        
     gSystem->Load("libTHijing");
   } 
   
   else if ( proc == kDPMjet || proc== kDPMjet_pA ) {
-    gSystem->Load("libdpmjet"); 
+    gSystem->Load("libDPMJET"); 
     gSystem->Load("libTDPMjet");
   } 
   
@@ -630,7 +630,7 @@ AliGenerator* MbPhojet()
 {
   comment = comment.Append(" pp: Pythia low-pt");
 #if defined(__CINT__)
-  gSystem->Load("libdpmjet");      // Parton density functions
+  gSystem->Load("libDPMJET");      // Parton density functions
   gSystem->Load("libTDPMjet");      // Parton density functions
 #endif
   AliGenDPMjet* dpmjet = new AliGenDPMjet(-1); 
index d74885b95a14e055f5eaf7fbfef1ca7b65a41a6b..630610863fa910a3765440c5f527a3c36b5e59fc 100755 (executable)
@@ -6,7 +6,7 @@ chmod a-w *.root
 cd ../sim
 aliroot -b -q sim.C\(5\) 2>&1 | tee sim.log
 aliroot -b -q rec.C      2>&1 | tee rec.log
-aliroot -b -q ${ALICE_ROOT}/STEER/CheckESD.C 2>&1 | tee check.log
+aliroot -b -q ${ALICE_ROOT}/STEER/macros/CheckESD.C 2>&1 | tee check.log
 aliroot -b -q aod.C 2>&1 | tee aod.log
 
 
index 911379c34bdcf7791f4b5c9e989a3b7dd6166a78..249a626e4fbf2f0834996e0d98c1dfae8fd426c0 100644 (file)
@@ -6,8 +6,8 @@ void aod(){
     gSystem->Load("libPWGHFbase");
     gSystem->Load("libPWGmuon");
     gSystem->Load("libESDfilter");
-    gSystem->Load("libTENDER");
+    gSystem->Load("libTender");
     gSystem->Load("libPWGPP");
 
-    gROOT->Macro("${ALICE_ROOT}/STEER/CreateAODfromESD.C(\"AliESDs.root\",\"AliAOD.root\",\"local://$ALICE_ROOT/OCDB\",\"local://.\")");
+    gROOT->Macro("${ALICE_ROOT}/STEER/macros/CreateAODfromESD.C(\"AliESDs.root\",\"AliAOD.root\",\"local://$ALICE_ROOT/OCDB\",\"local://.\")");
 }
index 911379c34bdcf7791f4b5c9e989a3b7dd6166a78..249a626e4fbf2f0834996e0d98c1dfae8fd426c0 100644 (file)
@@ -6,8 +6,8 @@ void aod(){
     gSystem->Load("libPWGHFbase");
     gSystem->Load("libPWGmuon");
     gSystem->Load("libESDfilter");
-    gSystem->Load("libTENDER");
+    gSystem->Load("libTender");
     gSystem->Load("libPWGPP");
 
-    gROOT->Macro("${ALICE_ROOT}/STEER/CreateAODfromESD.C(\"AliESDs.root\",\"AliAOD.root\",\"local://$ALICE_ROOT/OCDB\",\"local://.\")");
+    gROOT->Macro("${ALICE_ROOT}/STEER/macros/CreateAODfromESD.C(\"AliESDs.root\",\"AliAOD.root\",\"local://$ALICE_ROOT/OCDB\",\"local://.\")");
 }
index 55bfd5f804c1681f28a2bcc3ef46c67e136d9557..3f0eef0374737a892bd8385e71e3f904a90e6f3a 100644 (file)
@@ -6,8 +6,8 @@ void aod(){
     gSystem->Load("libPWGHFbase");
     gSystem->Load("libPWGmuon");
     gSystem->Load("libESDfilter");
-    gSystem->Load("libTENDER");
+    gSystem->Load("libTender");
     gSystem->Load("libPWGPP");
 
-    gROOT->Macro("${ALICE_ROOT}/STEER/CreateAODfromESD.C(\"AliESDs.root\",\"AliAODs.root\",\"local://$ALICE_ROOT/OCDB\",\"local://..\",kFALSE)");
+    gROOT->Macro("${ALICE_ROOT}/STEER/macros/CreateAODfromESD.C(\"AliESDs.root\",\"AliAODs.root\",\"local://$ALICE_ROOT/OCDB\",\"local://..\",kFALSE)");
 }
index 911379c34bdcf7791f4b5c9e989a3b7dd6166a78..249a626e4fbf2f0834996e0d98c1dfae8fd426c0 100644 (file)
@@ -6,8 +6,8 @@ void aod(){
     gSystem->Load("libPWGHFbase");
     gSystem->Load("libPWGmuon");
     gSystem->Load("libESDfilter");
-    gSystem->Load("libTENDER");
+    gSystem->Load("libTender");
     gSystem->Load("libPWGPP");
 
-    gROOT->Macro("${ALICE_ROOT}/STEER/CreateAODfromESD.C(\"AliESDs.root\",\"AliAOD.root\",\"local://$ALICE_ROOT/OCDB\",\"local://.\")");
+    gROOT->Macro("${ALICE_ROOT}/STEER/macros/CreateAODfromESD.C(\"AliESDs.root\",\"AliAOD.root\",\"local://$ALICE_ROOT/OCDB\",\"local://.\")");
 }
index 80559b4da76c35c1fd76079ef206b5bc4d4f2451..875ba7df12020bb5512ac785579151312ff00c15 100644 (file)
@@ -7,7 +7,7 @@ void sim(Int_t nev=1) {
     gSystem->Load("libAliPythia6");
     gSystem->Load("libgeant321");
     
-    gSystem->Load("libhijing");
+    gSystem->Load("libHIJING");
     gSystem->Load("libTHijing");
 
 
index 0c97834e2805ddba3094396e9f8a8ca3dcc34fae..49d4ee5935e632becc89d255f9884cae37ac236e 100755 (executable)
@@ -3,13 +3,13 @@ rm -rf */*.root */*.dat* */*.log */fort* */hough */hlt */raw* */*~
 cd ./backgr
 aliroot -b -q sim.C\(2\) 2>&1 | tee sim.log
 aliroot -b -q rec.C      2>&1 | tee rec.log
-aliroot -b -q ${ALICE_ROOT}/STEER/CheckESD.C 2>&1 | tee check.log
+aliroot -b -q ${ALICE_ROOT}/STEER/macros/CheckESD.C 2>&1 | tee check.log
 aliroot -b -q aod.C 2>&1 | tee aod.log
 chmod a-w *.root
 cd ../signal
 aliroot -b -q sim.C\(6\) 2>&1 | tee sim.log
 aliroot -b -q rec.C      2>&1 | tee rec.log
-aliroot -b -q ${ALICE_ROOT}/STEER/CheckESD.C 2>&1 | tee check.log
+aliroot -b -q ${ALICE_ROOT}/STEER/macros/CheckESD.C 2>&1 | tee check.log
 aliroot -b -q aod.C 2>&1 | tee aod.log
 
 
index 911379c34bdcf7791f4b5c9e989a3b7dd6166a78..249a626e4fbf2f0834996e0d98c1dfae8fd426c0 100644 (file)
@@ -6,8 +6,8 @@ void aod(){
     gSystem->Load("libPWGHFbase");
     gSystem->Load("libPWGmuon");
     gSystem->Load("libESDfilter");
-    gSystem->Load("libTENDER");
+    gSystem->Load("libTender");
     gSystem->Load("libPWGPP");
 
-    gROOT->Macro("${ALICE_ROOT}/STEER/CreateAODfromESD.C(\"AliESDs.root\",\"AliAOD.root\",\"local://$ALICE_ROOT/OCDB\",\"local://.\")");
+    gROOT->Macro("${ALICE_ROOT}/STEER/macros/CreateAODfromESD.C(\"AliESDs.root\",\"AliAOD.root\",\"local://$ALICE_ROOT/OCDB\",\"local://.\")");
 }
index 91226d893d81c387695f1c358b2b87338b39e57b..6ecf80bbdd162969225c9f4578cf8145a57b2e81 100644 (file)
@@ -7,7 +7,7 @@ void sim(Int_t nev=1) {
     gSystem->Load("libAliPythia6");
     gSystem->Load("libgeant321");
     
-    gSystem->Load("libhijing");
+    gSystem->Load("libHIJING");
     gSystem->Load("libTHijing");
 
   AliSimulation simulator;
index 64e6aae0f5ab7bad93b5aea47ddca39de2896bbc..376edc6a07a4e4ee546b36a175d9ad9050359f89 100644 (file)
@@ -3,7 +3,7 @@ void aod(){
   gSystem->Load("libEGPythia6");   // TGenerator interface
   gSystem->Load("libpythia6");     // Pythia
   gSystem->Load("libAliPythia6");  // ALICE specific implementations
-  gSystem->Load("libdpmjet");
+  gSystem->Load("libDPMJET");
   gSystem->Load("libTDPMjet");
  
   gSystem->Load("libANALYSIS");
@@ -12,8 +12,8 @@ void aod(){
   gSystem->Load("libPWGHFbase");
   gSystem->Load("libPWGmuon");
   gSystem->Load("libESDfilter");
-  gSystem->Load("libTENDER");
+  gSystem->Load("libTender");
   gSystem->Load("libPWGPP");
 
-  gROOT->Macro("${ALICE_ROOT}/STEER/CreateAODfromESD.C(\"AliESDs.root\",\"AliAODs.root\",\"local://$ALICE_ROOT/OCDB\",\"local://.\")");
+  gROOT->Macro("${ALICE_ROOT}/STEER/macros/CreateAODfromESD.C(\"AliESDs.root\",\"AliAODs.root\",\"local://$ALICE_ROOT/OCDB\",\"local://.\")");
 }
index 79a2e4e29ca26e7716b8f26e66203544ead9267a..344fbe8b4a887202d48c4ea7f7f0d5f5609cb2ab 100644 (file)
@@ -4,7 +4,7 @@ void check(){
   gSystem->Load("libEGPythia6");   // TGenerator interface
   gSystem->Load("libpythia6");     // Pythia
   gSystem->Load("libAliPythia6");  // ALICE specific implementations
-  gSystem->Load("libdpmjet");
+  gSystem->Load("libDPMJET");
   gSystem->Load("libTDPMjet");
-  gROOT->Macro("$ALICE_ROOT/STEER/CheckESD.C");
+  gROOT->Macro("$ALICE_ROOT/STEER/macros/CheckESD.C");
 }
index 3d293b29038f015fb7ff02da0a2cb3e6ebb5691d..ed99d12f3e60356fab7ac8c973d4e12996e00775 100644 (file)
@@ -4,7 +4,7 @@ void sim(Int_t nev=5) {
   gSystem->Load("libEGPythia6");   // TGenerator interface
   gSystem->Load("libpythia6");     // Pythia
   gSystem->Load("libAliPythia6");  // ALICE specific implementations
-  gSystem->Load("libdpmjet");      // DPMJET
+  gSystem->Load("libDPMJET");      // DPMJET
   gSystem->Load("libTDPMjet");     // DPMJET interface
 
   gSystem->Load("libgeant321");
index 911379c34bdcf7791f4b5c9e989a3b7dd6166a78..249a626e4fbf2f0834996e0d98c1dfae8fd426c0 100644 (file)
@@ -6,8 +6,8 @@ void aod(){
     gSystem->Load("libPWGHFbase");
     gSystem->Load("libPWGmuon");
     gSystem->Load("libESDfilter");
-    gSystem->Load("libTENDER");
+    gSystem->Load("libTender");
     gSystem->Load("libPWGPP");
 
-    gROOT->Macro("${ALICE_ROOT}/STEER/CreateAODfromESD.C(\"AliESDs.root\",\"AliAOD.root\",\"local://$ALICE_ROOT/OCDB\",\"local://.\")");
+    gROOT->Macro("${ALICE_ROOT}/STEER/macros/CreateAODfromESD.C(\"AliESDs.root\",\"AliAOD.root\",\"local://$ALICE_ROOT/OCDB\",\"local://.\")");
 }
index 55bfd5f804c1681f28a2bcc3ef46c67e136d9557..3f0eef0374737a892bd8385e71e3f904a90e6f3a 100644 (file)
@@ -6,8 +6,8 @@ void aod(){
     gSystem->Load("libPWGHFbase");
     gSystem->Load("libPWGmuon");
     gSystem->Load("libESDfilter");
-    gSystem->Load("libTENDER");
+    gSystem->Load("libTender");
     gSystem->Load("libPWGPP");
 
-    gROOT->Macro("${ALICE_ROOT}/STEER/CreateAODfromESD.C(\"AliESDs.root\",\"AliAODs.root\",\"local://$ALICE_ROOT/OCDB\",\"local://..\",kFALSE)");
+    gROOT->Macro("${ALICE_ROOT}/STEER/macros/CreateAODfromESD.C(\"AliESDs.root\",\"AliAODs.root\",\"local://$ALICE_ROOT/OCDB\",\"local://..\",kFALSE)");
 }
index baf8eeb74536a03175eef56823b75ef48e6f5945..0095afad7be8e68c92af01a403c2dac9b324eaa3 100644 (file)
@@ -4,7 +4,7 @@ void sim(Int_t nev=20) {
   gSystem->Load("libEGPythia6");
   gSystem->Load("libpythia6");
   gSystem->Load("libAliPythia6");
-  gSystem->Load("libhijing");
+  gSystem->Load("libHIJING");
   gSystem->Load("libTHijing");
   gSystem->Load("libgeant321");
 
index a84ebd0b9621f3349dc15dda5daebb85c0f39cf5..895d45b09612573cf0c3ad962d27a7315747d97e 100644 (file)
@@ -8,8 +8,8 @@ void aod(){
   gSystem->Load("libPWGHFbase");
   gSystem->Load("libPWGmuon");
   gSystem->Load("libESDfilter");
-  gSystem->Load("libTENDER");
+  gSystem->Load("libTender");
   gSystem->Load("libPWGPP");
   
-  gROOT->Macro("${ALICE_ROOT}/STEER/CreateAODfromESD.C(\"AliESDs.root\",\"AliAOD.root\",\"local://$ALICE_ROOT/OCDB\",\"local://.\")");
+  gROOT->Macro("${ALICE_ROOT}/STEER/macros/CreateAODfromESD.C(\"AliESDs.root\",\"AliAOD.root\",\"local://$ALICE_ROOT/OCDB\",\"local://.\")");
 }
index a7f4dbf0dda76feb31dcb837264fc1454166cf65..579550db5b58efdaa018f8a3a69488918ba0b801 100644 (file)
@@ -1,4 +1,4 @@
 void runcheck(){
   gROOT->Macro("loadlibsrec.C");
-  gROOT->Macro("${ALICE_ROOT}/STEER/CheckESD.C");
+  gROOT->Macro("${ALICE_ROOT}/STEER/macros/CheckESD.C");
 }
index fcf3a8bdc236599073981f41353644843b9d627f..4d5e17fc17304b4464599395ae1082489e40addd 100644 (file)
@@ -503,7 +503,7 @@ AliGenerator* MbPhojet()
 //    DPMJET
 #if defined(__CINT__)
 #endif
-      gSystem->Load("libdpmjet");      // Parton density functions
+      gSystem->Load("libDPLJET");      // Parton density functions
       gSystem->Load("libTDPMjet");      // Parton density functions
 
       AliGenDPMjet* dpmjet = new AliGenDPMjet(-1); 
index 6fd58dce0f7a899a9c5004fffe4ca058a4d4f6e6..ca208d092a79c0986cfb50ef87fdc8d7d21cde04 100644 (file)
@@ -29,7 +29,7 @@ void sim(Int_t nev, Bool_t useIonTail, Double_t crossTalkCorrection) {
   gSystem->Load("libEGPythia6");
   gSystem->Load("libpythia6");
   gSystem->Load("libAliPythia6");
-  gSystem->Load("libhijing");
+  gSystem->Load("libHIJING");
   gSystem->Load("libTHijing");
   gSystem->Load("libgeant321");
 
index 6c64d247cd8deb99c9c0ab195c498684f4018351..86d848cf087d110992bd02bc9f78105475a83e11 100755 (executable)
@@ -18,8 +18,8 @@ if [ "$RUNG3" = "1" ]; then
   mv syswatch.log simwatch.log
   aliroot -b -q rec.C      2>&1 | tee rec.log
   mv syswatch.log recwatch.log
-  aliroot -b -q ${ALICE_ROOT}/STEER/CheckESD.C 2>&1 | tee check.log
-  aliroot -b -q ${ALICE_ROOT}/STEER/CreateAODfromESD.C 2>&1 | tee aod.log
+  aliroot -b -q ${ALICE_ROOT}/STEER/macros/CheckESD.C 2>&1 | tee check.log
+  aliroot -b -q ${ALICE_ROOT}/STEER/macros/CreateAODfromESD.C 2>&1 | tee aod.log
   rm -fr $G3OUTDIR
   mkdir $G3OUTDIR
   mv *.root *.log *.ps GRP $G3OUTDIR
@@ -32,8 +32,8 @@ if [ "$RUNG4" = "1" ]; then
   mv syswatch.log simwatch.log
   aliroot -b -q rec.C      2>&1 | tee rec.log
   mv syswatch.log recwatch.log
-  aliroot -b -q ${ALICE_ROOT}/STEER/CheckESD.C 2>&1 | tee check.log
-  aliroot -b -q ${ALICE_ROOT}/STEER/CreateAODfromESD.C 2>&1 | tee aod.log
+  aliroot -b -q ${ALICE_ROOT}/STEER/macros/CheckESD.C 2>&1 | tee check.log
+  aliroot -b -q ${ALICE_ROOT}/STEER/macros/CreateAODfromESD.C 2>&1 | tee aod.log
   rm -fr $G4OUTDIR
   mkdir $G4OUTDIR
   mv *.root *.log *.rndm *.ps GRP $G4OUTDIR
index 825525213d46b389d7e59e26d8e74d4d322866cf..6d5ee11e0cffd270c6ee8c44348d69d8dade26d2 100644 (file)
@@ -684,7 +684,7 @@ AliGenerator* MbPhojet()
   //
   //    DPMJET
 #if defined(__CINT__)
-  gSystem->Load("libdpmjet");      // Parton density functions
+  gSystem->Load("libDPMJET");      // Parton density functions
   gSystem->Load("libTDPMjet");      // Parton density functions
 #endif
   AliGenDPMjet* dpmjet = new AliGenDPMjet(-1); 
index 36fa41d07e15ebea28e42174389cbf47514c1750..e456dd9dacb61098bdbad4e7ee87adf9e3937347 100644 (file)
@@ -595,7 +595,7 @@ AliGenerator* MbPhojet()
   //
   //    DPMJET
 #if defined(__CINT__)
-  gSystem->Load("libdpmjet");      // Parton density functions
+  gSystem->Load("libDPMJET");      // Parton density functions
   gSystem->Load("libTDPMjet");      // Parton density functions
 #endif
   AliGenDPMjet* dpmjet = new AliGenDPMjet(-1);