Using GRP instead of local setters. Creation of AOD for from the RAW ESDs. No need...

diff --git a/test/PbPbbench/rec.C b/test/PbPbbench/rec.C
index 494644123d6610fe1e901b6ad6247bd07382639d..9a7ccc807665e4892ed2fbadd4d7cd74f0aa5bc1 100644 (file)
--- a/test/PbPbbench/rec.C
+++ b/test/PbPbbench/rec.C
@@ -3,18 +3,11 @@ void rec() {
 
   reco.SetWriteESDfriend();
   reco.SetWriteAlignmentData();
-  reco.SetRecoParam("ITS",AliITSRecoParam::GetHighFluxParam());
-  reco.SetRecoParam("TPC",AliTPCRecoParam::GetHighFluxParam());
-  reco.SetRecoParam("TRD",AliTRDrecoParam::GetHighFluxParam());
-  reco.SetRecoParam("PHOS",AliPHOSRecoParam::GetDefaultParameters());
-  reco.SetRecoParam("MUON",AliMUONRecoParam::GetHighFluxParam());
-  //  AliTPCReconstructor::SetStreamLevel(1);
-  reco.SetRunVertexFinderTracks(kFALSE);
 
-// **** The field map settings must be the same as in Config.C !
-  AliMagFMaps *field=new AliMagFMaps("Maps","Maps",2,1.,10.,AliMagFMaps::k5kG);
-  Bool_t uniform=kFALSE;
-  AliTracker::SetFieldMap(field,uniform);
+  reco.SetDefaultStorage("local://$ALICE_ROOT");
+  reco.SetSpecificStorage("GRP/GRP/Data",
+                         Form("local://%s",gSystem->pwd()));
+  reco.SetRecoParam("ITS",AliITSRecoParam::GetHighFluxParam()); // to change the default vertexer
 
   TStopwatch timer;
   timer.Start();

diff --git a/test/PbPbbench/recraw/rec.C b/test/PbPbbench/recraw/rec.C
index 194a5ed343544c49aad8273446e57360edbe593b..373318566ba8fe8a1a39ca07f03eae0570a8546a 100644 (file)
--- a/test/PbPbbench/recraw/rec.C
+++ b/test/PbPbbench/recraw/rec.C
@@ -1,25 +1,19 @@
 void rec() {
 
-  AliCDBManager::Instance()->SetRun(0);
-
-  AliMagFMaps* field = new AliMagFMaps("Maps","Maps", 2, 1., 10., AliMagFMaps::k5kG);
-  AliTracker::SetFieldMap(field,kTRUE);
-
   AliReconstruction reco;
 
   reco.SetUniformFieldTracking(kFALSE);
   reco.SetWriteESDfriend();
   reco.SetWriteAlignmentData();
-  reco.SetRecoParam("TPC",AliTPCRecoParam::GetHighFluxParam());
-  reco.SetRecoParam("TRD",AliTRDrecoParam::GetHighFluxParam());
-  reco.SetRecoParam("PHOS",AliPHOSRecoParam::GetDefaultParameters());
-  reco.SetRecoParam("MUON",AliMUONRecoParam::GetHighFluxParam());
 
-  reco.SetRunReconstruction("ITS TPC TRD TOF HMPID PHOS EMCAL MUON FMD PMD ZDC T0 VZERO");
+  reco.SetDefaultStorage("local://$ALICE_ROOT");
+  reco.SetSpecificStorage("GRP/GRP/Data",
+                         Form("local://%s/..",gSystem->pwd()));
+  reco.SetRecoParam("ITS",AliITSRecoParam::GetHighFluxParam()); // to change the default vertexer
+
   reco.SetInput("raw.root");
 
   reco.SetNumberOfEventsPerFile(-1); // all events in one single file
-  reco.SetRunVertexFinderTracks(kFALSE);
 
   TStopwatch timer;
   timer.Start();

diff --git a/test/PbPbbench/runtest.sh b/test/PbPbbench/runtest.sh
index befc274eccd0c4d8d0bb44578d573a5e45928696..6a5b78d96637d665db091e19250bab7bdc5345a7 100755 (executable)
--- a/test/PbPbbench/runtest.sh
+++ b/test/PbPbbench/runtest.sh
@@ -20,9 +20,9 @@ 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
 
 cd recraw
-ln -s ../geometry.root
 ln -s ../raw.root
 aliroot -b -q rec.C      2>&1 | tee rec.log
+aliroot -b -q ${ALICE_ROOT}/STEER/CreateAODfromESD.C 2>&1 | tee aod.log
 
 
 

diff --git a/test/PbPbbench/sim.C b/test/PbPbbench/sim.C
index b1453349ea3bd83bc53f4a0792de91241546bcf5..55f41df07a4b910e38776991f813b34b5bdfdea6 100644 (file)
--- a/test/PbPbbench/sim.C
+++ b/test/PbPbbench/sim.C
@@ -1,6 +1,10 @@
 void sim(Int_t nev=1) {
   AliSimulation simulator;
   simulator.SetWriteRawData("ALL","raw.root",kTRUE);
+
+  simulator.SetDefaultStorage("local://$ALICE_ROOT");
+  simulator.SetSpecificStorage("GRP/GRP/Data",
+                              Form("local://%s",gSystem->pwd()));
  
   TStopwatch timer;
   timer.Start();