From 878f3d5420c79c2c7981b7ad9b13278f72d4a1c2 Mon Sep 17 00:00:00 2001 From: ivana Date: Wed, 10 Mar 2010 16:35:15 +0000 Subject: [PATCH] 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 --- test/vmctest/gun/commonConfig.C | 3 +-- test/vmctest/gun/runsim.sh | 8 ++++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/test/vmctest/gun/commonConfig.C b/test/vmctest/gun/commonConfig.C index 95ff720f7a0..f8a2607c4a6 100644 --- 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 127fe961584..f0a9c334fec 100755 --- 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 -- 2.27.0