X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=EMCAL%2Fmacros%2FConfig.C;h=97545200a0452e0bc436a0f924fa10abcfaa0f06;hb=a0945e6fb0bf51441e8e3f76abd6f4b9fc69d53a;hp=31eb6efd35fabcb6341f187a5021ef33eb64bba8;hpb=d297ef6eb7179cb72248252c18dfa9cd14462fe6;p=u%2Fmrichter%2FAliRoot.git

diff --git a/EMCAL/macros/Config.C b/EMCAL/macros/Config.C
index 31eb6efd35f..97545200a04 100755
--- a/EMCAL/macros/Config.C
+++ b/EMCAL/macros/Config.C
@@ -17,7 +17,7 @@
 #include "PYTHIA6/AliDecayerPythia.h"
 #include "EVGEN/AliGenCocktail.h"
 #include "EVGEN/AliGenHIJINGpara.h"
-#include "STEER/AliMagFMaps.h"
+#include "STEER/AliMagF.h"
 #include "STRUCT/AliBODY.h"
 #include "STRUCT/AliMAG.h"
 #include "STRUCT/AliABSOv3.h"
@@ -38,13 +38,16 @@
 #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
 
 Float_t EtaToTheta(Float_t arg);
 void    LoadPythia();
 
+Int_t year =2011;
+Bool_t checkGeoAndRun=kFALSE;
+
 void Config()
 {
   //AliLog::SetGlobalDebugLevel(2);
@@ -79,11 +82,11 @@ void Config()
 	return;
       }
     rl->SetCompressionLevel(2);
-    rl->SetNumberOfEventsPerFile(3);
+    rl->SetNumberOfEventsPerFile(100);
     gAlice->SetRunLoader(rl);
 
     // Set the trigger configuration
-    gAlice->SetTriggerDescriptor("Pb-Pb");
+    AliSimulation::Instance()->SetTriggerConfig("Pb-Pb");
     cout<<"Trigger configuration is set to  Pb-Pb"<<endl;
 
     //
@@ -130,16 +133,27 @@ void Config()
     gMC->SetCut("TOFMAX", tofmax); 
 
 
-    int     nParticles = 100;
+    int     nParticles = 5;
     if (gSystem->Getenv("CONFIG_NPARTICLES"))
     {
         nParticles = atoi(gSystem->Getenv("CONFIG_NPARTICLES"));
     }
 
-    AliGenBox *gener = new AliGenBox(5);
-    gener->SetMomentumRange(50.,100.);
-    gener->SetPhiRange(80.0,180.0);
-    gener->SetThetaRange(EtaToTheta(-0.7), EtaToTheta(0.7));
+    if (gSystem->Getenv("CONFIG_YEAR"))
+    {
+        year = atoi(gSystem->Getenv("CONFIG_YEAR"));
+    }
+
+    AliGenBox *gener = new AliGenBox(nParticles);
+    gener->SetMomentumRange(1.,10.);
+    if(year > 2010)
+      gener->SetPhiRange(80.0,180.0);
+    else if(year == 2010)
+      gener->SetPhiRange(80.0,120.0);
+    else
+      gener->SetPhiRange(80.0,190.0);
+
+    gener->SetThetaRange(EtaToTheta(0.7), EtaToTheta(-0.7));
 
     gener->SetOrigin(0,0,0);        //vertex position
     gener->SetSigma(0,0,0);         //Sigma in (X,Y,Z) (cm) on IP position
@@ -151,10 +165,8 @@ void Config()
     // track by track
     //
     //gener->SetVertexSmear(perTrack); 
-    // Field (L3 0.4 T)
-    AliMagFMaps* field = new AliMagFMaps("Maps","Maps", 2, 1., 10., 1);
-    gAlice->SetField(field);    
-
+    // Field (L3 0.5 T)
+    TGeoGlobalMagField::Instance()->SetField(new AliMagF("Maps","Maps", -1., -1., AliMagF::k5kG));
 
     Int_t   iABSO  =  0;
     Int_t   iDIPO  =  0;
@@ -310,16 +322,21 @@ void Config()
     if (iEMCAL)
     {
         //=================== EMCAL parameters ============================
-        //AliEMCAL *EMCAL = new AliEMCALv2("EMCAL", "SHISH_77_TRD1_2X2_FINAL_110DEG");
-        AliEMCAL *EMCAL = new AliEMCALv2("EMCAL", "EMCAL_PDC06");
-        //AliEMCAL *EMCAL = new AliEMCALv2("EMCAL", "SHISH_77_TRD1_2X2_FINAL_110DEG pbTh=0.144 scTh=0.176");
-        //AliEMCAL *EMCAL = new AliEMCALv2("EMCAL", "EMCAL_COMPLETE");
+
+      if(year == 2010)        // d phi = 40 degrees
+	AliEMCAL *EMCAL = new AliEMCALv2("EMCAL", "EMCAL_FIRSTYEARV1");
+      else if (year > 2010)  // d phi = 100 degrees
+	AliEMCAL *EMCAL = new AliEMCALv2("EMCAL", "EMCAL_COMPLETEV1");
+      else // Old configuration with 110 degrees but not perfect geometry
+        AliEMCAL *EMCAL = new AliEMCALv2("EMCAL", "EMCAL_COMPLETE");
+
+      EMCAL->SetCheckRunNumberAndGeoVersion(checkGeoAndRun);
     }
 
      if (iACORDE)
     {
         //=================== ACORDE parameters ============================
-        AliACORDE *ACORDE = new AliACORDEv0("ACORDE", "normal ACORDE");
+        AliACORDE *ACORDE = new AliACORDEv1("ACORDE", "normal ACORDE");
     }
 
      if (iVZERO)