Fixes for bug #52499: Field polarities inconsistiency

[u/mrichter/AliRoot.git] / test / genkine / sim / Config.C

diff --git a/test/genkine/sim/Config.C b/test/genkine/sim/Config.C
index 7e3704ebfe1c3993ebd78335ee380468bde09e80..a9b99b8816c59b2fe821658ea93265971d2ce174 100644 (file)
--- a/test/genkine/sim/Config.C
+++ b/test/genkine/sim/Config.C
@@ -31,7 +31,7 @@
 #include "EVGEN/AliGenGeVSim.h"
 #include "EVGEN/AliGeVSimParticle.h"
 #include "PYTHIA6/AliGenPythia.h"
-#include "STEER/AliMagFCheb.h"
+#include "STEER/AliMagF.h"
 #include "STRUCT/AliBODY.h"
 #include "STRUCT/AliMAG.h"
 #include "STRUCT/AliABSOv3.h"
@@ -64,11 +64,6 @@ enum PprRad_t
     kGluonRadiation, kNoGluonRadiation
 };
 
-enum PprMag_t
-{
-    k2kG, k4kG, k5kG
-};
-
 enum PprTrigConf_t
 {
     kDefaultPPTrig, kDefaultPbPbTrig
@@ -82,7 +77,7 @@ const char * pprTrigConfName[] = {
 // This part for configuration    
 
 static PprRad_t srad = kGluonRadiation;
-static PprMag_t smag = k5kG;
+static AliMagF::BMap_t smag = AliMagF::k5kG;
 static Int_t    sseed = 12345; //Set 0 to use the current time
 
 static PprTrigConf_t strig = kDefaultPPTrig; // default PbPb trigger configuration
@@ -209,11 +204,9 @@ void Config()
     gener->SetTrackingFlag(1);
     gener->Init();
     
-    if (smag == k2kG) {
+    if (smag == AliMagF::k2kG) {
        comment = comment.Append(" | L3 field 0.2 T");
-    } else if (smag == k4kG) {
-       comment = comment.Append(" | L3 field 0.4 T");
-    } else if (smag == k5kG) {
+    } else if (smag == AliMagF::k5kG) {
        comment = comment.Append(" | L3 field 0.5 T");
     }
     
@@ -231,10 +224,11 @@ void Config()
     
     
 // Field (L3 0.4 T)
-    AliMagFCheb* field = new AliMagFCheb("Maps","Maps", 2, 1., 10., smag);
+    AliMagF* field = new AliMagF("Maps","Maps", 2, -1., -1., 10., smag);
+    TGeoGlobalMagField::Instance()->SetField(field);
+
     rl->CdGAFile();
-    gAlice->SetField(field);    
-//
+    //
     Int_t   iABSO   = 1;
     Int_t   iDIPO   = 1;
     Int_t   iFMD    = 1;