Simplifications following change of library loading and $ALICE_ROOT
authorlaphecet <laurent.aphecetche@subatech.in2p3.fr>
Tue, 13 Jan 2015 13:36:45 +0000 (14:36 +0100)
committerlaphecet <laurent.aphecetche@subatech.in2p3.fr>
Tue, 13 Jan 2015 13:38:15 +0000 (14:38 +0100)
MUON/AlirootRun_MUONtest.sh
MUON/loadlibs.C [deleted file]
MUON/rootlogon.C

index dad00e9..d9a24d3 100755 (executable)
@@ -24,7 +24,7 @@ SEED=1234567 # random number generator seed
 SIMDIR="generated" # sub-directory where to move simulated files prior to reco
 DUMPEVENT=5 # event to be dump on files (set to negative to skip dumps)
 
-SIMCONFIG="$ALICE_ROOT/MUON/"$MC"Config.C"
+SIMCONFIG="$ALICE_ROOT/../src/MUON/"$MC"Config.C"
 EMBEDWITH="" # no embedding by default
 REALISTIC=0 # ideal simulation by default
 
@@ -122,13 +122,13 @@ fi
 
 # Copy *ALL* the macros we need in the output directory, not to mess
 # with our source dir in any way.
-cp $ALICE_ROOT/MUON/.rootrc \
-  $ALICE_ROOT/MUON/rootlogon.C \
-  $ALICE_ROOT/MUON/runReconstruction.C $ALICE_ROOT/MUON/runSimulation.C \
-  $ALICE_ROOT/MUON/UpdateCDBCTPConfig.C \
-  $ALICE_ROOT/MUON/MUONefficiency.C \
-  $ALICE_ROOT/MUON/MUONTriggerEfficiency.C \
-  $ALICE_ROOT/MUON/MUONCheck.C \
+cp $ALICE_ROOT/../src/MUON/.rootrc \
+  $ALICE_ROOT/../src/MUON/rootlogon.C \
+  $ALICE_ROOT/../src/MUON/runReconstruction.C $ALICE_ROOT/../src/MUON/runSimulation.C \
+  $ALICE_ROOT/../src/MUON/UpdateCDBCTPConfig.C \
+  $ALICE_ROOT/../src/MUON/MUONefficiency.C \
+  $ALICE_ROOT/../src/MUON/MUONTriggerEfficiency.C \
+  $ALICE_ROOT/../src/MUON/MUONCheck.C \
   $OUTDIR
 
 cd $OUTDIR
@@ -155,7 +155,7 @@ fi
 #
 ###############################################################################
 
-if [ ! -f $ALICE_ROOT/OCDB/GRP/CTP/Config/Run0_999999999_v0_s1.root ]; then
+if [ ! -f $ALICE_ROOT/../src/OCDB/GRP/CTP/Config/Run0_999999999_v0_s1.root ]; then
 
   echo "Updating GRP CTP config  ..."
 
@@ -197,14 +197,14 @@ if [ "$SIMULATION" -eq 1 ]; then
 
   # save geometry file in a separate directory
   if [ "$MC" = "g3" ]; then
-    rm -fr $ALICE_ROOT/MUON/geometry
-    mkdir $ALICE_ROOT/MUON/geometry
-    cp $OUTDIR/geometry.root $ALICE_ROOT/MUON/geometry
+    rm -fr $ALICE_ROOT/../src/MUON/geometry
+    mkdir $ALICE_ROOT/../src/MUON/geometry
+    cp $OUTDIR/geometry.root $ALICE_ROOT/../src/MUON/geometry
   fi 
 
   # copy input geometry file in a current directory
   if [ "$MC" = "g4" ]; then
-    cp $ALICE_ROOT/MUON/geometry/geometry.root $OUTDIR
+    cp $ALICE_ROOT/../src/MUON/geometry/geometry.root $OUTDIR
   fi 
   
   cp $OUTDIR/geometry.root $OUTDIR/$SIMDIR/geometry.root
@@ -305,7 +305,7 @@ if [ "$DUMPEVENT" -ge 0 ]; then
   if [ -f "$OUTDIR/$SIMDIR/galice.root" ]; then
     aliroot -l -b  << EOF
     AliCDBManager* man = AliCDBManager::Instance();    
-    man->SetDefaultStorage("local://$ALICE_ROOT/OCDB");
+    man->SetDefaultStorage("local://$ALICE_ROOT/../src/OCDB");
     AliMUONMCDataInterface mcdSim("$OUTDIR/$SIMDIR/galice.root");
     mcdSim.DumpKine($DUMPEVENT);       > $OUTDIR/dump.$DUMPEVENT.kine
     mcdSim.DumpHits($DUMPEVENT);       > $OUTDIR/dump.$DUMPEVENT.hits
@@ -321,7 +321,7 @@ EOF
   if [ -f "$OUTDIR/galice.root" ]; then
     aliroot -l -b << EOF
     AliCDBManager* man = AliCDBManager::Instance();
-    man->SetDefaultStorage("local://$ALICE_ROOT/OCDB");
+    man->SetDefaultStorage("local://$ALICE_ROOT/../src/OCDB");
     AliMUONDataInterface dRec("$OUTDIR/galice.root");
     dRec.DumpDigits($DUMPEVENT,true); > $OUTDIR/dump.$DUMPEVENT.recdigits
     dRec.DumpRecPoints($DUMPEVENT);  > $OUTDIR/dump.$DUMPEVENT.recpoints
diff --git a/MUON/loadlibs.C b/MUON/loadlibs.C
deleted file mode 100644 (file)
index a19f053..0000000
+++ /dev/null
@@ -1,79 +0,0 @@
-/**************************************************************************
- * Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
- *                                                                        *
- * Author: The ALICE Off-line Project.                                    *
- * Contributors are mentioned in the code where appropriate.              *
- *                                                                        *
- * Permission to use, copy, modify and distribute this software and its   *
- * documentation strictly for non-commercial purposes is hereby granted   *
- * without fee, provided that the above copyright notice appears in all   *
- * copies and that both the copyright notice and this permission notice   *
- * appear in the supporting documentation. The authors make no claims     *
- * about the suitability of this software for any purpose. It is          *
- * provided "as is" without express or implied warranty.                  *
- **************************************************************************/
-
-/* $Id$ */
-
-/// \ingroup macros
-/// \file loadlibs.C
-/// \brief Macro which loads the libraries needed for simulation and reconstruction
-/// with MUON configuration macros
-///
-/// \author Christian Finck
-///
-/// New libraries list by Laurent Aphecetche
-
-void loadlibs () 
-{
-  gSystem->Load("libVMC");
-  gSystem->Load("libMinuit");
-  gSystem->Load("libTree");
-  gSystem->Load("libProofPlayer");
-  gSystem->Load("libXMLParser");
-  gSystem->Load("libPhysics");
-
-  gSystem->Load("libSTEERBase"); 
-  gSystem->Load("libESD");
-  gSystem->Load("libAOD");
-  
-  gSystem->Load("libRAWDatabase");
-  gSystem->Load("libRAWDatarec");
-  gSystem->Load("libCDB");
-  gSystem->Load("libANALYSIS");
-  gSystem->Load("libSTEER");
-  gSystem->Load("libANALYSISalice");
-  
-  gSystem->Load("libMUONcore");
-  gSystem->Load("libMUONmapping");
-  gSystem->Load("libMUONcalib");
-  gSystem->Load("libMUONgeometry");
-  gSystem->Load("libMUONtrigger");
-  
-  gSystem->Load("libRAWDatabase");
-  gSystem->Load("libMUONraw");
-    
-  gSystem->Load("libMUONbase");
-
-  gSystem->Load("libMUONshuttle");
-
-  gSystem->Load("libMUONrec");
-  
-  gSystem->Load("libRAWDatasim");
-  gSystem->Load("libMUONsim");
-  
-  gSystem->Load("libMUONevaluation");
-  gSystem->Load("libMUONcalign");
-  
-  gSystem->Load("libMUONgraphics");
-
-  gSystem->Load("libEVGEN");
-  gSystem->Load("libgeant321");
-  gSystem->Load("libhijing");
-  gSystem->Load("libFASTSIM");
-  gSystem->Load("libTHijing");
-  gSystem->Load("libpythia6");
-  gSystem->Load("libEGPythia6");
-  gSystem->Load("libAliPythia6");
-  
-}
index 2a10390..9a83795 100644 (file)
 /// \author Laurent Aphecetche
 
 {
-  cout << "Loading MUON libraries ..." << endl;
-  gROOT->LoadMacro("${ALICE_ROOT}/MUON/loadlibs.C");
-  gInterpreter->ProcessLine("loadlibs()");
-    
-  cout << "Setting include path ..." << endl;
-  TString includePath = "-I${ALICE_ROOT}/STEER ";
-  includePath        += "-I${ALICE_ROOT}/STEER/STEER ";
-  includePath        += "-I${ALICE_ROOT}/STEER/STEERBase ";
-  includePath        += "-I${ALICE_ROOT}/STEER/CDB ";
-  includePath        += "-I${ALICE_ROOT}/STEER/ESD ";
-  includePath        += "-I${ALICE_ROOT}/RAW ";
-  includePath        += "-I${ALICE_ROOT}/FASTSIM ";
-  includePath        += "-I${ALICE_ROOT}/EVGEN ";
-  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}/RAW ";
-  includePath        += "-I${ALICE_ROOT}/include ";
-  
-  if ( gSystem->Getenv("ALICE_INSTALL") ) includePath += "-I${ALICE_INSTALL}/include ";
-  if ( gSystem->Getenv("ALICE_BUILD") ) includePath += "-I${ALICE_BUILD}/include ";
-
-  gSystem->SetIncludePath(includePath.Data());
+  gSystem->SetIncludePath("-I${ALICE_ROOT}/include");
 }