X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=ZDC%2FConfigGenZDC.C;h=03c0c73eec975bae46e60014860e2e796ba9d6b7;hb=a4a9be2c10507440578c8a878791065af0a46211;hp=5be084a61d8439a515bda8896aaa9582e93fcbcf;hpb=8bca48db37e7a56810ff490cbce25f8d26366075;p=u%2Fmrichter%2FAliRoot.git

diff --git a/ZDC/ConfigGenZDC.C b/ZDC/ConfigGenZDC.C
index 5be084a61d8..03c0c73eec9 100644
--- 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", 2, 1., 1., 10., 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;
@@ -135,15 +136,15 @@ void Config()
     Int_t   iPHOS  =  0;
     Int_t   iPIPE  =  1;
     Int_t   iPMD   =  0;
-    Int_t   iRICH  =  0;
+    Int_t   iHMPID  =  0;
     Int_t   iSHIL  =  1;
-    Int_t   iSTART =  0;
+    Int_t   iT0 =  0;
     Int_t   iTOF   =  0;
     Int_t   iTPC   =  0;
     Int_t   iTRD   =  0;
     Int_t   iZDC   =  1;
     Int_t   iEMCAL =  0;
-    Int_t   iCRT   =  0;
+    Int_t   iACORDE   =  0;
     Int_t   iVZERO =  0;
 
     //=================== Alice BODY parameters =============================
@@ -298,10 +299,10 @@ void Config()
     }
 
 
-    if (iRICH)
+    if (iHMPID)
     {
-        //=================== RICH parameters ===========================
-        AliRICH *RICH = new AliRICHv1("RICH", "normal RICH");
+        //=================== HMPID parameters ===========================
+        AliHMPID *HMPID = new AliHMPIDv1("HMPID", "normal HMPID");
 
     }
 
@@ -325,8 +326,8 @@ void Config()
 	if (sgeo == kHoles) {
 	    // With hole in front of PHOS
 	    TRD->SetPHOShole();
-	    // With hole in front of RICH
-	    TRD->SetRICHhole();
+	    // With hole in front of HMPID
+	    TRD->SetHMPIDhole();
 	}
 	    // Switch on TR
 	    AliTRDsim *TRDsim = TRD->CreateTR();
@@ -362,27 +363,27 @@ void Config()
         AliPMD *PMD = new AliPMDv1("PMD", "normal PMD");
     }
 
-    if (iSTART)
+    if (iT0)
     {
-        //=================== START parameters ============================
-        AliSTART *START = new AliSTARTv1("START", "START Detector");
+        //=================== T0 parameters ============================
+        AliT0 *T0 = new AliT0v1("T0", "T0 Detector");
     }
 
     if (iEMCAL)
     {
         //=================== EMCAL parameters ============================
-        AliEMCAL *EMCAL = new AliEMCALv1("EMCAL", "EMCAL_55_25");
+        AliEMCAL *EMCAL = new AliEMCALv2("EMCAL", "EMCAL_COMPLETE");
     }
 
-     if (iCRT)
+     if (iACORDE)
     {
-        //=================== CRT parameters ============================
-        AliCRT *CRT = new AliCRTv0("CRT", "normal ACORDE");
+        //=================== ACORDE parameters ============================
+        AliACORDE *ACORDE = new AliACORDEv1("ACORDE", "normal ACORDE");
     }
 
      if (iVZERO)
     {
-        //=================== CRT parameters ============================
+        //=================== ACORDE parameters ============================
         AliVZERO *VZERO = new AliVZEROv2("VZERO", "normal VZERO");
     }