Allow to choose the specific storage for alignment data both in simulation and recons...

diff --git a/PWG/muondep/AccEffTemplates/rec.C b/PWG/muondep/AccEffTemplates/rec.C
index 1ab5e11e5b9d854e8a0ce0720c80e244a26e8de7..77a7478143d780d3cc0424a422bbc524ce83b865 100644 (file)
--- a/PWG/muondep/AccEffTemplates/rec.C
+++ b/PWG/muondep/AccEffTemplates/rec.C
@@ -28,7 +28,7 @@ void rec(int dset=0)
   reco.SetSpecificStorage("GRP/GRP/Data",Form("local://%s",gSystem->pwd()));
   
   // MUON Tracker Residual Alignment
-  reco.SetSpecificStorage("MUON/Align/Data","alien://folder=/alice/simulation/2008/v4-15-Release/Residual");
+  reco.SetSpecificStorage("MUON/Align/Data",VAR_REC_ALIGNDATA);
   
   reco.Run();
 }

diff --git a/PWG/muondep/AccEffTemplates/sim.C b/PWG/muondep/AccEffTemplates/sim.C
index 50cd2e0a7c96fea031a6e88b54676fb58b9ae7ca..93cd17e07228a5c7dcf723baa7652dbcd17b5c1b 100644 (file)
--- a/PWG/muondep/AccEffTemplates/sim.C
+++ b/PWG/muondep/AccEffTemplates/sim.C
@@ -23,7 +23,7 @@ void sim(Int_t nev=100)
   if ( ! VAR_PURELY_LOCAL ) {
     
     // MUON Tracker
-    simulator.SetSpecificStorage("MUON/Align/Data","alien://folder=/alice/simulation/2008/v4-15-Release/Ideal");
+    simulator.SetSpecificStorage("MUON/Align/Data",VAR_SIM_ALIGNDATA);
   
     // Mag.field from OCDB
     simulator.UseMagFieldFromGRP();

diff --git a/PWG/muondep/AliMuonAccEffSubmitter.cxx b/PWG/muondep/AliMuonAccEffSubmitter.cxx
index 9f2e134b6783c5d60228d6347013431bee3b88bd..8a53d49e63a0f89151fe083eeace503115e49b06 100644 (file)
--- a/PWG/muondep/AliMuonAccEffSubmitter.cxx
+++ b/PWG/muondep/AliMuonAccEffSubmitter.cxx
@@ -139,6 +139,10 @@ fUseAODMerging(kFALSE)
 
   SetVar("VAR_PURELY_LOCAL",Form("%d",localOnly));
   
+  SetVar("VAR_SIM_ALIGNDATA","\"alien://folder=/alice/simulation/2008/v4-15-Release/Ideal\"");
+  
+  SetVar("VAR_REC_ALIGNDATA","\"alien://folder=/alice/simulation/2008/v4-15-Release/Residual\"");
+  
   UseOCDBSnapshots(fUseOCDBSnapshots);
   
   SetGenerator(generator);
@@ -770,6 +774,8 @@ Int_t AliMuonAccEffSubmitter::LocalTest()
     AliError("Please fix the number of input events using MakeNofEventsFixed()");
     return 0;
   }
+  
+  const std::vector<int>& runs = RunList();
 
   std::cout << "Generating script to execute : ./simrun.sh" << std::endl;
 
@@ -777,7 +783,7 @@ Int_t AliMuonAccEffSubmitter::LocalTest()
   
   out << "#!/bin/bash" << std::endl;
 //  root.exe -b -q simrun.C  --run <x> --chunk <y> --event <n>
-  out << "root.exe -b -q simrun.C --run 0 --event " << fFixedNofEvents << std::endl;
+  out << "root.exe -b -q simrun.C --run "<< runs[0] <<" --event " << fFixedNofEvents << std::endl;
  
   gSystem->Exec("chmod +x simrun.sh");