#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"
#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"
kGluonRadiation, kNoGluonRadiation
};
-enum PprMag_t
-{
- k2kG, k4kG, k5kG
-};
-
enum PprTrigConf_t
{
kDefaultPPTrig, kDefaultPbPbTrig
static PprRun_t srun = kPythia6;
static PprRad_t srad = kGluonRadiation;
-static PprMag_t smag = k5kG;
+static AliMagF::BMap_t smag = AliMagF::k5kG;
static Int_t sseed = 0; //Set 0 to use the current time
static PprTrigConf_t strig = kDefaultPPTrig; // default pp trigger configuration
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;
//
if (smag == k2kG) {
comment = comment.Append(" | L3 field 0.2 T");
- } else if (smag == k4kG) {
- comment = comment.Append(" | L3 field 0.4 T");
} else if (smag == k5kG) {
comment = comment.Append(" | L3 field 0.5 T");
}
printf("\n \n Comment: %s \n \n", comment.Data());
-// Field
- AliMagFMaps* field = new AliMagFMaps("Maps","Maps", 2, 1., 10., smag);
- field->SetL3ConstField(0); //Using const. field in the barrel
+ // Field
+
+ TGeoGlobalMagField::Instance()->SetField(new AliMagF("Maps","Maps", 1., 1., smag));
rl->CdGAFile();
- gAlice->SetField(field);
+
//
Int_t iABSO = 1;
Int_t iDIPO = 1;
{
//=================== ITS parameters ============================
- AliITS *ITS = new AliITSv11Hybrid("ITS","ITS v11Hybrid");
+ AliITS *ITS = new AliITSv11("ITS","ITS v11");
}
if (iTPC)
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);
//
// 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);