In vmctest/gun:

- Updated commonConfig.C macro for modifications in STEER (moving
  SetGeometryFile() from AliRun in AliSimulation);
- Fixes in runsim.sh - activated test for G3, uncommented line for
  running reconstruction

diff --git a/test/vmctest/gun/commonConfig.C b/test/vmctest/gun/commonConfig.C
index 95ff720..f8a2607 100644 (file)
--- a/test/vmctest/gun/commonConfig.C
+++ b/test/vmctest/gun/commonConfig.C
@@ -45,8 +45,7 @@ void commonConfig(Bool_t setRootGeometry = kFALSE)
 
   // Set Root geometry file
   if ( setRootGeometry ) {
-    gAlice->SetRootGeometry();
-    gAlice->SetGeometryFromFile("geometry.root");
+    AliSimulation::Instance()->SetGeometryFile("geometry.root");
   }
 
   AliRunLoader* rl 

diff --git a/test/vmctest/gun/runsim.sh b/test/vmctest/gun/runsim.sh
index 127fe96..f0a9c33 100755 (executable)
--- a/test/vmctest/gun/runsim.sh
+++ b/test/vmctest/gun/runsim.sh
@@ -9,13 +9,13 @@ G4CONFIG="$ALICE_ROOT/test/vmctest/gun/g4Config.C"
 G3OUTDIR=g3
 G4OUTDIR=g4
 
-RUNG3=0
+RUNG3=1
 RUNG4=1
 
 if [ "$RUNG3" = "1" ]; then 
   rm -rf *.root *.dat *.log fort* hlt hough raw* recraw/*.root recraw/*.log
   aliroot -b -q  sim.C\($NEVENTS,\""$G3CONFIG"\"\)  2>&1 | tee sim.log
-  #aliroot -b -q rec.C      2>&1 | tee rec.log
+  aliroot -b -q rec.C      2>&1 | tee rec.log
   rm -fr $G3OUTDIR
   mkdir $G3OUTDIR
   mv *.root *.log $G3OUTDIR
@@ -26,9 +26,9 @@ if [ "$RUNG4" = "1" ]; then
   rm -rf *.root *.dat *.log fort* hlt hough raw* recraw/*.root recraw/*.log
   cp g3/geometry.root .
   aliroot -b -q  sim.C\($NEVENTS,\""$G4CONFIG"\"\)  2>&1 | tee sim.log
-  #aliroot -b -q rec.C      2>&1 | tee rec.log
+  aliroot -b -q rec.C      2>&1 | tee rec.log
   rm -fr $G4OUTDIR
   mkdir $G4OUTDIR
   mv *.root *.log $G4OUTDIR
-  cp g4Config.C $G3OUTDIR
+  cp g4Config.C $G4OUTDIR
 fi