New version with extra task from KINK.

[u/mrichter/AliRoot.git] / test / gun / Config.C

diff --git a/test/gun/Config.C b/test/gun/Config.C
index 87543337d9f65276042efbbc95919c9049ff87e1..f5d3b91187b13bc8b24a6cab37819fe397093c7c 100644 (file)
--- a/test/gun/Config.C
+++ b/test/gun/Config.C
@@ -19,7 +19,7 @@
 #include "EVGEN/AliGenHIJINGpara.h"
 #include "EVGEN/AliGenFixed.h"
 #include "EVGEN/AliGenBox.h"
-#include "STEER/AliMagFMaps.h"
+#include "STEER/AliMagF.h"
 #include "STRUCT/AliBODY.h"
 #include "STRUCT/AliMAG.h"
 #include "STRUCT/AliABSOv3.h"
@@ -28,10 +28,10 @@
 #include "STRUCT/AliFRAMEv2.h"
 #include "STRUCT/AliSHILv3.h"
 #include "STRUCT/AliPIPEv3.h"
-#include "ITS/AliITSvPPRasymmFMD.h"
+#include "ITS/AliITSv11Hybrid.h"
 #include "TPC/AliTPCv2.h"
 #include "TOF/AliTOFv6T0.h"
-#include "HMPID/AliHMPIDv2.h"
+#include "HMPID/AliHMPIDv3.h"
 #include "ZDC/AliZDCv3.h"
 #include "TRD/AliTRDv1.h"
 #include "TRD/AliTRDgeometry.h"
@@ -41,7 +41,7 @@
 #include "PMD/AliPMDv1.h"
 #include "T0/AliT0v1.h"
 #include "EMCAL/AliEMCALv2.h"
-#include "ACORDE/AliACORDEv0.h"
+#include "ACORDE/AliACORDEv1.h"
 #include "VZERO/AliVZEROv7.h"
 #endif
 
@@ -54,15 +54,9 @@ const char * pprTrigConfName[] = {
     "p-p","Pb-Pb"
 };
 
-enum PprGeo_t
-  {
-    kHoles, kNoHoles
-  };
-
 Float_t EtaToTheta(Float_t arg);
 
 static PprTrigConf_t strig = kDefaultPPTrig;// default PP trigger configuration
-static PprGeo_t geo = kHoles;
 
 void Config()
 {
@@ -75,6 +69,10 @@ void Config()
 
    // libraries required by geant321
 #if defined(__CINT__)
+    gSystem->Load("liblhapdf");
+    gSystem->Load("libEGPythia6");
+    gSystem->Load("libpythia6");
+    gSystem->Load("libAliPythia6");
     gSystem->Load("libgeant321");
 #endif
 
@@ -264,8 +262,48 @@ void Config()
     gtof->SetPart(kProton);
     gtof->SetMomentum(2.5);
     gtof->SetTheta(95);
-    pG1->SetPhi(340);
+    gtof->SetPhi(340);
     gener->AddGenerator(gtof,"Proton for TOF",1);
+
+    //FMD1
+    AliGenFixed *gfmd1=new AliGenFixed(1);
+    gfmd1->SetPart(kGamma);
+    gfmd1->SetMomentum(25);
+    gfmd1->SetTheta(1.8);
+    gfmd1->SetPhi(10);
+    gener->AddGenerator(gfmd1,"Gamma for FMD1",1);
+    
+    //FMD2i
+    AliGenFixed *gfmd2i=new AliGenFixed(1);
+    gfmd2i->SetPart(kPiPlus);
+    gfmd2i->SetMomentum(1.5);
+    gfmd2i->SetTheta(7.3);
+    gfmd2i->SetPhi(20);
+    gener->AddGenerator(gfmd2i,"Pi+ for FMD2i",1);
+    
+    //FMD2o
+    AliGenFixed *gfmd2o=new AliGenFixed(1);
+    gfmd2o->SetPart(kPiMinus);
+    gfmd2o->SetMomentum(1.5);
+    gfmd2o->SetTheta(16.1);
+    gfmd2o->SetPhi(30);
+    gener->AddGenerator(gfmd2o,"Pi- for FMD2o",1);
+    
+    //FMD3o
+    AliGenFixed *gfmd3o=new AliGenFixed(1);
+    gfmd3o->SetPart(kPiPlus);
+    gfmd3o->SetMomentum(1.5);
+    gfmd3o->SetTheta(163.9);
+    gfmd3o->SetPhi(40);
+    gener->AddGenerator(gfmd3o,"Pi+ for FMD3o",1);
+    
+    //FMD3i
+    AliGenFixed *gfmd3i=new AliGenFixed(1);
+    gfmd3i->SetPart(kPiMinus);
+    gfmd3i->SetMomentum(1.5);
+    gfmd3i->SetTheta(170.5);
+    gfmd3i->SetPhi(50);
+    gener->AddGenerator(gfmd3i,"Pi- for FMD3i",1);
     
     gener->Init();
 
@@ -276,10 +314,7 @@ void Config()
     //
     //gener->SetVertexSmear(perTrack); 
     // Field (L3 0.5 T)
-    AliMagFMaps* field = new AliMagFMaps("Maps","Maps", 2, 1., 10., 2);
-    field->SetL3ConstField(1); //Using const. field in the barrel if 0
-    gAlice->SetField(field);    
-
+    TGeoGlobalMagField::Instance()->SetField(new AliMagF("Maps","Maps", -1., -1., AliMagF::k5kG));
 
     Int_t   iABSO  =  1;
     Int_t   iDIPO  =  1;
@@ -341,11 +376,7 @@ void Config()
         //=================== FRAME parameters ============================
 
         AliFRAMEv2 *FRAME = new AliFRAMEv2("FRAME", "Space Frame");
-        if (geo == kHoles) {
-         FRAME->SetHoles(1);
-       } else {
-         FRAME->SetHoles(0);
-       }
+       FRAME->SetHoles(1);
     }
 
     if (iSHIL)
@@ -367,7 +398,7 @@ void Config()
     {
         //=================== ITS parameters ============================
 
-       AliITSvPPRasymmFMD *ITS  = new AliITSvPPRasymmFMD("ITS","ITS PPR detailed version with asymmetric services");
+       AliITS *ITS  = new AliITSv11Hybrid("ITS","ITS v11Hybrid");
     }
 
     if (iTPC)
@@ -380,17 +411,13 @@ void Config()
     if (iTOF) {
         //=================== TOF parameters ============================
        AliTOF *TOF = new AliTOFv6T0("TOF", "normal TOF");
-       // Partial geometry: modules at 2,3,4,6,7,11,12,14,15,16
-       // starting at 6h in positive direction
-       Int_t TOFSectors[18]={-1,-1,0,0,0,-1,0,0,-1,-1,-1,0,0,-1,0,0,0,0};
-       TOF->SetTOFSectors(TOFSectors);
      }
 
 
     if (iHMPID)
     {
         //=================== HMPID parameters ===========================
-        AliHMPID *HMPID = new AliHMPIDv2("HMPID", "normal HMPID");
+        AliHMPID *HMPID = new AliHMPIDv3("HMPID", "normal HMPID");
 
     }
 
@@ -457,13 +484,13 @@ void Config()
     if (iEMCAL)
     {
         //=================== EMCAL parameters ============================
-        AliEMCAL *EMCAL = new AliEMCALv2("EMCAL", "SHISH_77_TRD1_2X2_FINAL_110DEG");
+        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)