Reverting previous commit, these files should not be modified

diff --git a/test/QA/simrun.sh b/test/QA/simrun.sh
index 6bed857308acf0fc978bc8a81af815c44a5a92f0..ea469aaf5b5911c887b942b2f6f52d03408c7f01 100755 (executable)
--- a/test/QA/simrun.sh
+++ b/test/QA/simrun.sh
@@ -33,7 +33,7 @@ ln -s ../DB
 ln -si $ALICE_ROOT/test/QA/recraw.C recraw.C
 aliroot -b -q recraw.C  > recraw.log 
 cp  $ALICE_ROOT/test/QA/rawqa.C .
-aliroot -b > rawqa.log << EOF
+alienaliroot -b > rawqa.log << EOF
 .x  $ALICE_ROOT/test/QA/rootlogon.C
 .L rawqa.C++
 rawqa(21950, 10)

diff --git a/test/cosmic/rec.C b/test/cosmic/rec.C
index 4529ff122fd66b94f23b000c964d821b92a62f16..bcc7a2a231ee8a347e93e5aa96c9ce0002e0e90a 100644 (file)
--- a/test/cosmic/rec.C
+++ b/test/cosmic/rec.C
@@ -1,4 +1,4 @@
-void rec(const char *filename="raw.root")\r
+void rec(const char *filename="raw.root", const Int_t mfield=1)\r
 {\r
   /////////////////////////////////////////////////////////////////////////////////////////\r
   //\r
@@ -7,33 +7,19 @@ void rec(const char *filename="raw.root")
   //\r
   /////////////////////////////////////////////////////////////////////////////////////////\r
   //AliLog::SetGlobalLogLevel(AliLog::kWarning);\r
-  //  AliLog::SetGlobalLogLevel(AliLog::kError);\r
+  AliLog::SetGlobalLogLevel(AliLog::kError);\r
 \r
   gSystem->Load("libRAliEn.so");\r
   gSystem->Load("libNet.so");\r
-  if (gSystem->Load("libMonaLisa.so") == 0) {\r
-    new TMonaLisaWriter(0, "GridAliRoot-rec.C", 0, 0, "global");\r
-    gSystem->Setenv("APMON_INTERVAL", "120");\r
-  }\r
+  gSystem->Load("libMonaLisa.so");\r
+  new TMonaLisaWriter(0, "GridAliRoot-rec.C", 0, 0, "global");\r
+  gSystem->Setenv("APMON_INTERVAL", "120");\r
 \r
   // Set the CDB storage location\r
   AliCDBManager * man = AliCDBManager::Instance();\r
-  //  man->SetDefaultStorage("local://$ALICE_ROOT");\r
-  man->SetDefaultStorage("alien://folder=/alice/data/2008/LHC08c/OCDB/");\r
-//   man->SetSpecificStorage("ITS/Calib/*","local://$ALICE_ROOT");\r
-//   man->SetSpecificStorage("ITS/Calib/BadChannelsSSD","alien://folder=/alice/data/2008/LHC08c/OCDB");\r
-//   man->SetSpecificStorage("ITS/Calib/CalibSDD","alien://folder=/alice/data/2008/LHC08c/OCDB");\r
-//   man->SetSpecificStorage("ITS/Calib/DDLMapSDD","alien://folder=/alice/data/2008/LHC08c/OCDB");\r
-//   man->SetSpecificStorage("ITS/Calib/DriftSpeedSDD","alien://folder=/alice/data/2008/LHC08c/OCDB");\r
-//   man->SetSpecificStorage("ITS/Calib/GainSSD","alien://folder=/alice/data/2008/LHC08c/OCDB");\r
-//   man->SetSpecificStorage("ITS/Calib/HLTforSDD","alien://folder=/alice/data/2008/LHC08c/OCDB");\r
-//   man->SetSpecificStorage("ITS/Calib/MapsTimeSDD","alien://folder=/alice/data/2008/LHC08c/OCDB");\r
-//   man->SetSpecificStorage("ITS/Calib/NoiseSSD","alien://folder=/alice/data/2008/LHC08c/OCDB");\r
-//   man->SetSpecificStorage("ITS/Calib/RecoParam","alien://folder=/alice/data/2008/LHC08c/OCDB");\r
-//   man->SetSpecificStorage("ITS/Calib/SPDDead","alien://folder=/alice/data/2008/LHC08c/OCDB");\r
-//   man->SetSpecificStorage("ITS/Calib/SPDNoisy","alien://folder=/alice/data/2008/LHC08c/OCDB");\r
-//   man->SetSpecificStorage("FMD/Calib/*","local://$ALICE_ROOT");\r
-//   man->SetSpecificStorage("VZERO/Calib/*","local://$ALICE_ROOT");\r
+    man->SetDefaultStorage("local://$ALICE_ROOT");\r
+  //man->SetDefaultStorage("alien://folder=/alice/data/2008/LHC08a/OCDB/");\r
+  man->SetSpecificStorage("ITS/Calib/*","local://$ALICE_ROOT");\r
   \r
   // Example in case a specific CDB storage is needed\r
   //  man->SetSpecificStorage("ITS/Calib/MapsAnodeSDD","local://$ALICE_ROOT");\r
@@ -107,6 +93,12 @@ void rec(const char *filename="raw.root")
   rec.SetRecoParam("MUON",muonRecoParam);\r
  \r
   // Tracking settings\r
+  AliMagFMaps* field;\r
+  if (mfield)\r
+     field = new AliMagFMaps("Maps","Maps", 2, 1., 10., AliMagFMaps::k5kG);\r
+   else\r
+     field = new AliMagFMaps("Maps","Maps", 2, 0., 10., 2);\r
+  AliTracker::SetFieldMap(field,1);\r
   Double_t mostProbPt=0.35;\r
   AliExternalTrackParam::SetMostProbablePt(mostProbPt);\r
 \r
@@ -119,7 +111,7 @@ void rec(const char *filename="raw.root")
   rec.SetUseTrackingErrorsForAlignment("ITS");\r
 \r
   // In case some detectors have to be switched off...\r
-  rec.SetRunReconstruction("ALL");\r
+  rec.SetRunReconstruction("ITS TPC TRD TOF HMPID PHOS MUON FMD PMD T0 VZERO ZDC ACORDE");\r
 \r
   // Enable vertex finder - it is needed for cosmic track reco\r
   rec.SetRunVertexFinder(kTRUE);\r
@@ -143,14 +135,8 @@ void rec(const char *filename="raw.root")
 \r
   //rec.SetEventRange(0,15);\r
 \r
-  rec.SetRunQA("ALL:ALL");\r
-  for (Int_t det = 0 ; det < AliReconstruction::fgkNDetectors ; det++) {\r
-    rec.SetQACycles(det, 1) ;\r
-    rec.SetQAWriteExpert(det) ; \r
-  }\r
-\r
+  rec.SetRunQA("ITS TPC:ESD RECPOINT");\r
   rec.SetRunGlobalQA(kTRUE);\r
-\r
   AliLog::Flush();\r
   rec.Run();\r
 \r

diff --git a/test/fpprod/sim.C b/test/fpprod/sim.C
index 38cd222990e47bb9796a9dab7e228717a20e8613..a960e1571e850fe65120f27b53e440079a18bb52 100644 (file)
--- a/test/fpprod/sim.C
+++ b/test/fpprod/sim.C
@@ -1,4 +1,4 @@
-void sim(Int_t nev=5) {
+void sim(Int_t nev=50) {
   if (!strcmp(gSystem->GetBuildArch(),"win32gcc")) {
     gSystem->Load("libProof");
     gSystem->Load("libGui");