Merging of the three alignment macros into one

[u/mrichter/AliRoot.git] / MUON / Config.C

diff --git a/MUON/Config.C b/MUON/Config.C
index 217f1d2130051e6f77606ccf2b1dd3285ad838c8..beb66e478ab547adc0a8e02a7e8383e592876515 100644 (file)
--- a/MUON/Config.C
+++ b/MUON/Config.C
@@ -133,6 +133,19 @@ void Config(char directory[100]="", char option[6]="param", const char* digitsto
     gener->SetTrackingFlag(1);
     gener->Init();
   }
+  if (!strcmp(option,"paramJpsi")) {
+    AliGenParam *gener = new AliGenParam(1, AliGenMUONlib::kJpsi);
+    gener->SetMomentumRange(0,999);
+    gener->SetPtRange(0,100.);
+    gener->SetPhiRange(0., 360.);
+    gener->SetCutOnChild(1);
+    gener->SetChildPhiRange(0.,360.);
+    gener->SetChildThetaRange(171.0,178.0);
+    gener->SetOrigin(0,0,0);
+    gener->SetForceDecay(kDiMuon);
+    gener->SetTrackingFlag(1);
+    gener->Init();
+  }
   if (!strcmp(option,"hijing")) { //Hijing generator from ConfigPPR in macros
     AliGenHijing *gener = new AliGenHijing(-1);
     // centre of mass energy 
@@ -174,8 +187,7 @@ void Config(char directory[100]="", char option[6]="param", const char* digitsto
   }  
   //============================================================= 
   // Field (L3 0.5 T)
-  AliMagFMaps* field = new AliMagFMaps("Maps","Maps", 1, 1., 10., AliMagFMaps::k5kG);
-  gAlice->SetField(field);
+  TGeoGlobalMagField::Instance()->SetField(new AliMagF("Maps","Maps", 2, 1., 1, 10., AliMagF::k5kG));
   //============================================================= 
   //=================== Alice BODY parameters =============================
   AliBODY *BODY = new AliBODY("BODY","Alice envelop");
@@ -210,8 +222,9 @@ void Config(char directory[100]="", char option[6]="param", const char* digitsto
   // Noise-only digits in tracker/trigger (0=no noise, 1=default (noise in tracker), 2=noise in tracker and trigger):
   //MUON->SetDigitizerWithNoise(kFALSE);
 
-  // Use fast raw data decoder
-  // MUON->SetFastDecoder(kTRUE);  
+  // Use non-high performance raw data decoder 
+  //MUON->SetFastTrackerDecoder(kFALSE);  
+  //MUON->SetFastTriggerDecoder(kFALSE);  
   
   //
   // If SetAlign, the detection elements transformations