Create the magnetic field map in the reconstruction macros (Yuri)

diff --git a/test/PbPbbench/rec.C b/test/PbPbbench/rec.C
index 05c02ff672abe56211020b6d1cbda124f1367312..b4b303b9ea065abf115275f552e0697566359994 100644 (file)
--- a/test/PbPbbench/rec.C
+++ b/test/PbPbbench/rec.C
@@ -1,7 +1,6 @@
 void rec() {
   AliReconstruction reco;
 
-  reco.SetUniformFieldTracking(kFALSE);
   reco.SetWriteESDfriend();
   reco.SetWriteAlignmentData();
   AliTPCRecoParam * tpcRecoParam = AliTPCRecoParam::GetHighFluxParam();
@@ -9,6 +8,11 @@ void rec() {
   //  AliTPCReconstructor::SetStreamLevel(1);
   reco.SetRunVertexFinderTracks(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=kFALSE;
+  AliTracker::SetFieldMap(field,uniform);
+
   TStopwatch timer;
   timer.Start();
   reco.Run();

diff --git a/test/QA/rec.C b/test/QA/rec.C
index ce0e85da2119b61a35abc71fd4e850a8c99fb46b..ba738fee7df0edef4d22ab69a60595e1e0e72de9 100644 (file)
--- a/test/QA/rec.C
+++ b/test/QA/rec.C
@@ -6,9 +6,7 @@ void rec() {
   man->SetSpecificStorage("EMCAL/*","local://DB");
   
   AliReconstruction reco;
-  AliMagFMaps* field = new AliMagFMaps("Maps","Maps", 2, 1., 10., AliMagFMaps::k5kG);
-  AliTracker::SetFieldMap(field,kTRUE);
-  reco.SetUniformFieldTracking(kFALSE);
+
   reco.SetWriteESDfriend();
   reco.SetWriteAlignmentData();
   
@@ -24,6 +22,11 @@ void rec() {
   AliQA::SetQARefStorage(Form("%s%s/", AliQA::GetQARefDefaultStorage(), kYear)) ;
   AliQA::SetQARefDataDirName("Sim") ; //Data, Pedestals, BlackEvent, .....
   
+// **** 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=kFALSE;
+  AliTracker::SetFieldMap(field,uniform);
+
   TStopwatch timer;
   timer.Start();
   reco.Run();

diff --git a/test/fpprod/rec.C b/test/fpprod/rec.C
index e49150386db3d03b967be15da33e68162a474740..d99667d63fed05088a6af61b22f1b9dc95b40d92 100644 (file)
--- a/test/fpprod/rec.C
+++ b/test/fpprod/rec.C
@@ -1,6 +1,6 @@
 void rec() {
   AliReconstruction reco;
-  reco.SetUniformFieldTracking(kFALSE);
+
   reco.SetWriteESDfriend();
   reco.SetWriteAlignmentData();
   AliTPCRecoParam * tpcRecoParam = AliTPCRecoParam::GetLowFluxParam();
@@ -12,6 +12,15 @@ void rec() {
   reco.SetRunGlobalQA(kFALSE);
   reco.SetMeanVertexConstraint(kFALSE);
 
+// **** The field map settings must be the same as in Config.C !
+  AliMagWrapCheb* field = 0x0;
+  //field = new AliMagWrapCheb("Maps","Maps", 2, 0., 10., AliMagWrapCheb::k2kG);
+  //Bool_t uniform=kTRUE;
+  //AliTracker::SetFieldMap(field,uniform); // tracking with the uniform field
+  field = new AliMagWrapCheb("Maps","Maps", 2, 1., 10., AliMagWrapCheb::k5kG);
+  Bool_t uniform=kFALSE;
+  AliTracker::SetFieldMap(field,uniform);  // tracking with the real map
+
   TStopwatch timer;
   timer.Start();
   reco.Run();

diff --git a/test/genkine/sim/rec.C b/test/genkine/sim/rec.C
index 38e75fdb5af043ef61beddc58ab2c8e38a7df071..127d0d35cef54b0568ccb40e84f027a44a18d1e7 100644 (file)
--- a/test/genkine/sim/rec.C
+++ b/test/genkine/sim/rec.C
@@ -3,6 +3,11 @@ void rec() {
 
   //  reco.SetRunReconstruction("ITS TPC TRD TOF HMPID FMD PMD VZERO START MUON ZDC");
 
+// **** 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=kFALSE;
+  AliTracker::SetFieldMap(field,uniform);
+
   TStopwatch timer;
   timer.Start();
   reco.Run();

diff --git a/test/gun/rec.C b/test/gun/rec.C
index 596f9344cebf35eaad5e7d7e8a0dd56a88c4aa3e..8424f6045435b323167e197d25fab4755865b36b 100644 (file)
--- a/test/gun/rec.C
+++ b/test/gun/rec.C
@@ -1,6 +1,6 @@
 void rec() {
   AliReconstruction reco;
-  reco.SetUniformFieldTracking(kFALSE);
+
   reco.SetWriteESDfriend();
   reco.SetWriteAlignmentData();
   AliTPCReconstructor::SetStreamLevel(1);
@@ -10,6 +10,10 @@ void rec() {
  
   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);
 
   TStopwatch timer;
   timer.Start();

diff --git a/test/merge/backgr/rec.C b/test/merge/backgr/rec.C
index 2a2307cd184c15c4c5150cfea17e64d09d6a6e35..4f50107ff93d66a6c162496d317e56ea9b51c23f 100644 (file)
--- a/test/merge/backgr/rec.C
+++ b/test/merge/backgr/rec.C
@@ -1,13 +1,17 @@
 void rec() {
 
   AliReconstruction reco;
-  reco.SetUniformFieldTracking(kFALSE);
   reco.SetWriteESDfriend();
   reco.SetWriteAlignmentData();
   AliTPCReconstructor::SetStreamLevel(1);
   AliTPCReconstructor::SetRecoParam(AliTPCRecoParam::GetLowFluxParam());
   //  reco.SetInput("raw.root");
 
+// **** 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=kFALSE;
+  AliTracker::SetFieldMap(field,uniform);
+
   TStopwatch timer;
   timer.Start();
   reco.Run();

diff --git a/test/merge/signal/rec.C b/test/merge/signal/rec.C
index 4a5f91810db3a8e4cae4f2925160361a66585401..5888f6bb73bee51fed26cce40f5db5d745f42095 100644 (file)
--- a/test/merge/signal/rec.C
+++ b/test/merge/signal/rec.C
@@ -1,12 +1,16 @@
 void rec() {
   AliReconstruction reco;
-  reco.SetUniformFieldTracking(kFALSE);
   reco.SetWriteESDfriend();
   reco.SetWriteAlignmentData();
   AliTPCReconstructor::SetStreamLevel(1);
   AliTPCReconstructor::SetRecoParam(AliTPCRecoParam::GetLowFluxParam());
   //  reco.SetInput("raw.root");
 
+// **** 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=kFALSE;
+  AliTracker::SetFieldMap(field,uniform);
+
   TStopwatch timer;
   timer.Start();
   reco.Run();

diff --git a/test/ppbench/rec.C b/test/ppbench/rec.C
index 225b08b47db4ed38943957ea0f02a950bead99f8..3e7a77fcfb8baa6796670b31105ed66725d87dcd 100644 (file)
--- a/test/ppbench/rec.C
+++ b/test/ppbench/rec.C
@@ -1,7 +1,6 @@
 void rec() {
   AliReconstruction reco;
 
-  reco.SetUniformFieldTracking(kFALSE);
   reco.SetWriteESDfriend();
   reco.SetWriteAlignmentData();
   AliTPCRecoParam * tpcRecoParam = AliTPCRecoParam::GetLowFluxParam();
@@ -9,6 +8,11 @@ void rec() {
   AliTPCReconstructor::SetStreamLevel(1);
   //   reco.SetInput("raw.root");
 
+// **** 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=kFALSE;
+  AliTracker::SetFieldMap(field,uniform);
+
   TStopwatch timer;
   timer.Start();
   reco.Run();

diff --git a/test/pploadlibs/rec.C b/test/pploadlibs/rec.C
index e4424e7b634c225f7062b3e57d45b96e545e8533..2c9b455c2c8123bee16d4d733894196e980349ea 100644 (file)
--- a/test/pploadlibs/rec.C
+++ b/test/pploadlibs/rec.C
@@ -4,7 +4,7 @@ void rec() {
   gROOT->Macro("loadlibsrec.C");
   new AliRun("gAlice","The ALICE Off-line Simulation Framework");
   AliReconstruction reco;
-  reco.SetUniformFieldTracking(kFALSE);
+
   reco.SetWriteESDfriend();
   reco.SetWriteAlignmentData();
   AliTPCRecoParam * tpcRecoParam = AliTPCRecoParam::GetLowFluxParam();
@@ -12,6 +12,11 @@ void rec() {
   AliTPCReconstructor::SetStreamLevel(1);
   //   reco.SetInput("raw.root");
 
+// **** 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=kFALSE;
+  AliTracker::SetFieldMap(field,uniform);
+
   TStopwatch timer;
   timer.Start();
   reco.Run();