including a setter to turn on pile-up rejection with one of the SPD methods (not...

[u/mrichter/AliRoot.git] / TPC / testMC / ConfigHPT.C

diff --git a/TPC/testMC/ConfigHPT.C b/TPC/testMC/ConfigHPT.C
index db288be63dcd96f535111bc4d3b23f6a03076758..fc8afe600f44f1888d51e4aa6ae712d1d282fedc 100644 (file)
--- a/TPC/testMC/ConfigHPT.C
+++ b/TPC/testMC/ConfigHPT.C
@@ -31,7 +31,7 @@
 #include "EVGEN/AliGenGeVSim.h"
 #include "EVGEN/AliGeVSimParticle.h"
 #include "PYTHIA6/AliGenPythia.h"
-#include "STEER/AliMagFMaps.h"
+#include "STEER/AliMagF.h"
 #include "STRUCT/AliBODY.h"
 #include "STRUCT/AliMAG.h"
 #include "STRUCT/AliABSOv3.h"
@@ -40,7 +40,7 @@
 #include "STRUCT/AliFRAMEv2.h"
 #include "STRUCT/AliSHILv3.h"
 #include "STRUCT/AliPIPEv3.h"
-#include "ITS/AliITSv11Hybrid.h"
+#include "ITS/AliITSv11.h"
 #include "TPC/AliTPCv2.h"
 #include "TOF/AliTOFv6T0.h"
 #include "HMPID/AliHMPIDv3.h"
@@ -181,7 +181,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;
 
     //
@@ -274,10 +274,9 @@ void Config()
     
     
 // Field
-    AliMagFMaps* field = new AliMagFMaps("Maps","Maps", 2, 1., 10., smag);
-    field->SetL3ConstField(0); //Using const. field in the barrel
+    TGeoGlobalMagField::Instance()->SetField(new AliMagF("Maps","Maps", 1., 1., AliMagF::k5kG));
     rl->CdGAFile();
-    gAlice->SetField(field);    
+  
 //
     Int_t   iABSO   = 1;
     Int_t   iDIPO   = 1;
@@ -362,7 +361,7 @@ void Config()
     {
         //=================== ITS parameters ============================
 
-       AliITS *ITS  = new AliITSv11Hybrid("ITS","ITS v11Hybrid");
+       AliITS *ITS  = new AliITSv11("ITS","ITS v11");
     }
 
     if (iTPC)
@@ -485,61 +484,63 @@ AliGenerator* GeneratorFactory(PprRun_t srun) {
         Float_t thmax = EtaToTheta(-1.4);  // theta max. <---> eta min 
         gener->SetThetaRange(thmin,thmax);
         gener->SetOrigin(0, 0, 0);  //vertex position
-        gener->SetSigma(0, 0, 0);   //Sigma in (X,Y,Z) (cm) on IP position
+        gener->SetSigma(0, 0, 3);   //Sigma in (X,Y,Z) (cm) on IP position
         
         AliGenHIJINGpara *hijingparam = new AliGenHIJINGpara(nParticles);
         hijingparam->SetMomentumRange(0.2, 999);
         gener->AddGenerator(hijingparam,"HIJING PARAM",1);
            //
-        //
-        //PIONS
-        Int_t nParticles2 =50;
-        AliGenBox *genboxPIP = new AliGenBox(nParticles2);
-        genboxPIP->SetPart(211);
-        genboxPIP->SetPtRange(0.2, 100.00);
-        AliGenBox *genboxPIM = new AliGenBox(nParticles2);
-        genboxPIM->SetPart(-211);
-        genboxPIM->SetPtRange(0.2, 100.00);
-        //Electrons
-        AliGenBox *genboxEP = new AliGenBox(nParticles2);
-        genboxEP->SetPart(11);
-        genboxEP->SetPtRange(0.1, 100.00);
-        AliGenBox *genboxEM = new AliGenBox(nParticles2);
-        genboxEM->SetPart(-11);
-        genboxEM->SetPtRange(0.1, 100.00);
+        for (Float_t imom=0;imom<5;imom+=5){
+          Float_t pmom = imom*20;
+          Int_t nParticles2 =(imom+1);  
+          //
+          //PIONS         
+          AliGenBox *genboxPIP = new AliGenBox(nParticles2);
+          genboxPIP->SetPart(211);
+          genboxPIP->SetPtRange(0.2, pmom);
+          AliGenBox *genboxPIM = new AliGenBox(nParticles2);
+          genboxPIM->SetPart(-211);
+          genboxPIM->SetPtRange(0.2, pmom);
+          //Electrons
+          AliGenBox *genboxEP = new AliGenBox(nParticles2);
+          genboxEP->SetPart(11);
+          genboxEP->SetPtRange(0.1, pmom);
+          AliGenBox *genboxEM = new AliGenBox(nParticles2);
+          genboxEM->SetPart(-11);
+          genboxEM->SetPtRange(0.1, pmom);
         //Kaons
-        AliGenBox *genboxKP = new AliGenBox(nParticles2);
-        genboxKP->SetPart(321);
-        genboxKP->SetPtRange(0.2, 100.00);
-        AliGenBox *genboxKM = new AliGenBox(nParticles2);
-        genboxKM->SetPart(-321);
-        genboxKM->SetPtRange(0.2, 100.00);
-        // mu
-        AliGenBox *genboxMP = new AliGenBox(nParticles2);
-        genboxMP->SetPart(13);
-        genboxMP->SetPtRange(0.2, 100.00);
-        AliGenBox *genboxMM = new AliGenBox(nParticles2);
-        genboxMM->SetPart(-13);
-        genboxMM->SetPtRange(0.2, 100.00);
-        // Protons
-        AliGenBox *genboxPP = new AliGenBox(nParticles2);
-        genboxPP->SetPart(2212);
-        genboxPP->SetPtRange(0.2, 100.00);
-        AliGenBox *genboxPM = new AliGenBox(nParticles2);
-        genboxPM->SetPart(-2212);
-        genboxPM->SetPtRange(0.2, 100.00);
-        
-        
-        gener->AddGenerator(genboxPIP,"GENBOX",1);
-        gener->AddGenerator(genboxPIM,"GENBOX",1);
-        gener->AddGenerator(genboxEM,"GENBOX",1);
-        gener->AddGenerator(genboxEP,"GENBOX",1);
-        gener->AddGenerator(genboxKM,"GENBOX",1);
-        gener->AddGenerator(genboxKP,"GENBOX",1);
-        gener->AddGenerator(genboxMM,"GENBOX",1);
-        gener->AddGenerator(genboxMP,"GENBOX",1);
-        gener->AddGenerator(genboxPM,"GENBOX",1);
-        gener->AddGenerator(genboxPP,"GENBOX",1);
+          AliGenBox *genboxKP = new AliGenBox(nParticles2);
+          genboxKP->SetPart(321);
+          genboxKP->SetPtRange(0.2, pmom);
+          AliGenBox *genboxKM = new AliGenBox(nParticles2);
+          genboxKM->SetPart(-321);
+          genboxKM->SetPtRange(0.2, pmom);
+          // mu
+          AliGenBox *genboxMP = new AliGenBox(nParticles2);
+          genboxMP->SetPart(13);
+          genboxMP->SetPtRange(0.2, pmom);
+          AliGenBox *genboxMM = new AliGenBox(nParticles2);
+          genboxMM->SetPart(-13);
+          genboxMM->SetPtRange(0.2, pmom);
+          // Protons
+          AliGenBox *genboxPP = new AliGenBox(nParticles2);
+          genboxPP->SetPart(2212);
+          genboxPP->SetPtRange(0.2, pmom);
+          AliGenBox *genboxPM = new AliGenBox(nParticles2);
+          genboxPM->SetPart(-2212);
+          genboxPM->SetPtRange(0.2, pmom);                
+          gener->AddGenerator(genboxPIP,"GENBOX",1);
+          gener->AddGenerator(genboxPIM,"GENBOX",1);
+          gener->AddGenerator(genboxEM,"GENBOX",1);
+          gener->AddGenerator(genboxEP,"GENBOX",1);
+          gener->AddGenerator(genboxKM,"GENBOX",1);
+          gener->AddGenerator(genboxKP,"GENBOX",1);
+          gener->AddGenerator(genboxMM,"GENBOX",1);
+          gener->AddGenerator(genboxMP,"GENBOX",1);
+          gener->AddGenerator(genboxPM,"GENBOX",1);
+          gener->AddGenerator(genboxPP,"GENBOX",1);
+        }
+
         gGener=gener;
 
 
@@ -1448,7 +1449,7 @@ AliGenerator* GeneratorFactory(PprRun_t srun) {
        AliGenSTRANGElib *lib = new AliGenSTRANGElib();
        Int_t particle;
        // Xi
-       particle = AliGenSTRANGElib::kXiMinus;
+       particle = kXiMinus;
        AliGenParam *genXi = new AliGenParam(16,particle,lib->GetPt(particle),lib->GetY(particle),lib->GetIp(particle));
        genXi->SetPtRange(0., 12.);
        genXi->SetYRange(-1.1, 1.1);
@@ -1456,7 +1457,7 @@ AliGenerator* GeneratorFactory(PprRun_t srun) {
  
        //
        // Omega
-       particle = AliGenSTRANGElib::kOmegaMinus;
+       particle = kOmegaMinus;
        AliGenParam *genOmega = new AliGenParam(10,particle,lib->GetPt(particle),lib->GetY(particle),lib->GetIp(particle));     
        genOmega->SetPtRange(0, 12.);
        genOmega->SetYRange(-1.1, 1.1);