#include "STEER/AliConfig.h"
#include "PYTHIA6/AliDecayerPythia.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/AliSHILv3.h"
#include "STRUCT/AliPIPEv3.h"
#include "ITS/AliITSgeom.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 "FMD/AliFMDv1.h"
#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
{
kFull, kBarrel, kMuonArm
};
-//--- Magnetic Field ---
-enum Mag_t
-{
- k2kG, k4kG, k5kG
-};
-
//--- Trigger config ---
enum TrigConf_t
{
static PDC06Proc_t proc = kPyMbNoHvq;
static DecayHvFl_t decHvFl = kNature;
static YCut_t ycut = kFull;
-static Mag_t mag = k5kG;
+static AliMagF::BMap_t mag = AliMagF::k5kG;
static TrigConf_t trig = kDefaultPPTrig; // default pp trigger configuration
//========================//
// Set Random Number seed //
// libraries required by geant321
#if defined(__CINT__)
+ gSystem->Load("liblhapdf");
+ gSystem->Load("libEGPythia6");
+ gSystem->Load("libpythia6");
+ gSystem->Load("libAliPythia6");
gSystem->Load("libgeant321");
#endif
gAlice->SetRunLoader(rl);
// Set the trigger configuration
- gAlice->SetTriggerDescriptor(TrigConfName[trig]);
+ AliSimulation::Instance()->SetTriggerConfig(TrigConfName[trig]);
cout<<"Trigger configuration is set to "<<TrigConfName[trig]<<endl;
//
// FIELD
//
- if (mag == k2kG) {
+ if (mag == AliMagF::k2kG) {
comment = comment.Append(" | L3 field 0.2 T");
- } else if (mag == k4kG) {
- comment = comment.Append(" | L3 field 0.4 T");
- } else if (mag == k5kG) {
+ } else if (mag == AliMagF::k5kG) {
comment = comment.Append(" | L3 field 0.5 T");
}
printf("\n \n Comment: %s \n \n", comment.Data());
- AliMagFMaps* field = new AliMagFMaps("Maps","Maps", 2, 1., 10., mag);
- field->SetL3ConstField(0); //Using const. field in the barrel
+ AliMagF* field = new AliMagF("Maps","Maps", -1., -1., mag);
+ TGeoGlobalMagField::Instance()->SetField(field);
+
rl->CdGAFile();
- gAlice->SetField(field);
-
-
Int_t iABSO = 1;
Int_t iACORDE = 0;
//=================== FRAME parameters ============================
AliFRAMEv2 *FRAME = new AliFRAMEv2("FRAME", "Space Frame");
+ FRAME->SetHoles(1);
}
if (iSHIL)
{
//=================== ITS parameters ============================
- AliITSvPPRasymmFMD *ITS = new AliITSvPPRasymmFMD("ITS","New ITS PPR detailed version with asymmetric services");
+ AliITS *ITS = new AliITSv11Hybrid("ITS","ITS v11Hybrid");
}
if (iTPC)
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};
- // Partial geometry: modules at 1,2,6,7,9,10,11,12,15,16,17
- // (ALICE numbering convention)
- Int_t TOFSectors[18]={-1,0,0,-1,-1,-1,0,0,-1,0,0,0,0,-1,-1,0,0,0};
- TOF->SetTOFSectors(TOFSectors);
}
if (iHMPID)
{
//=================== HMPID parameters ===========================
- AliHMPID *HMPID = new AliHMPIDv2("HMPID", "normal HMPID");
+ AliHMPID *HMPID = new AliHMPIDv3("HMPID", "normal HMPID");
}
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)
if (iPHOS)
{
- AliPHOS *PHOS = new AliPHOSv1("PHOS", "IHEP");
+ AliPHOS *PHOS = new AliPHOSv1("PHOS", "noCPV_Modules123");
}
if (iEMCAL)
{
//=================== EMCAL parameters ============================
- AliEMCAL *EMCAL = new AliEMCALv2("EMCAL", "SHISH_77_TRD1_2X2_FINAL_110DEG");
+ AliEMCAL *EMCAL = new AliEMCALv2("EMCAL", "EMCAL_FIRSTYEAR");
}
if (iACORDE)
{
//=================== ACORDE parameters ============================
- AliACORDE *ACORDE = new AliACORDEv0("ACORDE", "normal ACORDE");
+ AliACORDE *ACORDE = new AliACORDEv1("ACORDE", "normal ACORDE");
}
if (iVZERO)