ATO-17, ATO-34 Generate modified version of the RecoParam outside of main simulation...

diff --git a/test/testdEdx/sim.C b/test/testdEdx/sim.C
index 2d2af14d3cd7890e7d7432cf3744206ef8043032..85e1ca529745439927b9007f51921435c629d4b4 100644 (file)
--- a/test/testdEdx/sim.C
+++ b/test/testdEdx/sim.C
@@ -18,7 +18,7 @@ void ModifyRecoParam(TObjArray* recoArray, Bool_t useIonTail, Double_t crossTalk
   TString localStorage = "local://"+gSystem->GetFromPipe("pwd")+"/OCDBsim";
   AliCDBStorage*pocdbStorage = AliCDBManager::Instance()->GetStorage(localStorage.Data());  
   AliCDBMetaData *metaData= new AliCDBMetaData();
-  AliCDBId*   id1=new AliCDBId("TPC/Calib/RecoParam/", man->GetRun(), man->GetRun());
+  AliCDBId*   id1=new AliCDBId("TPC/Calib/RecoParam/", man->GetRun(), AliCDBRunRange::Infinity());
   pocdbStorage->Put(recoArray, (*id1), metaData);
   AliCDBManager::Instance()->SetSpecificStorage("TPC/Calib/RecoParam/",localStorage.Data());
 }
@@ -33,15 +33,17 @@ void sim(Int_t nev, Bool_t useIonTail, Double_t crossTalkCorrection) {
   gSystem->Load("libTHijing");
   gSystem->Load("libgeant321");
 
-  AliCDBManager * man = AliCDBManager::Instance();
-  man->SetDefaultStorage("local://$ALICE_ROOT/OCDB");
-  man->SetSpecificStorage("TPC/Calib/RecoParam/",recoStorage);
-  man->SetRun(run);
-  AliCDBEntry* e = man->Get("TPC/Calib/RecoParam/",run); // get default
-  // modify content
-  TObjArray* recoArray = (TObjArray*)e->GetObject();
-  ModifyRecoParam(recoArray, useIonTail, crossTalkCorrection);
-
+  if (nev<0){
+    AliCDBManager * man = AliCDBManager::Instance();
+    man->SetDefaultStorage("local://$ALICE_ROOT/OCDB");
+    man->SetSpecificStorage("TPC/Calib/RecoParam/",recoStorage);
+    man->SetRun(run);
+    AliCDBEntry* e = man->Get("TPC/Calib/RecoParam/",run); // get default
+    // modify content
+    TObjArray* recoArray = (TObjArray*)e->GetObject();
+    ModifyRecoParam(recoArray, useIonTail, crossTalkCorrection);
+    return;
+  }
 
   if (gSystem->Getenv("EVENT")) nev = atoi(gSystem->Getenv("EVENT")) ;   
   
@@ -52,6 +54,8 @@ void sim(Int_t nev, Bool_t useIonTail, Double_t crossTalkCorrection) {
 
   simulator.SetDefaultStorage("local://$ALICE_ROOT/OCDB");
   simulator.SetSpecificStorage("GRP/GRP/Data", Form("local://%s",gSystem->pwd()));
+  TString localStorage = "local://"+gSystem->GetFromPipe("pwd")+"/OCDBsim";
+  AliCDBManager::Instance()->SetSpecificStorage("TPC/Calib/RecoParam/",localStorage.Data());
   
   simulator.SetRunQA(":") ; 
   

diff --git a/test/testdEdx/submitSimJobs.sh b/test/testdEdx/submitSimJobs.sh
index cc9173d913b0907097bb0aef5983715934a044d0..06572f47e9b11d1624f938a95e23bfcca6e241ce 100644 (file)
--- a/test/testdEdx/submitSimJobs.sh
+++ b/test/testdEdx/submitSimJobs.sh
@@ -98,6 +98,7 @@ runSim(){
   rm -rf *.root *.dat *.log fort* hlt hough raw* recraw/*.root recraw/*.log GRP* 
   printf   "\n ======================================================================\n\n"
   echo Running: aliroot -b -q sim.C\($nevents,$ionTail,$xTalk\)     
+  aliroot -b -q sim.C\(-1,$ionTail,$xTalk\)            2>&1 | tee sim.log    #  make a specific OCDB for simulation
   aliroot -b -q sim.C\($nevents,$ionTail,$xTalk\)            2>&1 | tee sim.log
   mv syswatch.log simwatch.log
   printf   "\n ======================================================================\n\n"