X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=TPC%2FrecTPC.C;h=49087a568e6c07a10b60b1d5e7a397f2502d2905;hb=7e124979ac4d7074184f476e15f24634f2f4183f;hp=ca13af3c003b2ba19d7f145f78351e7151a2f626;hpb=530474cc15353f9b6b912e879b92ca889841b2ea;p=u%2Fmrichter%2FAliRoot.git

diff --git a/TPC/recTPC.C b/TPC/recTPC.C
index ca13af3c003..49087a568e6 100644
--- a/TPC/recTPC.C
+++ b/TPC/recTPC.C
@@ -6,7 +6,7 @@
 //
 //
 
-void recTPC(const char *filename="data.root", Int_t type=0)
+void recTPC(Int_t type, const char *filename="data.root")
 {
   //
   // Set path to calibration data
@@ -14,54 +14,57 @@ void recTPC(const char *filename="data.root", Int_t type=0)
   // type variable = 0 - cosmic test
   //               = 1 - laser test   
   AliCDBManager * man = AliCDBManager::Instance();
-  man->SetDefaultStorage("local://$ALICE_ROOT");
-  man->SetRun(0);
-  man->SetSpecificStorage("TPC","local:///afs/cern.ch/user/m/mivanov/public/Calib");
+  man->SetDefaultStorage("local://$ALICE_ROOT/OCDB");
+  //man->SetRun(0);
+  //man->SetSpecificStorage("TPC/*/*","local:///afs/cern.ch/user/m/mivanov/public/Calib");
   //
   // Set reconstruction parameters
   //
   AliLog::SetClassDebugLevel("AliTPCclustererMI",2);
-  AliTPCRecoParam * tpcRecoParam = (type==0)? AliTPCRecoParam::GetCosmicTestParam(kTRUE):
-    AliTPCRecoParam::GetLaserTestParam(kTRUE);
+  AliTPCRecoParam * tpcRecoParam = 0;
+  if (type==0)  tpcRecoParam = AliTPCRecoParam::GetCosmicTestParam(kTRUE);
+  if (type>0)  tpcRecoParam = AliTPCRecoParam::GetLaserTestParam(kTRUE);
+  tpcRecoParam->Dump();
   AliTPCReconstructor::SetRecoParam(tpcRecoParam);
   AliTPCReconstructor::SetStreamLevel(1);
   //
   //
   //
   AliReconstruction rec;  
-  rec.SetSpecificStorage("TPC","local:///afs/cern.ch/user/m/mivanov/public/Calib");
+  rec.SetDefaultStorage("local://$ALICE_ROOT/OCDB");
+  rec.SetSpecificStorage("TPC/*/*","local:///afs/cern.ch/user/m/mivanov/public/Calib");
   rec.SetLoadAlignData("");
   rec.SetWriteESDfriend(kTRUE);
   rec.SetInput(filename);
   rec.SetEquipmentIdMap("EquipmentIdMap.data");
   rec.SetRunReconstruction("TPC");
-  rec.SetOption("TPC","PedestalSubtraction OldRCUFormat");
+  rec.SetOption("TPC","PedestalSubtraction");
   //  rec.SetRunLocalReconstruction("");
   //  rec.SetRunTracking("TPC");
   rec.SetFillESD("TPC");
   rec.SetFillTriggerESD(kFALSE);
   rec.SetRunVertexFinder(kFALSE);
-  AliMagFMaps* field = new AliMagFMaps("Maps","Maps", 2, 1., 10., 1);
-  AliTracker::SetFieldMap(field,1);
   rec.SetWriteAlignmentData(kTRUE);
   rec.Run();
 }
 
-void recTracking(const char *filename="data.root", Int_t type=0, Int_t nevents=1)
+void recTracking(Int_t type, const char *filename="data.root")
 {
   //
   // Set path to calibration data
   //
   AliCDBManager * man = AliCDBManager::Instance();
-  man->SetDefaultStorage("local://$ALICE_ROOT");
+  man->SetDefaultStorage("local://$ALICE_ROOT/OCDB");
   man->SetRun(0);
-  man->SetSpecificStorage("TPC","local:///afs/cern.ch/user/m/mivanov/public/Calib");
+  man->SetSpecificStorage("TPC/*/*","local:///afs/cern.ch/user/m/mivanov/public/Calib");
   //
   // Set reconstruction parameters
   //
   AliLog::SetClassDebugLevel("AliTPCclustererMI",2);
-  AliTPCRecoParam * tpcRecoParam = (type==0)? AliTPCRecoParam::GetCosmicTestParam(kTRUE):
-    AliTPCRecoParam::GetLaserTestParam(kTRUE);
+
+  AliTPCRecoParam * tpcRecoParam = 0;
+  if (type==0)  tpcRecoParam = AliTPCRecoParam::GetCosmicTestParam(kTRUE);
+  if (type>0)  tpcRecoParam = AliTPCRecoParam::GetLaserTestParam(kTRUE);
 
   AliTPCReconstructor::SetRecoParam(tpcRecoParam);
   AliTPCReconstructor::SetStreamLevel(1);
@@ -70,22 +73,20 @@ void recTracking(const char *filename="data.root", Int_t type=0, Int_t nevents=1
   //
   //
   AliReconstruction rec;
-  //rec.SetSpecificStorage("TPC","local:///afs/cern.ch/user/m/mivanov/public/Calib");
+  rec.SetSpecificStorage("TPC/*/*","local:///afs/cern.ch/user/m/mivanov/public/Calib");
   rec.SetLoadAlignData("");
   rec.SetWriteESDfriend(kTRUE);
   rec.SetInput(filename);
   rec.SetEquipmentIdMap("EquipmentIdMap.data");
   //rec.SetRunReconstruction("TPC");
-  rec.SetOption("TPC","PedestalSubtraction OldRCUFormat");
+  rec.SetOption("TPC","PedestalSubtraction");
   rec.SetRunLocalReconstruction("");
   rec.SetRunTracking("TPC");
   rec.SetFillESD("TPC");
   rec.SetFillTriggerESD(kFALSE);
   rec.SetRunVertexFinder(kFALSE);
-  AliMagFMaps* field = new AliMagFMaps("Maps","Maps", 2, 1., 10., 1);
-  AliTracker::SetFieldMap(field,1);
   rec.SetWriteAlignmentData(kTRUE);
-  rec.Run(0,nevents);
+  rec.Run(0);
 }