Using GRP instead of local setters

diff --git a/test/gun/rec.C b/test/gun/rec.C
index 2816f9a10e1551edb6fe26b5464d36277331a86e..6da03f96cafd79b7caeaccf1055a8b95a36d458b 100644 (file)
--- a/test/gun/rec.C
+++ b/test/gun/rec.C
@@ -3,22 +3,10 @@ void rec() {
 
   reco.SetWriteESDfriend();
   reco.SetWriteAlignmentData();
-  AliTPCReconstructor::SetStreamLevel(1);
-  //  reco.SetRecoParam("ITS",AliITSRecoParam::GetLowFluxParam());
-  reco.SetRecoParam("TPC",AliTPCRecoParam::GetLowFluxParam());
-  reco.SetRecoParam("TRD",AliTRDrecoParam::GetLowFluxParam());
-  reco.SetRecoParam("PHOS",AliPHOSRecoParam::GetDefaultParameters());
-  reco.SetRecoParam("MUON",AliMUONRecoParam::GetLowFluxParam());
-  //  AliTPCReconstructor::SetRecoParam(AliTPCRecoParam::GetLowFluxParam());
-  //  reco.SetInput("raw.root");
-  //  reco.SetRunReconstruction("ITS TPC TRD TOF HMPID PHOS EMCAL MUON T0 VZERO FMD PMD ZDC");
- 
-  AliCDBManager::Instance()->SetCacheFlag(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=kTRUE;
-  AliTracker::SetFieldMap(field,uniform);
+
+  reco.SetDefaultStorage("local://$ALICE_ROOT");
+  reco.SetSpecificStorage("GRP/GRP/Data",
+                         Form("local://%s",gSystem->pwd()));
 
   TStopwatch timer;
   timer.Start();

diff --git a/test/gun/recraw/rec.C b/test/gun/recraw/rec.C
index e18853ddb72ece16c098fee31f77b78e57a44067..0b1a95d3567e24971834711394a550443c53b7e6 100644 (file)
--- a/test/gun/recraw/rec.C
+++ b/test/gun/recraw/rec.C
@@ -1,30 +1,18 @@
 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();
-  //  AliTPCReconstructor::SetStreamLevel(1);
-  //  reco.SetRecoParam("ITS",AliITSRecoParam::GetLowFluxParam());
-  reco.SetRecoParam("TPC",AliTPCRecoParam::GetLowFluxParam());
-  reco.SetRecoParam("TRD",AliTRDrecoParam::GetLowFluxParam());
-  reco.SetRecoParam("PHOS",AliPHOSRecoParam::GetDefaultParameters());
-  reco.SetRecoParam("MUON",AliMUONRecoParam::GetLowFluxParam());
- 
-  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.SetInput("raw.root");
 
   reco.SetNumberOfEventsPerFile(-1); // all events in one single file
 
-  reco.SetRunQA(":");
-  reco.SetRunGlobalQA(kTRUE);
-
   TStopwatch timer;
   timer.Start();
   reco.Run();

diff --git a/test/gun/sim.C b/test/gun/sim.C
index ef1e7d20279a44715f223eb6e42ff99188cd5178..92f57fad3d1a33062ade8cddca5c270fe90ed392 100644 (file)
--- a/test/gun/sim.C
+++ b/test/gun/sim.C
@@ -1,9 +1,14 @@
 void sim(Int_t nev=4) {
+
   AliSimulation simulator;
   simulator.SetMakeSDigits("TRD TOF PHOS HMPID EMCAL MUON FMD ZDC PMD T0 VZERO");
   simulator.SetMakeDigitsFromHits("ITS TPC");
   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();
   simulator.Run(nev);