X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=test%2Fgun%2FConfig.C;h=38ef677c2ee134646e998594729b94d2f496ee06;hb=c76b9217c2c3095eb9c761f89d634fbc9ebdceef;hp=954bd7289591909a8be710048613fdfcd96623e7;hpb=bab433b30f72704300370827d5075ade5e5574ed;p=u%2Fmrichter%2FAliRoot.git

diff --git a/test/gun/Config.C b/test/gun/Config.C
index 954bd728959..38ef677c2ee 100644
--- a/test/gun/Config.C
+++ b/test/gun/Config.C
@@ -19,7 +19,8 @@
 #include "EVGEN/AliGenHIJINGpara.h"
 #include "EVGEN/AliGenFixed.h"
 #include "EVGEN/AliGenBox.h"
-#include "STEER/AliMagFMaps.h"
+#include "STEER/AliMagF.h"
+#include "STEER/AliPID.h"
 #include "STRUCT/AliBODY.h"
 #include "STRUCT/AliMAG.h"
 #include "STRUCT/AliABSOv3.h"
@@ -41,7 +42,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
 
@@ -94,7 +95,7 @@ void Config()
     gAlice->SetRunLoader(rl);
 
     // Set the trigger configuration
-    gAlice->SetTriggerDescriptor(pprTrigConfName[strig]);
+    AliSimulation::Instance()->SetTriggerConfig(pprTrigConfName[strig]);
     cout<<"Trigger configuration is set to  "<<pprTrigConfName[strig]<<endl;
 
     //
@@ -145,7 +146,7 @@ void Config()
     // to cover specific cases
 
 
-    // The cocktail iitself
+    // The cocktail itself
 
     AliGenCocktail *gener = new AliGenCocktail();
     gener->SetPhiRange(0, 360);
@@ -305,6 +306,77 @@ void Config()
     gfmd3i->SetPhi(50);
     gener->AddGenerator(gfmd3i,"Pi- for FMD3i",1);
     
+    //VZERO C
+    AliGenFixed *gv0c=new AliGenFixed(1);
+    gv0c->SetPart(kPiPlus);
+    gv0c->SetMomentum(1.5);
+    gv0c->SetTheta(170);
+    gv0c->SetPhi(50);
+    gener->AddGenerator(gv0c,"Pi+ for V0C",1);
+    
+    //VZERO A
+    AliGenFixed *gv0a=new AliGenFixed(1);
+    gv0a->SetPart(kPiMinus);
+    gv0a->SetMomentum(1.5);
+    gv0a->SetTheta(1.5);
+    gv0a->SetPhi(70);
+    gener->AddGenerator(gv0a,"Pi- for V0A",1);
+
+
+    //PMD
+    AliGenFixed *gpmd=new AliGenFixed(1);
+    gpmd->SetPart(kGamma);
+    gpmd->SetMomentum(2);
+    gpmd->SetTheta(12.6);
+    gpmd->SetPhi(60);
+    gener->AddGenerator(gpmd,"Gamma for PMD",1);
+
+    //ZDC
+    AliGenFixed *gzdc1=new AliGenFixed(1);
+    gzdc1->SetPart(kProton);
+    gzdc1->SetMomentum(700);
+    gzdc1->SetTheta(0.6);
+    gzdc1->SetPhi(60);
+    gener->AddGenerator(gzdc1,"Proton for ZDC",1);
+
+    AliGenFixed *gzdc2=new AliGenFixed(1);
+    gzdc2->SetPart(kNeutron);
+    gzdc2->SetMomentum(500);
+    gzdc2->SetTheta(0.6);
+    gzdc2->SetPhi(60);
+    gener->AddGenerator(gzdc2,"Neutron for ZDC",1);
+
+    //T0
+    AliGenFixed *gt0=new AliGenFixed(1);
+    gt0->SetPart(kPiPlus);
+    gt0->SetMomentum(2);
+    gt0->SetTheta(5.1);
+    gt0->SetPhi(60);
+    gener->AddGenerator(gt0,"Pi+ for T0",1);
+
+    AliGenFixed *gt01=new AliGenFixed(1);
+    gt01->SetPart(kPiMinus);
+    gt01->SetMomentum(2);
+    gt01->SetTheta(5.1);
+    gt01->SetPhi(60);
+    gener->AddGenerator(gt01,"Pi- for T0",1);
+
+
+    //ACORDE
+    AliGenFixed *gacorde=new AliGenFixed(1);
+    gacorde->SetPart(kMuonPlus);
+    gacorde->SetMomentum(20);
+    gacorde->SetTheta(90.);
+    gacorde->SetPhi(90);
+    gener->AddGenerator(gacorde,"Muon+ for ACORDE",1);
+
+    AliGenFixed *gacorde1=new AliGenFixed(1);
+    gacorde1->SetPart(kMuonMinus);
+    gacorde1->SetMomentum(20);
+    gacorde1->SetTheta(90.);
+    gacorde1->SetPhi(90);
+    gener->AddGenerator(gacorde1,"Muon- for ACORDE",1);
+
     gener->Init();
 
 
@@ -314,10 +386,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;
@@ -330,15 +399,15 @@ void Config()
     Int_t   iPHOS  =  1;
     Int_t   iPIPE  =  1;
     Int_t   iPMD   =  1;
-    Int_t   iHMPID  =  1;
+    Int_t   iHMPID =  1;
     Int_t   iSHIL  =  1;
-    Int_t   iT0 =  1;
+    Int_t   iT0    =  1;
     Int_t   iTOF   =  1;
     Int_t   iTPC   =  1;
     Int_t   iTRD   =  1;
     Int_t   iZDC   =  1;
     Int_t   iEMCAL =  1;
-    Int_t   iACORDE   =  0;
+    Int_t   iACORDE=  1;
     Int_t   iVZERO =  1;
     rl->CdGAFile();
     //=================== Alice BODY parameters =============================
@@ -438,18 +507,19 @@ void Config()
 
         AliTRD *TRD = new AliTRDv1("TRD", "TRD slow simulator");
         AliTRDgeometry *geoTRD = TRD->GetGeometry();
-	// Partial geometry: modules at 2,3,4,6,11,12,14,15
-	// starting at 6h in positive direction
-	geoTRD->SetSMstatus(0,0);
-        geoTRD->SetSMstatus(1,0);
+	// Partial geometry: modules at 0,1,7,8,9,10,17
+	// starting at 3h in positive direction
+	geoTRD->SetSMstatus(2,0);
+	geoTRD->SetSMstatus(3,0);
+	geoTRD->SetSMstatus(4,0);
         geoTRD->SetSMstatus(5,0);
-        geoTRD->SetSMstatus(7,0);
-        geoTRD->SetSMstatus(8,0);
-        geoTRD->SetSMstatus(9,0);
-        geoTRD->SetSMstatus(10,0);
+	geoTRD->SetSMstatus(6,0);
+        geoTRD->SetSMstatus(11,0);
+        geoTRD->SetSMstatus(12,0);
         geoTRD->SetSMstatus(13,0);
+        geoTRD->SetSMstatus(14,0);
+        geoTRD->SetSMstatus(15,0);
         geoTRD->SetSMstatus(16,0);
-        geoTRD->SetSMstatus(17,0);
     }
 
     if (iFMD)
@@ -487,13 +557,13 @@ void Config()
     if (iEMCAL)
     {
         //=================== EMCAL parameters ============================
-        AliEMCAL *EMCAL = new AliEMCALv2("EMCAL", "SHISH_77_TRD1_2X2_FINAL_110DEG");
+        AliEMCAL *EMCAL = new AliEMCALv2("EMCAL", "EMCAL_COMPLETEV1");
     }
 
      if (iACORDE)
     {
         //=================== ACORDE parameters ============================
-        AliACORDE *ACORDE = new AliACORDEv0("ACORDE", "normal ACORDE");
+        AliACORDE *ACORDE = new AliACORDEv1("ACORDE", "normal ACORDE");
     }
 
      if (iVZERO)