coverity fixes + bug fixes

[u/mrichter/AliRoot.git] / ZDC / ConfigGenZDC.C

diff --git a/ZDC/ConfigGenZDC.C b/ZDC/ConfigGenZDC.C
index 34b5dfc2a351aeeecce3e8ef6f8f88e3d1056fbf..3c5d06ab31389890a48759395e219acdf1e5b2c8 100644 (file)
--- a/ZDC/ConfigGenZDC.C
+++ b/ZDC/ConfigGenZDC.C
@@ -119,10 +119,11 @@ void Config()
     //
     //gener->SetVertexSmear(perTrack); 
     // Magnetic field
-    AliMagFMaps* field = new AliMagFMaps("Maps","Maps", 2, 1., 10., smag);
+    AliMagF* field = new AliMagF("Maps","Maps", 1., 1., smag);
     field->SetL3ConstField(0); //Using const. field in the barrel
+    TGeoGlobalMagField::Instance()->SetField(field);
+
     rl->CdGAFile();
-    gAlice->SetField(field);    
 
     Int_t   iABSO  =  1;
     Int_t   iDIPO  =  1;
@@ -371,13 +372,13 @@ void Config()
     if (iEMCAL)
     {
         //=================== EMCAL parameters ============================
-        AliEMCAL *EMCAL = new AliEMCALv1("EMCAL", "EMCAL_55_25");
+        AliEMCAL *EMCAL = new AliEMCALv2("EMCAL", "EMCAL_COMPLETE");
     }
 
      if (iACORDE)
     {
         //=================== ACORDE parameters ============================
-        AliACORDE *ACORDE = new AliACORDEv0("ACORDE", "normal ACORDE");
+        AliACORDE *ACORDE = new AliACORDEv1("ACORDE", "normal ACORDE");
     }
 
      if (iVZERO)