recraw.C removed, using recraw/rec.C instead. Restoring the original test layout

diff --git a/test/PbPbbench/recraw.C b/test/PbPbbench/recraw.C
deleted file mode 100644 (file)
index 6bad063..0000000
--- a/test/PbPbbench/recraw.C
+++ /dev/null
@@ -1,24 +0,0 @@
-void rec() {
-  AliReconstruction reco;
-
-  reco.SetWriteESDfriend();
-  reco.SetWriteAlignmentData();
-  reco.SetInput("raw.root");
-  reco.SetDefaultStorage("local://$ALICE_ROOT/OCDB");
-  reco.SetSpecificStorage("GRP/GRP/Data",
-                         Form("local://%s",gSystem->pwd()));
-  reco.SetRunQA("ALL:ALL") ;
-  
-  AliQA::SetQARefStorage("local://$ALICE_ROOT/QAref") ;
-  
-  for (Int_t det = 0 ; det < AliQA::kNDET ; det++) {
-    reco.SetQACycles(det, 999) ;
-    reco.SetQAWriteExpert(det) ; 
-  }
-
-  TStopwatch timer;
-  timer.Start();
-  reco.Run();
-  timer.Stop();
-  timer.Print();
-}

diff --git a/test/PbPbbench/recraw/rec.C b/test/PbPbbench/recraw/rec.C
index f4e66cf62550f57236e897cc04d1e82f04314977..2730c02e3f027fb324004f639f2836f3ec88ce07 100644 (file)
--- a/test/PbPbbench/recraw/rec.C
+++ b/test/PbPbbench/recraw/rec.C
@@ -10,6 +10,15 @@ void rec() {
   reco.SetSpecificStorage("GRP/GRP/Data",
                          Form("local://%s/..",gSystem->pwd()));
 
+  reco.SetRunQA("ALL:ALL") ;
+  
+  AliQA::SetQARefStorage("local://$ALICE_ROOT/QAref") ;
+  
+  for (Int_t det = 0 ; det < AliQA::kNDET ; det++) {
+    reco.SetQACycles(det, 999) ;
+    reco.SetQAWriteExpert(det) ; 
+  }
+
   reco.SetInput("raw.root");
 
   reco.SetNumberOfEventsPerFile(-1); // all events in one single file

diff --git a/test/PbPbbench/runtest.sh b/test/PbPbbench/runtest.sh
index 46157a15f77c1cab47db724ff6d8f134a91fed88..6a5b78d96637d665db091e19250bab7bdc5345a7 100755 (executable)
--- a/test/PbPbbench/runtest.sh
+++ b/test/PbPbbench/runtest.sh
@@ -18,13 +18,10 @@ aliroot -b -q $1sim.C      2>&1 | tee sim.log
 aliroot -b -q $1rec.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/CreateAODfromESD.C 2>&1 | tee aod.log
-if [ ! -e recraw ] ; then 
- mkdir recraw
-fi
+
 cd recraw
 ln -s ../raw.root
-ln -s ../GRP
-aliroot -b -q ../recraw.C      2>&1 | tee rec.log
+aliroot -b -q rec.C      2>&1 | tee rec.log
 aliroot -b -q ${ALICE_ROOT}/STEER/CreateAODfromESD.C 2>&1 | tee aod.log