X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=PHOS%2FConfigTestSuite.C;h=ca1f4023bd408dac91cc5266ff656e1c2c3b7a53;hb=21027e5afdb5304e1169e10de425f826d556d368;hp=1b9d5788384ec1c291db63cb156aeb573bbee4f0;hpb=88cb7938ca21d4a80991d4e7aa564008c29340f7;p=u%2Fmrichter%2FAliRoot.git

diff --git a/PHOS/ConfigTestSuite.C b/PHOS/ConfigTestSuite.C
index 1b9d5788384..ca1f4023bd4 100644
--- a/PHOS/ConfigTestSuite.C
+++ b/PHOS/ConfigTestSuite.C
@@ -1,3 +1,5 @@
+#include <TPDGCode.h>
+
 static Int_t    eventsPerRun = 100;
 enum PprGeo_t 
 {
@@ -26,7 +28,7 @@ void Config()
     if (!gSystem->Getenv("CONFIG_FILE"))
     {
         cout<<"Config.C: Creating Run Loader ..."<<endl;
-        AliRunLoader* rl = AliRunLoader::Open("galice.root",AliConfig::fgkDefaultEventFolderName,
+        AliRunLoader* rl = AliRunLoader::Open("galice.root",AliConfig::GetDefaultEventFolderName(),
                                               "recreate");
         if (rl == 0x0)
          {
@@ -106,7 +108,7 @@ void Config()
 //     gener->AddGenerator(hijingparam,"HIJING PARAM",1);
 
 //     AliGenBox *genbox = new AliGenBox(nParticles);
-//     genbox->SetPart(22);
+//     genbox->SetPart(kGamma);
 //     genbox->SetPtRange(0.3, 10.00);
 //     gener->AddGenerator(genbox,"GENBOX GAMMA for PHOS",1);
 //     gener->Init();
@@ -118,7 +120,7 @@ void Config()
 
     gener->SetOrigin(0,0,0);        //vertex position
     gener->SetSigma(0,0,0);         //Sigma in (X,Y,Z) (cm) on IP position
-    gener->SetPart(22);
+    gener->SetPart(kGamma);
     gener->Init();
  
     // 
@@ -127,9 +129,7 @@ void Config()
     //
     //gener->SetVertexSmear(perTrack); 
     // Field (L3 0.4 T)
-    AliMagFMaps* field = new AliMagFMaps("Maps","Maps", 2, 1., 10., 1);
-    gAlice->SetField(field);    
-
+    TGeoGlobalMagField::Instance()->SetField(new AliMagF("Maps","Maps", 1., 1., AliMagF::k5kG));
 
     Int_t   iABSO  =  0;
     Int_t   iDIPO  =  0;
@@ -142,15 +142,15 @@ void Config()
     Int_t   iPHOS  =  1;
     Int_t   iPIPE  =  0;
     Int_t   iPMD   =  0;
-    Int_t   iRICH  =  0;
+    Int_t   iHMPID  =  0;
     Int_t   iSHIL  =  0;
-    Int_t   iSTART =  0;
+    Int_t   iT0 =  0;
     Int_t   iTOF   =  0;
     Int_t   iTPC   =  0;
     Int_t   iTRD   =  0;
     Int_t   iZDC   =  0;
     Int_t   iEMCAL =  0;
-    Int_t   iCRT   =  0;
+    Int_t   iACORDE   =  0;
     Int_t   iVZERO =  0;
     rl->CdGAFile();
     //=================== Alice BODY parameters =============================
@@ -319,10 +319,10 @@ void Config()
     }
 
 
-    if (iRICH)
+    if (iHMPID)
     {
-        //=================== RICH parameters ===========================
-        AliRICH *RICH = new AliRICHv3("RICH", "normal RICH");
+        //=================== HMPID parameters ===========================
+        AliHMPID *HMPID = new AliHMPIDv3("HMPID", "normal HMPID");
 
     }
 
@@ -345,8 +345,8 @@ void Config()
 	if (geo == 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();
@@ -382,10 +382,10 @@ 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)
@@ -394,15 +394,15 @@ void Config()
         AliEMCAL *EMCAL = new AliEMCALv1("EMCAL", "EMCALArch1a");
     }
 
-     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");
     }